chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #863 from pixelfed/frontend-ui-refactor 

Frontend ui refactor
This commit is contained in:
daniel 2019-02-21 21:17:42 -07:00 committed by GitHub
parent 6481a71fe5 e5b7c3c97d
commit 95051d3f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -8,5 +8,5 @@
"/js/micro.js": "/js/micro.js?id=56a1418f04f66287e5cf",
"/js/profile.js": "/js/profile.js?id=dd006b565cac9962d5ad",
"/js/status.js": "/js/status.js?id=096927f9312b1d7bb1b0",
"/js/timeline.js": "/js/timeline.js?id=f214632b48e14d7aaa7b"
"/js/timeline.js": "/js/timeline.js?id=4101fb6ac1673f3e0abd"
}

14
resources/assets/js/components/Timeline.vue
View File

@ -206,11 +206,11 @@
<!-- <div class="custom-control custom-switch mb-3">
<input type="checkbox" class="custom-control-input" id="mode-dark" v-on:click="modeDarkToggle()" v-model="modes.dark">
<label class="custom-control-label font-weight-bold" for="mode-dark">Dark Mode</label>
</div> -->
</div>
<div class="custom-control custom-switch mb-3">
<input type="checkbox" class="custom-control-input" id="mode-notify" v-on:click="modeNotifyToggle()" v-model="!modes.notify">
<label class="custom-control-label font-weight-bold" for="mode-notify">Disable Notifications</label>
</div>
</div> -->
<div class="custom-control custom-switch">
<input type="checkbox" class="custom-control-input" id="mode-infinite" v-on:click="modeInfiniteToggle()" v-model="modes.infinite">
<label class="custom-control-label font-weight-bold" for="mode-infinite">Enable Infinite Scroll</label>
@ -341,15 +341,7 @@
mounted() {
this.$nextTick(function () {
$('[data-toggle="tooltip"]').tooltip()
let cachedSettings = window.ls.get('pixelfed-classicui-settings');
if(cachedSettings.length && cachedSettings.hasOwnProperty('notify')) {
this.modes = cachedSettings;
} else {
window.ls.set('pixelfed-classicui-settings', this.modes);
}
if(cachedSettings.notify == true) {
this.fetchNotifications();
}
this.fetchNotifications();
});
},