diff --git a/CHANGELOG.md b/CHANGELOG.md index 24e75efba..4ae60cfa6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.15 +**v1.11.15.2** *(2015-11-01)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.15.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.15.2/builds/4chan-X-noupdate.crx "Chromium version")] +- Add background color selector to oekaki controls in Quick Reply. + **v1.11.15.1** *(2015-11-01)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.15.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.15.1/builds/4chan-X-noupdate.crx "Chromium version")] - Fix some oekaki transparency related bugs. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 81c00f11d..585dbe6cd 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 dc4f2c2bb..83f7630d3 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.15.1 +// @version 1.11.15.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 30127079f..b8ddc6c6c 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.15.1 +// @version 1.11.15.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -415,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.15.1', + VERSION: '1.11.15.2', NAMESPACE: '4chan X.', boards: {} }; @@ -7453,7 +7453,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) { @@ -9116,10 +9116,12 @@ FCX.oekakiName = 'tegaki.png'; return Tegaki.open({ onDone: FCX.oekakiCB, - onCancel: function() {}, + onCancel: function() { + return Tegaki.bgColor = '#ffffff'; + }, width: +document.querySelector('#qr [name=oekaki-width]').value, height: +document.querySelector('#qr [name=oekaki-height]').value, - bgColor: '#ffffff' + bgColor: document.querySelector('#qr [name=oekaki-bg]').checked ? document.querySelector('#qr [name=oekaki-bgcolor]').value : 'transparent' }); }); }, @@ -18484,7 +18486,7 @@ "#captchaContainerAlt td:nth-child(2) {\n" + " display: table-cell !important;\n" + "}\n" + -"#tegaki-canvas {\n" + +"canvas#tegaki-canvas {\n" + " background: none;\n" + "}\n" + "/* Disable obnoxious captcha fade-in. */\n" + @@ -19717,7 +19719,7 @@ " position: static !important;\n" + "}\n" + "/* File Input, Submit Button, Oekaki */\n" + -"#file-n-submit, .oekaki {\n" + +"#file-n-submit, #qr .oekaki {\n" + " display: -webkit-flex;\n" + " display: flex;\n" + " -webkit-align-items: stretch;\n" + @@ -19772,10 +19774,10 @@ "#qr-no-file {\n" + " color: #AAA;\n" + "}\n" + -".oekaki.has-file {\n" + +"#qr .oekaki.has-file {\n" + " display: none;\n" + "}\n" + -".oekaki > label {\n" + +"#qr .oekaki > label {\n" + " -webkit-flex: 1 1 auto;\n" + " flex: 1 1 auto;\n" + " width: 0;\n" + @@ -19785,15 +19787,40 @@ " align-items: center;\n" + " height: 100%;\n" + "}\n" + -".oekaki > label > span {\n" + +"#qr .oekaki > label > span {\n" + " margin: 0 3px;\n" + "}\n" + -".oekaki > label > input {\n" + +"#qr .oekaki > label > input {\n" + " -webkit-flex: 1 1 auto;\n" + " flex: 1 1 auto;\n" + " width: 0;\n" + " height: 100%;\n" + "}\n" + +"#qr .oekaki-bg {\n" + +" position: relative;\n" + +" display: inline-block;\n" + +" height: 100%;\n" + +" width: 10%;\n" + +" margin-left: 3px;\n" + +"}\n" + +"#qr .oekaki-bg > * {\n" + +" position: absolute;\n" + +" top: 0;\n" + +" left: 0;\n" + +" margin: 0;\n" + +"}\n" + +"#qr .oekaki-bg > :not([name=\"oekaki-bgcolor\"]) {\n" + +" z-index: 1;\n" + +"}\n" + +"#qr [name=\"oekaki-bgcolor\"] {\n" + +" height: 100%;\n" + +" width: 100%;\n" + +" border: none;\n" + +" padding: 0;\n" + +"}\n" + +"#qr [name=\"oekaki-bg\"]:not(:checked) ~ [name=\"oekaki-bgcolor\"] {\n" + +" visibility: hidden;\n" + +"}\n" + "#qr input[type=\"file\"] {\n" + " visibility: hidden;\n" + " position: absolute;\n" + diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 43ae9fd72..75aae0149 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 c37dbe868..c9cbf802b 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.15.1 +// @version 1.11.15.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -415,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.15.1', + VERSION: '1.11.15.2', NAMESPACE: '4chan X.', boards: {} }; @@ -7453,7 +7453,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) { @@ -9116,10 +9116,12 @@ FCX.oekakiName = 'tegaki.png'; return Tegaki.open({ onDone: FCX.oekakiCB, - onCancel: function() {}, + onCancel: function() { + return Tegaki.bgColor = '#ffffff'; + }, width: +document.querySelector('#qr [name=oekaki-width]').value, height: +document.querySelector('#qr [name=oekaki-height]').value, - bgColor: '#ffffff' + bgColor: document.querySelector('#qr [name=oekaki-bg]').checked ? document.querySelector('#qr [name=oekaki-bgcolor]').value : 'transparent' }); }); }, @@ -18484,7 +18486,7 @@ "#captchaContainerAlt td:nth-child(2) {\n" + " display: table-cell !important;\n" + "}\n" + -"#tegaki-canvas {\n" + +"canvas#tegaki-canvas {\n" + " background: none;\n" + "}\n" + "/* Disable obnoxious captcha fade-in. */\n" + @@ -19717,7 +19719,7 @@ " position: static !important;\n" + "}\n" + "/* File Input, Submit Button, Oekaki */\n" + -"#file-n-submit, .oekaki {\n" + +"#file-n-submit, #qr .oekaki {\n" + " display: -webkit-flex;\n" + " display: flex;\n" + " -webkit-align-items: stretch;\n" + @@ -19772,10 +19774,10 @@ "#qr-no-file {\n" + " color: #AAA;\n" + "}\n" + -".oekaki.has-file {\n" + +"#qr .oekaki.has-file {\n" + " display: none;\n" + "}\n" + -".oekaki > label {\n" + +"#qr .oekaki > label {\n" + " -webkit-flex: 1 1 auto;\n" + " flex: 1 1 auto;\n" + " width: 0;\n" + @@ -19785,15 +19787,40 @@ " align-items: center;\n" + " height: 100%;\n" + "}\n" + -".oekaki > label > span {\n" + +"#qr .oekaki > label > span {\n" + " margin: 0 3px;\n" + "}\n" + -".oekaki > label > input {\n" + +"#qr .oekaki > label > input {\n" + " -webkit-flex: 1 1 auto;\n" + " flex: 1 1 auto;\n" + " width: 0;\n" + " height: 100%;\n" + "}\n" + +"#qr .oekaki-bg {\n" + +" position: relative;\n" + +" display: inline-block;\n" + +" height: 100%;\n" + +" width: 10%;\n" + +" margin-left: 3px;\n" + +"}\n" + +"#qr .oekaki-bg > * {\n" + +" position: absolute;\n" + +" top: 0;\n" + +" left: 0;\n" + +" margin: 0;\n" + +"}\n" + +"#qr .oekaki-bg > :not([name=\"oekaki-bgcolor\"]) {\n" + +" z-index: 1;\n" + +"}\n" + +"#qr [name=\"oekaki-bgcolor\"] {\n" + +" height: 100%;\n" + +" width: 100%;\n" + +" border: none;\n" + +" padding: 0;\n" + +"}\n" + +"#qr [name=\"oekaki-bg\"]:not(:checked) ~ [name=\"oekaki-bgcolor\"] {\n" + +" visibility: hidden;\n" + +"}\n" + "#qr input[type=\"file\"] {\n" + " visibility: hidden;\n" + " position: absolute;\n" + diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index c5d7987f0..806601f17 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 67bc5c1eb..8cebfa49d 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.15.1 +// @version 1.11.15.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 815dd1808..c5f6f01fa 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.15.1 +// @version 1.11.15.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -415,7 +415,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.15.1', + VERSION: '1.11.15.2', NAMESPACE: '4chan X.', boards: {} }; @@ -7453,7 +7453,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) { @@ -9116,10 +9116,12 @@ FCX.oekakiName = 'tegaki.png'; return Tegaki.open({ onDone: FCX.oekakiCB, - onCancel: function() {}, + onCancel: function() { + return Tegaki.bgColor = '#ffffff'; + }, width: +document.querySelector('#qr [name=oekaki-width]').value, height: +document.querySelector('#qr [name=oekaki-height]').value, - bgColor: '#ffffff' + bgColor: document.querySelector('#qr [name=oekaki-bg]').checked ? document.querySelector('#qr [name=oekaki-bgcolor]').value : 'transparent' }); }); }, @@ -18484,7 +18486,7 @@ "#captchaContainerAlt td:nth-child(2) {\n" + " display: table-cell !important;\n" + "}\n" + -"#tegaki-canvas {\n" + +"canvas#tegaki-canvas {\n" + " background: none;\n" + "}\n" + "/* Disable obnoxious captcha fade-in. */\n" + @@ -19717,7 +19719,7 @@ " position: static !important;\n" + "}\n" + "/* File Input, Submit Button, Oekaki */\n" + -"#file-n-submit, .oekaki {\n" + +"#file-n-submit, #qr .oekaki {\n" + " display: -webkit-flex;\n" + " display: flex;\n" + " -webkit-align-items: stretch;\n" + @@ -19772,10 +19774,10 @@ "#qr-no-file {\n" + " color: #AAA;\n" + "}\n" + -".oekaki.has-file {\n" + +"#qr .oekaki.has-file {\n" + " display: none;\n" + "}\n" + -".oekaki > label {\n" + +"#qr .oekaki > label {\n" + " -webkit-flex: 1 1 auto;\n" + " flex: 1 1 auto;\n" + " width: 0;\n" + @@ -19785,15 +19787,40 @@ " align-items: center;\n" + " height: 100%;\n" + "}\n" + -".oekaki > label > span {\n" + +"#qr .oekaki > label > span {\n" + " margin: 0 3px;\n" + "}\n" + -".oekaki > label > input {\n" + +"#qr .oekaki > label > input {\n" + " -webkit-flex: 1 1 auto;\n" + " flex: 1 1 auto;\n" + " width: 0;\n" + " height: 100%;\n" + "}\n" + +"#qr .oekaki-bg {\n" + +" position: relative;\n" + +" display: inline-block;\n" + +" height: 100%;\n" + +" width: 10%;\n" + +" margin-left: 3px;\n" + +"}\n" + +"#qr .oekaki-bg > * {\n" + +" position: absolute;\n" + +" top: 0;\n" + +" left: 0;\n" + +" margin: 0;\n" + +"}\n" + +"#qr .oekaki-bg > :not([name=\"oekaki-bgcolor\"]) {\n" + +" z-index: 1;\n" + +"}\n" + +"#qr [name=\"oekaki-bgcolor\"] {\n" + +" height: 100%;\n" + +" width: 100%;\n" + +" border: none;\n" + +" padding: 0;\n" + +"}\n" + +"#qr [name=\"oekaki-bg\"]:not(:checked) ~ [name=\"oekaki-bgcolor\"] {\n" + +" visibility: hidden;\n" + +"}\n" + "#qr input[type=\"file\"] {\n" + " visibility: hidden;\n" + " position: absolute;\n" + diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index fd04908c9..e5165f0e5 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 a590c765b..16b2ea23c 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 74aa3cb2a..358228d65 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 2d2a9d72b..3696f08db 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.11.15.1", - "date": "2015-11-02T00:58:53.147Z" + "version": "1.11.15.2", + "date": "2015-11-02T07:58:57.016Z" }