From c9016ff4f111fcf046d45089d32cfd5f73342157 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Tue, 8 Apr 2014 19:17:50 -0700 Subject: [PATCH] small fix to small fixes This would compare false to 'catalog'. Not what you wanted. The download link is disabled in Firefox only because the current implementation doesn't work there. --- LICENSE | 2 +- builds/4chan-X.user.js | 6 ++++-- builds/crx/script.js | 6 ++++-- src/Menu/DownloadLink.coffee | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 20415b622..ffac59f17 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.7.3 - 2014-04-07 +* 4chan X - Version 1.7.3 - 2014-04-08 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 9f449f211..6cdd04805 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.7.3 - 2014-04-07 +* 4chan X - Version 1.7.3 - 2014-04-08 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -238,7 +238,7 @@ 'Highlight Own Posts': [false, 'Highlights own posts if Mark Quotes of You is enabled.'], 'Mark OP Quotes': [true, 'Add \'(OP)\' to OP quotes.'], 'Mark Cross-thread Quotes': [true, 'Add \'(Cross-thread)\' to cross-threads quotes.'], - 'Quote Threading': [true, 'Thread conversations'] + 'Quote Threading': [false, 'Thread conversations'] } }, imageExpansion: { @@ -9695,6 +9695,7 @@ this.shortcut = sc = $.el('a', { id: 'watcher-link', textContent: 'Watcher', + title: 'Thread Watcher', href: 'javascript:;', className: 'disabled fa fa-eye' }); @@ -12645,6 +12646,7 @@ link = $.el('a', { className: 'settings-link fa fa-wrench', textContent: 'Settings', + title: '4chan X Settings', href: 'javascript:;' }); $.on(link, 'click', Settings.open); diff --git a/builds/crx/script.js b/builds/crx/script.js index 8bf0241b3..036ed4e55 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.3 - 2014-04-07 +* 4chan X - Version 1.7.3 - 2014-04-08 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -214,7 +214,7 @@ 'Highlight Own Posts': [false, 'Highlights own posts if Mark Quotes of You is enabled.'], 'Mark OP Quotes': [true, 'Add \'(OP)\' to OP quotes.'], 'Mark Cross-thread Quotes': [true, 'Add \'(Cross-thread)\' to cross-threads quotes.'], - 'Quote Threading': [true, 'Thread conversations'] + 'Quote Threading': [false, 'Thread conversations'] } }, imageExpansion: { @@ -9692,6 +9692,7 @@ this.shortcut = sc = $.el('a', { id: 'watcher-link', textContent: 'Watcher', + title: 'Thread Watcher', href: 'javascript:;', className: 'disabled fa fa-eye' }); @@ -12648,6 +12649,7 @@ link = $.el('a', { className: 'settings-link fa fa-wrench', textContent: 'Settings', + title: '4chan X Settings', href: 'javascript:;' }); $.on(link, 'click', Settings.open); diff --git a/src/Menu/DownloadLink.coffee b/src/Menu/DownloadLink.coffee index 1824f38ed..c3eda1620 100755 --- a/src/Menu/DownloadLink.coffee +++ b/src/Menu/DownloadLink.coffee @@ -1,6 +1,6 @@ DownloadLink = init: -> - return if !g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Download Link'] + return if g.VIEW is 'catalog' or !Conf['Menu'] or !Conf['Download Link'] a = $.el 'a', className: 'download-link' @@ -13,4 +13,4 @@ DownloadLink = return false unless file a.href = file.URL a.download = file.name - true \ No newline at end of file + true