From 015bc15641aa803c8a64f97dd0ef1f0eac56a55e Mon Sep 17 00:00:00 2001 From: Jordan Bates Date: Tue, 7 May 2013 20:28:34 -0700 Subject: [PATCH] Close #60 --- CHANGELOG.md | 4 ++++ builds/4chan-X.js | 7 +++++-- builds/4chan-X.user.js | 7 +++++-- builds/crx/script.js | 7 +++++-- src/General/Config.coffee | 4 ++++ src/Monitoring/ThreadWatcher.coffee | 5 +++-- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2796a4f8f..23daac585 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +seaweedchan: +- Add `Centered links` option for header +- Add `Persistent Thread Watcher` option + ### 1.1.15 - 2013-05-07 seaweedchan: - Fix update and download urls for Greasemonkey diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 0164e2070..11f550007 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -181,6 +181,7 @@ 'Thread Stats': [true, 'Display reply and image count.'], 'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'], 'Thread Watcher': [true, 'Bookmark threads.'], + 'Persistent Thread Watcher': [false, 'Opens the thread watcher by default.'], 'Auto Watch': [true, 'Automatically watch threads you start.'], 'Auto Watch Reply': [false, 'Automatically watch threads you reply to.'] }, @@ -7261,7 +7262,7 @@ textContent: 'Watcher', id: 'watcher-link', href: 'javascript:;', - className: 'disabled' + className: "" + (Conf['Persistent Thread Watcher'] ? '' : 'disabled') }); this.dialog = UI.dialog('watcher', 'top: 50px; left: 0px;', '
Thread Watcher×
'); $.on(d, 'QRPostSuccessful', this.cb.post); @@ -7272,7 +7273,9 @@ $.ready(function() { ThreadWatcher.refresh(); $.add(d.body, ThreadWatcher.dialog); - return ThreadWatcher.dialog.hidden = true; + if (!Conf['Persistent Thread Watcher']) { + return ThreadWatcher.dialog.hidden = true; + } }); return Thread.prototype.callbacks.push({ name: 'Thread Watcher', diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 356e65b65..1c3322c20 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -181,6 +181,7 @@ 'Thread Stats': [true, 'Display reply and image count.'], 'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'], 'Thread Watcher': [true, 'Bookmark threads.'], + 'Persistent Thread Watcher': [false, 'Opens the thread watcher by default.'], 'Auto Watch': [true, 'Automatically watch threads you start.'], 'Auto Watch Reply': [false, 'Automatically watch threads you reply to.'] }, @@ -7282,7 +7283,7 @@ textContent: 'Watcher', id: 'watcher-link', href: 'javascript:;', - className: 'disabled' + className: "" + (Conf['Persistent Thread Watcher'] ? '' : 'disabled') }); this.dialog = UI.dialog('watcher', 'top: 50px; left: 0px;', '
Thread Watcher×
'); $.on(d, 'QRPostSuccessful', this.cb.post); @@ -7293,7 +7294,9 @@ $.ready(function() { ThreadWatcher.refresh(); $.add(d.body, ThreadWatcher.dialog); - return ThreadWatcher.dialog.hidden = true; + if (!Conf['Persistent Thread Watcher']) { + return ThreadWatcher.dialog.hidden = true; + } }); return Thread.prototype.callbacks.push({ name: 'Thread Watcher', diff --git a/builds/crx/script.js b/builds/crx/script.js index b7138bda2..34fe64746 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -164,6 +164,7 @@ 'Thread Stats': [true, 'Display reply and image count.'], 'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'], 'Thread Watcher': [true, 'Bookmark threads.'], + 'Persistent Thread Watcher': [false, 'Opens the thread watcher by default.'], 'Auto Watch': [true, 'Automatically watch threads you start.'], 'Auto Watch Reply': [false, 'Automatically watch threads you reply to.'] }, @@ -7261,7 +7262,7 @@ textContent: 'Watcher', id: 'watcher-link', href: 'javascript:;', - className: 'disabled' + className: "" + (Conf['Persistent Thread Watcher'] ? '' : 'disabled') }); this.dialog = UI.dialog('watcher', 'top: 50px; left: 0px;', '
Thread Watcher×
'); $.on(d, 'QRPostSuccessful', this.cb.post); @@ -7272,7 +7273,9 @@ $.ready(function() { ThreadWatcher.refresh(); $.add(d.body, ThreadWatcher.dialog); - return ThreadWatcher.dialog.hidden = true; + if (!Conf['Persistent Thread Watcher']) { + return ThreadWatcher.dialog.hidden = true; + } }); return Thread.prototype.callbacks.push({ name: 'Thread Watcher', diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 3e82beda3..6bcc5ae49 100644 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -233,6 +233,10 @@ Config = true 'Bookmark threads.' ] + 'Persistent Thread Watcher': [ + false + 'Opens the thread watcher by default.' + ] 'Auto Watch': [ true 'Automatically watch threads you start.' diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee index e5b26f40f..f3de13c2b 100644 --- a/src/Monitoring/ThreadWatcher.coffee +++ b/src/Monitoring/ThreadWatcher.coffee @@ -5,7 +5,7 @@ ThreadWatcher = textContent: 'Watcher' id: 'watcher-link' href: 'javascript:;' - className: 'disabled' + className: "#{if Conf['Persistent Thread Watcher'] then '' else 'disabled'}" @dialog = UI.dialog 'watcher', 'top: 50px; left: 0px;', '
Thread Watcher×
' @@ -20,7 +20,8 @@ ThreadWatcher = $.ready -> ThreadWatcher.refresh() $.add d.body, ThreadWatcher.dialog - ThreadWatcher.dialog.hidden = true + unless Conf['Persistent Thread Watcher'] + ThreadWatcher.dialog.hidden = true Thread::callbacks.push name: 'Thread Watcher'