diff --git a/CHANGELOG.md b/CHANGELOG.md index baa0860ea..9bd2ed1f6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's work. This does not mean the changes are their fault, only that their code was used. All changes to the script are chosen by and the fault of the maintainer (ccd0). +### v1.11.13 + +**v1.11.13.0** *(2015-10-14)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.0/builds/4chan-X-noupdate.crx "Chromium version")] +- Based on v1.11.12.7. +- Add button to toggle Mona font in QR on /jp/. + ### v1.11.12 **v1.11.12.7** *(2015-10-13)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.7/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 8a02c2b29..20950f9ca 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 2504291f1..99ebe65ca 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.11.12.7 +// @version 1.11.13.0 // @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 27080a9ef..743c0376d 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.11.12.7 +// @version 1.11.13.0 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -337,7 +337,8 @@ }, boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]", QR: { - 'QR.personas': "#options:\"sage\";boards:jp;always" + 'QR.personas': "#options:\"sage\";boards:jp;always", + sjisPreview: false }, captchaLanguage: '', time: '%m/%d/%y(%a)%H:%M:%S', @@ -414,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.12.7', + VERSION: '1.11.13.0', NAMESPACE: '4chan X.', boards: {} }; @@ -7403,7 +7404,7 @@ var dialog, event, i, items, m, match_max, match_min, name, node, nodes, ref, rules, save, scriptData, setNode; QR.nodes = nodes = { el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', { - innerHTML: "
×
+
No selected file
" + innerHTML: "
×
+
No selected file
" }) }; setNode = function(name, query) { @@ -7418,6 +7419,7 @@ setNode('dumpButton', '#dump-button'); setNode('pasteArea', '#paste-area'); setNode('urlButton', '#url-button'); + setNode('sjisToggle', '#sjis-toggle > input'); setNode('name', '[data-name=name]'); setNode('email', '[data-name=email]'); setNode('sub', '[data-name=sub]'); @@ -7466,6 +7468,10 @@ } else { nodes.spoiler.parentElement.hidden = true; } + if (g.BOARD.ID === 'jp' && Conf['sjisPreview']) { + nodes.sjisToggle.checked = true; + $.addClass(QR.nodes.el, 'sjis-preview'); + } if (parseInt(Conf['customCooldown'], 10) > 0) { $.addClass(QR.nodes.fileSubmit, 'custom-cooldown'); $.get('customCooldownEnabled', Conf['customCooldownEnabled'], function(arg) { @@ -7512,6 +7518,10 @@ return QR.selected.nodes.spoiler.click(); }); $.on(nodes.fileInput, 'change', QR.handleFiles); + $.on(nodes.sjisToggle, 'change', $.cb.checked); + $.on(nodes.sjisToggle, 'change', function() { + return nodes.el.classList.toggle('sjis-preview', this.checked); + }); $.on(nodes.customCooldown, 'click', QR.toggleCustomCooldown); window.addEventListener('focus', QR.focus, true); window.addEventListener('blur', QR.focus, true); @@ -19556,9 +19566,35 @@ "#qr.forced-anon input[data-name=\"name\"]:not(.force-show),\n" + "#qr.forced-anon input[data-name=\"sub\"]:not(.force-show),\n" + "#qr.reply-to-thread input[data-name=\"sub\"]:not(.force-show),\n" + -"#qr.reply-to-thread select[name=\"filetag\"] {\n" + +"#qr.reply-to-thread select[name=\"filetag\"],\n" + +"body:not(.board_jp) #sjis-toggle,\n" + +"#sjis-toggle > input {\n" + " display: none;\n" + "}\n" + +"#sjis-toggle {\n" + +" -webkit-align-self: stretch;\n" + +" align-self: stretch;\n" + +" width: 20px;\n" + +" border: 1px solid #BBB;\n" + +" background-color: #DCDCDC;\n" + +" color: #000;\n" + +" display: -webkit-flex;\n" + +" display: flex;\n" + +" -webkit-align-items: center;\n" + +" align-items: center;\n" + +"}\n" + +"#sjis-toggle::after {\n" + +" content: \"∀\";\n" + +" margin: auto;\n" + +"}\n" + +"#qr:not(.sjis-preview) #sjis-toggle {\n" + +" background: linear-gradient(to bottom, #F8F8F8, #DCDCDC) no-repeat;\n" + +"}\n" + +"#sjis-toggle, #qr.sjis-preview textarea {\n" + +" font-family: \"IPAMonaPGothic\",\"Mona\",\"MS PGothic\",monospace;\n" + +" font-size: 16px;\n" + +" line-height: 17px;\n" + +"}\n" + "#qr textarea.field {\n" + " height: 14.8em;\n" + " min-height: 9em;\n" + @@ -20648,7 +20684,8 @@ ":root.tomorrow .qr-preview {\n" + " background-color: rgba(255, 255, 255, .15);\n" + "}\n" + -":root.tomorrow #qr .field {\n" + +":root.tomorrow #qr .field,\n" + +":root.tomorrow #qr #sjis-toggle {\n" + " background-color: rgb(26, 27, 29);\n" + " color: rgb(197,200,198);\n" + " border-color: rgb(40, 41, 42);\n" + @@ -20658,6 +20695,9 @@ " border-color: rgb(129, 162, 190) !important;\n" + " background-color: rgb(30,32,36);\n" + "}\n" + +":root.tomorrow #qr:not(.sjis-preview) #sjis-toggle {\n" + +" background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" + +"}\n" + ":root.tomorrow #qr select,\n" + ":root.tomorrow #file-n-submit > input {\n" + " border-color: rgb(40, 41, 42);\n" + diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index ab1e36ce8..f2833b96c 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 474b56b45..68faa7f6a 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.11.12.7 +// @version 1.11.13.0 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -337,7 +337,8 @@ }, boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]", QR: { - 'QR.personas': "#options:\"sage\";boards:jp;always" + 'QR.personas': "#options:\"sage\";boards:jp;always", + sjisPreview: false }, captchaLanguage: '', time: '%m/%d/%y(%a)%H:%M:%S', @@ -414,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.12.7', + VERSION: '1.11.13.0', NAMESPACE: '4chan X.', boards: {} }; @@ -7403,7 +7404,7 @@ var dialog, event, i, items, m, match_max, match_min, name, node, nodes, ref, rules, save, scriptData, setNode; QR.nodes = nodes = { el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', { - innerHTML: "
×
+
No selected file
" + innerHTML: "
×
+
No selected file
" }) }; setNode = function(name, query) { @@ -7418,6 +7419,7 @@ setNode('dumpButton', '#dump-button'); setNode('pasteArea', '#paste-area'); setNode('urlButton', '#url-button'); + setNode('sjisToggle', '#sjis-toggle > input'); setNode('name', '[data-name=name]'); setNode('email', '[data-name=email]'); setNode('sub', '[data-name=sub]'); @@ -7466,6 +7468,10 @@ } else { nodes.spoiler.parentElement.hidden = true; } + if (g.BOARD.ID === 'jp' && Conf['sjisPreview']) { + nodes.sjisToggle.checked = true; + $.addClass(QR.nodes.el, 'sjis-preview'); + } if (parseInt(Conf['customCooldown'], 10) > 0) { $.addClass(QR.nodes.fileSubmit, 'custom-cooldown'); $.get('customCooldownEnabled', Conf['customCooldownEnabled'], function(arg) { @@ -7512,6 +7518,10 @@ return QR.selected.nodes.spoiler.click(); }); $.on(nodes.fileInput, 'change', QR.handleFiles); + $.on(nodes.sjisToggle, 'change', $.cb.checked); + $.on(nodes.sjisToggle, 'change', function() { + return nodes.el.classList.toggle('sjis-preview', this.checked); + }); $.on(nodes.customCooldown, 'click', QR.toggleCustomCooldown); window.addEventListener('focus', QR.focus, true); window.addEventListener('blur', QR.focus, true); @@ -19556,9 +19566,35 @@ "#qr.forced-anon input[data-name=\"name\"]:not(.force-show),\n" + "#qr.forced-anon input[data-name=\"sub\"]:not(.force-show),\n" + "#qr.reply-to-thread input[data-name=\"sub\"]:not(.force-show),\n" + -"#qr.reply-to-thread select[name=\"filetag\"] {\n" + +"#qr.reply-to-thread select[name=\"filetag\"],\n" + +"body:not(.board_jp) #sjis-toggle,\n" + +"#sjis-toggle > input {\n" + " display: none;\n" + "}\n" + +"#sjis-toggle {\n" + +" -webkit-align-self: stretch;\n" + +" align-self: stretch;\n" + +" width: 20px;\n" + +" border: 1px solid #BBB;\n" + +" background-color: #DCDCDC;\n" + +" color: #000;\n" + +" display: -webkit-flex;\n" + +" display: flex;\n" + +" -webkit-align-items: center;\n" + +" align-items: center;\n" + +"}\n" + +"#sjis-toggle::after {\n" + +" content: \"∀\";\n" + +" margin: auto;\n" + +"}\n" + +"#qr:not(.sjis-preview) #sjis-toggle {\n" + +" background: linear-gradient(to bottom, #F8F8F8, #DCDCDC) no-repeat;\n" + +"}\n" + +"#sjis-toggle, #qr.sjis-preview textarea {\n" + +" font-family: \"IPAMonaPGothic\",\"Mona\",\"MS PGothic\",monospace;\n" + +" font-size: 16px;\n" + +" line-height: 17px;\n" + +"}\n" + "#qr textarea.field {\n" + " height: 14.8em;\n" + " min-height: 9em;\n" + @@ -20648,7 +20684,8 @@ ":root.tomorrow .qr-preview {\n" + " background-color: rgba(255, 255, 255, .15);\n" + "}\n" + -":root.tomorrow #qr .field {\n" + +":root.tomorrow #qr .field,\n" + +":root.tomorrow #qr #sjis-toggle {\n" + " background-color: rgb(26, 27, 29);\n" + " color: rgb(197,200,198);\n" + " border-color: rgb(40, 41, 42);\n" + @@ -20658,6 +20695,9 @@ " border-color: rgb(129, 162, 190) !important;\n" + " background-color: rgb(30,32,36);\n" + "}\n" + +":root.tomorrow #qr:not(.sjis-preview) #sjis-toggle {\n" + +" background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" + +"}\n" + ":root.tomorrow #qr select,\n" + ":root.tomorrow #file-n-submit > input {\n" + " border-color: rgb(40, 41, 42);\n" + diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 5e003b7e9..208ce2f2e 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 b82e27011..5166f08ff 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.12.7 +// @version 1.11.13.0 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 18c1fa8e8..d055adb2c 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.11.12.7 +// @version 1.11.13.0 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -337,7 +337,8 @@ }, boardnav: "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]", QR: { - 'QR.personas': "#options:\"sage\";boards:jp;always" + 'QR.personas': "#options:\"sage\";boards:jp;always", + sjisPreview: false }, captchaLanguage: '', time: '%m/%d/%y(%a)%H:%M:%S', @@ -414,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.12.7', + VERSION: '1.11.13.0', NAMESPACE: '4chan X.', boards: {} }; @@ -7403,7 +7404,7 @@ var dialog, event, i, items, m, match_max, match_min, name, node, nodes, ref, rules, save, scriptData, setNode; QR.nodes = nodes = { el: dialog = UI.dialog('qr', 'top: 50px; right: 0px;', { - innerHTML: "
×
+
No selected file
" + innerHTML: "
×
+
No selected file
" }) }; setNode = function(name, query) { @@ -7418,6 +7419,7 @@ setNode('dumpButton', '#dump-button'); setNode('pasteArea', '#paste-area'); setNode('urlButton', '#url-button'); + setNode('sjisToggle', '#sjis-toggle > input'); setNode('name', '[data-name=name]'); setNode('email', '[data-name=email]'); setNode('sub', '[data-name=sub]'); @@ -7466,6 +7468,10 @@ } else { nodes.spoiler.parentElement.hidden = true; } + if (g.BOARD.ID === 'jp' && Conf['sjisPreview']) { + nodes.sjisToggle.checked = true; + $.addClass(QR.nodes.el, 'sjis-preview'); + } if (parseInt(Conf['customCooldown'], 10) > 0) { $.addClass(QR.nodes.fileSubmit, 'custom-cooldown'); $.get('customCooldownEnabled', Conf['customCooldownEnabled'], function(arg) { @@ -7512,6 +7518,10 @@ return QR.selected.nodes.spoiler.click(); }); $.on(nodes.fileInput, 'change', QR.handleFiles); + $.on(nodes.sjisToggle, 'change', $.cb.checked); + $.on(nodes.sjisToggle, 'change', function() { + return nodes.el.classList.toggle('sjis-preview', this.checked); + }); $.on(nodes.customCooldown, 'click', QR.toggleCustomCooldown); window.addEventListener('focus', QR.focus, true); window.addEventListener('blur', QR.focus, true); @@ -19556,9 +19566,35 @@ "#qr.forced-anon input[data-name=\"name\"]:not(.force-show),\n" + "#qr.forced-anon input[data-name=\"sub\"]:not(.force-show),\n" + "#qr.reply-to-thread input[data-name=\"sub\"]:not(.force-show),\n" + -"#qr.reply-to-thread select[name=\"filetag\"] {\n" + +"#qr.reply-to-thread select[name=\"filetag\"],\n" + +"body:not(.board_jp) #sjis-toggle,\n" + +"#sjis-toggle > input {\n" + " display: none;\n" + "}\n" + +"#sjis-toggle {\n" + +" -webkit-align-self: stretch;\n" + +" align-self: stretch;\n" + +" width: 20px;\n" + +" border: 1px solid #BBB;\n" + +" background-color: #DCDCDC;\n" + +" color: #000;\n" + +" display: -webkit-flex;\n" + +" display: flex;\n" + +" -webkit-align-items: center;\n" + +" align-items: center;\n" + +"}\n" + +"#sjis-toggle::after {\n" + +" content: \"∀\";\n" + +" margin: auto;\n" + +"}\n" + +"#qr:not(.sjis-preview) #sjis-toggle {\n" + +" background: linear-gradient(to bottom, #F8F8F8, #DCDCDC) no-repeat;\n" + +"}\n" + +"#sjis-toggle, #qr.sjis-preview textarea {\n" + +" font-family: \"IPAMonaPGothic\",\"Mona\",\"MS PGothic\",monospace;\n" + +" font-size: 16px;\n" + +" line-height: 17px;\n" + +"}\n" + "#qr textarea.field {\n" + " height: 14.8em;\n" + " min-height: 9em;\n" + @@ -20648,7 +20684,8 @@ ":root.tomorrow .qr-preview {\n" + " background-color: rgba(255, 255, 255, .15);\n" + "}\n" + -":root.tomorrow #qr .field {\n" + +":root.tomorrow #qr .field,\n" + +":root.tomorrow #qr #sjis-toggle {\n" + " background-color: rgb(26, 27, 29);\n" + " color: rgb(197,200,198);\n" + " border-color: rgb(40, 41, 42);\n" + @@ -20658,6 +20695,9 @@ " border-color: rgb(129, 162, 190) !important;\n" + " background-color: rgb(30,32,36);\n" + "}\n" + +":root.tomorrow #qr:not(.sjis-preview) #sjis-toggle {\n" + +" background: linear-gradient(to bottom, #2E3035, #222427) no-repeat;\n" + +"}\n" + ":root.tomorrow #qr select,\n" + ":root.tomorrow #file-n-submit > input {\n" + " border-color: rgb(40, 41, 42);\n" + diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 9cc4ef2d2..d609fcdfb 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 401c849a4..50e80fb58 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 b9898399e..ceeca334b 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index d758bd551..88a1e1034 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "meta": { "name": "4chan X", "fork": "ccd0", - "version": "1.11.12.7", - "date": "2015-10-14T02:20:26.038Z", + "version": "1.11.13.0", + "date": "2015-10-14T07:03:43.601Z", "page": "https://www.4chan-x.net/", "downloads": "https://www.4chan-x.net/builds/", "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",