Merge branch 'bstable'

This commit is contained in:
ccd0 2016-09-17 19:38:41 -07:00
commit 5369259876

View File

@ -7,7 +7,7 @@ ThreadWatcher =
textContent: 'Watcher' textContent: 'Watcher'
title: 'Thread Watcher' title: 'Thread Watcher'
href: 'javascript:;' href: 'javascript:;'
className: 'disabled fa fa-eye' className: 'fa fa-eye'
@db = new DataBoard 'watchedThreads', @refresh, true @db = new DataBoard 'watchedThreads', @refresh, true
@dialog = UI.dialog 'thread-watcher', 'top: 50px; left: 0px;', <%= readHTML('ThreadWatcher.html') %> @dialog = UI.dialog 'thread-watcher', 'top: 50px; left: 0px;', <%= readHTML('ThreadWatcher.html') %>
@ -35,6 +35,7 @@ ThreadWatcher =
if Conf['Fixed Thread Watcher'] if Conf['Fixed Thread Watcher']
$.addClass doc, 'fixed-watcher' $.addClass doc, 'fixed-watcher'
if !Conf['Persistent Thread Watcher'] if !Conf['Persistent Thread Watcher']
$.addClass ThreadWatcher.shortcut, 'disabled'
@dialog.hidden = true @dialog.hidden = true
Header.addShortcut 'watcher', sc, 510 Header.addShortcut 'watcher', sc, 510