diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e66601b1..63653ca1c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x). +### v1.9.7.2 +*2014-10-13* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.7.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.7.2/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Add command+click as an alternative to ctrl+click on OS X (#162). + ### v1.9.7.1 *2014-10-13* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.7.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.7.1/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index f64da90b8..b36a17471 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.7.1 +* 4chan X - Version 1.9.7.2 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 8be35bd3f..78fd26ff4 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index 53f2e2ff1..075c972f8 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.9.7.1 +// @version 1.9.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index 2b0264d62..833b65b3b 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.9.7.1 +// @version 1.9.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.7.1 +* 4chan X - Version 1.9.7.2 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -149,7 +149,7 @@ 'Thread Expansion': [true, 'Add buttons to expand threads.'], 'Index Navigation': [false, 'Add buttons to navigate between threads.'], 'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'], - 'Custom Board Titles': [true, 'Allow editing of the board title and subtitle by ctrl+clicking them'], + 'Custom Board Titles': [true, 'Allow editing of the board title and subtitle by ctrl/\u2318+clicking them.'], 'Persistent Custom Board Titles': [false, 'Force custom board titles to be persistent, even if moot updates the board titles.'], 'Show Updated Notifications': [true, 'Show notifications when 4chan X is successfully updated.'], 'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'], @@ -381,7 +381,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.7.1', + VERSION: '1.9.7.2', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -6811,7 +6811,7 @@ if (e.shiftKey && e.type === 'click') { return QR.selected.rmFile(); } - if (e.ctrlKey && e.type === 'click') { + if ((e.ctrlKey || e.metaKey) && e.type === 'click') { $.addClass(QR.nodes.filename, 'edit'); QR.nodes.filename.focus(); return $.on(QR.nodes.filename, 'blur', function() { @@ -8011,7 +8011,7 @@ _Class.prototype.updateFilename = function() { var long; - long = "" + this.filename + " (" + this.filesize + ")\nCtrl+click to edit filename. Shift+click to clear."; + long = "" + this.filename + " (" + this.filesize + ")\nCtrl/\u2318+click to edit filename. Shift+click to clear."; this.nodes.el.title = long; if (this !== QR.selected) { return; @@ -12064,7 +12064,7 @@ continue; } if (Conf['Custom Board Titles']) { - Banner.custom(child).title = "Ctrl+click to edit board " + (i === 3 ? 'sub' : '') + "title"; + Banner.custom(child).title = "Ctrl/\u2318+click to edit board " + (i === 3 ? 'sub' : '') + "title"; child.spellcheck = false; } } @@ -12088,7 +12088,7 @@ return $('img', this.parentNode).src = "//s.4cdn.org/image/title/" + banner; }, click: function(e) { - if (e.ctrlKey) { + if (e.ctrlKey || e.metaKey) { this.contentEditable = true; return this.focus(); } @@ -13541,7 +13541,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index b492da5f1..5324d4082 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 3786e1c44..b4195847f 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.9.7.1 +// @version 1.9.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -23,7 +23,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.7.1 +* 4chan X - Version 1.9.7.2 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -148,7 +148,7 @@ 'Thread Expansion': [true, 'Add buttons to expand threads.'], 'Index Navigation': [false, 'Add buttons to navigate between threads.'], 'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'], - 'Custom Board Titles': [true, 'Allow editing of the board title and subtitle by ctrl+clicking them'], + 'Custom Board Titles': [true, 'Allow editing of the board title and subtitle by ctrl/\u2318+clicking them.'], 'Persistent Custom Board Titles': [false, 'Force custom board titles to be persistent, even if moot updates the board titles.'], 'Show Updated Notifications': [true, 'Show notifications when 4chan X is successfully updated.'], 'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'], @@ -380,7 +380,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.7.1', + VERSION: '1.9.7.2', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -6810,7 +6810,7 @@ if (e.shiftKey && e.type === 'click') { return QR.selected.rmFile(); } - if (e.ctrlKey && e.type === 'click') { + if ((e.ctrlKey || e.metaKey) && e.type === 'click') { $.addClass(QR.nodes.filename, 'edit'); QR.nodes.filename.focus(); return $.on(QR.nodes.filename, 'blur', function() { @@ -8010,7 +8010,7 @@ _Class.prototype.updateFilename = function() { var long; - long = "" + this.filename + " (" + this.filesize + ")\nCtrl+click to edit filename. Shift+click to clear."; + long = "" + this.filename + " (" + this.filesize + ")\nCtrl/\u2318+click to edit filename. Shift+click to clear."; this.nodes.el.title = long; if (this !== QR.selected) { return; @@ -12063,7 +12063,7 @@ continue; } if (Conf['Custom Board Titles']) { - Banner.custom(child).title = "Ctrl+click to edit board " + (i === 3 ? 'sub' : '') + "title"; + Banner.custom(child).title = "Ctrl/\u2318+click to edit board " + (i === 3 ? 'sub' : '') + "title"; child.spellcheck = false; } } @@ -12087,7 +12087,7 @@ return $('img', this.parentNode).src = "//s.4cdn.org/image/title/" + banner; }, click: function(e) { - if (e.ctrlKey) { + if (e.ctrlKey || e.metaKey) { this.contentEditable = true; return this.focus(); } @@ -13540,7 +13540,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 9dff5e97d..449c7520b 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 91ca2b2da..ef96cb7c2 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.7.1 +// @version 1.9.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 730c5a1f0..93a8d6f4d 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.9.7.1 +// @version 1.9.7.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.7.1 +* 4chan X - Version 1.9.7.2 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -149,7 +149,7 @@ 'Thread Expansion': [true, 'Add buttons to expand threads.'], 'Index Navigation': [false, 'Add buttons to navigate between threads.'], 'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'], - 'Custom Board Titles': [true, 'Allow editing of the board title and subtitle by ctrl+clicking them'], + 'Custom Board Titles': [true, 'Allow editing of the board title and subtitle by ctrl/\u2318+clicking them.'], 'Persistent Custom Board Titles': [false, 'Force custom board titles to be persistent, even if moot updates the board titles.'], 'Show Updated Notifications': [true, 'Show notifications when 4chan X is successfully updated.'], 'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'], @@ -381,7 +381,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.7.1', + VERSION: '1.9.7.2', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -6811,7 +6811,7 @@ if (e.shiftKey && e.type === 'click') { return QR.selected.rmFile(); } - if (e.ctrlKey && e.type === 'click') { + if ((e.ctrlKey || e.metaKey) && e.type === 'click') { $.addClass(QR.nodes.filename, 'edit'); QR.nodes.filename.focus(); return $.on(QR.nodes.filename, 'blur', function() { @@ -8011,7 +8011,7 @@ _Class.prototype.updateFilename = function() { var long; - long = "" + this.filename + " (" + this.filesize + ")\nCtrl+click to edit filename. Shift+click to clear."; + long = "" + this.filename + " (" + this.filesize + ")\nCtrl/\u2318+click to edit filename. Shift+click to clear."; this.nodes.el.title = long; if (this !== QR.selected) { return; @@ -12064,7 +12064,7 @@ continue; } if (Conf['Custom Board Titles']) { - Banner.custom(child).title = "Ctrl+click to edit board " + (i === 3 ? 'sub' : '') + "title"; + Banner.custom(child).title = "Ctrl/\u2318+click to edit board " + (i === 3 ? 'sub' : '') + "title"; child.spellcheck = false; } } @@ -12088,7 +12088,7 @@ return $('img', this.parentNode).src = "//s.4cdn.org/image/title/" + banner; }, click: function(e) { - if (e.ctrlKey) { + if (e.ctrlKey || e.metaKey) { this.contentEditable = true; return this.focus(); } @@ -13541,7 +13541,7 @@ className: 'dialog' }); $.extend(dialog, { - innerHTML: "
" + innerHTML: "
" }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index b62651dd0..431f483a1 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index 2164fc6e5..3463b8760 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index 575db2ed3..9fb359f62 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index edaf3db65..3a1e10e5b 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.9.7.1", + "version": "1.9.7.2", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",