diff --git a/CHANGELOG.md b/CHANGELOG.md index 70c384e35..93b9559f5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.7.10 +*2014-04-17* + **ccd0** - Change Shift+arrow default keybinds Ctrl+arrow to avoid conflict with text selection - Fix (You) in backlinks. diff --git a/LICENSE b/LICENSE index d563d87b7..0b41a0fed 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.7.9 - 2014-04-13 +* 4chan X - Version 1.7.10 - 2014-04-17 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 5300c9a04..26c342825 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.7.9 +// @version 1.7.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index a6d005ec6..ac54fe46b 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.7.9 +// @version 1.7.10 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.7.9 - 2014-04-13 +* 4chan X - Version 1.7.10 - 2014-04-17 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -333,12 +333,12 @@ 'werkTyme': ['Shift+w', 'Werk Tyme'], 'Front page': ['0', 'Jump to front page.'], 'Open front page': ['Shift+0', 'Open front page in a new tab.'], - 'Next page': ['Shift+Right', 'Jump to the next page.'], - 'Previous page': ['Shift+Left', 'Jump to the previous page.'], + 'Next page': ['Ctrl+Right', 'Jump to the next page.'], + 'Previous page': ['Ctrl+Left', 'Jump to the previous page.'], 'Open catalog': ['Shift+c', 'Open the catalog of the current board'], 'Search form': ['Ctrl+Alt+s', 'Focus the search field on the board index.'], - 'Next thread': ['Shift+Down', 'See next thread.'], - 'Previous thread': ['Shift+Up', 'See previous thread.'], + 'Next thread': ['Ctrl+Down', 'See next thread.'], + 'Previous thread': ['Ctrl+Up', 'See previous thread.'], 'Expand thread': ['Ctrl+e', 'Expand thread.'], 'Open thread': ['o', 'Open thread in current tab.'], 'Open thread tab': ['Shift+o', 'Open thread in new tab.'], @@ -371,7 +371,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.9', + VERSION: '1.7.10', NAMESPACE: '4chan X.', boards: {} }; @@ -4901,14 +4901,19 @@ }); }, firstNode: function() { - var a, clone, container, containers, link, nodes, post, quote, _i, _j, _k, _len, _len1, _len2, _ref, _ref1; + var a, clone, container, containers, link, markYours, nodes, post, quote, _i, _j, _k, _len, _len1, _len2, _ref, _ref1; if (this.isClone || !this.quotes.length) { return; } + markYours = Conf['Quick Reply'] && Conf['Mark Quotes of You'] && QR.db.get({ + boardID: this.board.ID, + threadID: this.thread.ID, + postID: this.ID + }); a = $.el('a', { href: "/" + this.board + "/res/" + this.thread + "#p" + this, className: this.isHidden ? 'filtered backlink' : 'backlink', - textContent: (QuoteBacklink.funk(this.ID)) + (Conf['Mark Quotes of You'] && this.info.yours ? '\u00A0(You)' : '') + textContent: (QuoteBacklink.funk(this.ID)) + (markYours ? '\u00A0(You)' : '') }); _ref = this.quotes; for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/builds/crx.crx b/builds/crx.crx index ab90d25c0..995eb1c5f 100644 Binary files a/builds/crx.crx and b/builds/crx.crx differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 4d8c7aef1..a1c2647d0 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.9", + "version": "1.7.10", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index 99f93df1e..01931760a 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.9 - 2014-04-13 +* 4chan X - Version 1.7.10 - 2014-04-17 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -309,12 +309,12 @@ 'werkTyme': ['Shift+w', 'Werk Tyme'], 'Front page': ['0', 'Jump to front page.'], 'Open front page': ['Shift+0', 'Open front page in a new tab.'], - 'Next page': ['Shift+Right', 'Jump to the next page.'], - 'Previous page': ['Shift+Left', 'Jump to the previous page.'], + 'Next page': ['Ctrl+Right', 'Jump to the next page.'], + 'Previous page': ['Ctrl+Left', 'Jump to the previous page.'], 'Open catalog': ['Shift+c', 'Open the catalog of the current board'], 'Search form': ['Ctrl+Alt+s', 'Focus the search field on the board index.'], - 'Next thread': ['Shift+Down', 'See next thread.'], - 'Previous thread': ['Shift+Up', 'See previous thread.'], + 'Next thread': ['Ctrl+Down', 'See next thread.'], + 'Previous thread': ['Ctrl+Up', 'See previous thread.'], 'Expand thread': ['Ctrl+e', 'Expand thread.'], 'Open thread': ['o', 'Open thread in current tab.'], 'Open thread tab': ['Shift+o', 'Open thread in new tab.'], @@ -347,7 +347,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.9', + VERSION: '1.7.10', NAMESPACE: '4chan X.', boards: {} }; @@ -4935,14 +4935,19 @@ }); }, firstNode: function() { - var a, clone, container, containers, link, nodes, post, quote, _i, _j, _k, _len, _len1, _len2, _ref, _ref1; + var a, clone, container, containers, link, markYours, nodes, post, quote, _i, _j, _k, _len, _len1, _len2, _ref, _ref1; if (this.isClone || !this.quotes.length) { return; } + markYours = Conf['Quick Reply'] && Conf['Mark Quotes of You'] && QR.db.get({ + boardID: this.board.ID, + threadID: this.thread.ID, + postID: this.ID + }); a = $.el('a', { href: "/" + this.board + "/res/" + this.thread + "#p" + this, className: this.isHidden ? 'filtered backlink' : 'backlink', - textContent: (QuoteBacklink.funk(this.ID)) + (Conf['Mark Quotes of You'] && this.info.yours ? '\u00A0(You)' : '') + textContent: (QuoteBacklink.funk(this.ID)) + (markYours ? '\u00A0(You)' : '') }); _ref = this.quotes; for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/builds/updates.xml b/builds/updates.xml index b0f7fbf7a..cabcc637d 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 5d014443d..4073a0d80 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.7.9", + "version": "1.7.10", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",