Remove more QR stuff.
This commit is contained in:
parent
a87f787e6c
commit
e8f8a288b7
@ -2667,14 +2667,6 @@
|
|||||||
} else {
|
} else {
|
||||||
g.PAGENUM = parseInt(temp) || 0;
|
g.PAGENUM = parseInt(temp) || 0;
|
||||||
}
|
}
|
||||||
if (location.hostname === 'sys.4chan.org') {
|
|
||||||
if (/interactive|complete/.test(d.readyState)) {
|
|
||||||
qr.sys();
|
|
||||||
} else {
|
|
||||||
$.on(d, 'DOMContentLoaded', qr.sys);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$.on(window, 'message', Main.message);
|
$.on(window, 'message', Main.message);
|
||||||
now = Date.now();
|
now = Date.now();
|
||||||
if (conf['Check for Updates'] && $.get('lastUpdate', 0) < now - 6 * HOUR) {
|
if (conf['Check for Updates'] && $.get('lastUpdate', 0) < now - 6 * HOUR) {
|
||||||
@ -2772,12 +2764,10 @@
|
|||||||
return options.init();
|
return options.init();
|
||||||
},
|
},
|
||||||
message: function(e) {
|
message: function(e) {
|
||||||
var data, origin;
|
var version;
|
||||||
origin = e.origin, data = e.data;
|
version = e.data.version;
|
||||||
if (origin === 'http://sys.4chan.org') {
|
if (version && version !== VERSION && confirm('An updated version of 4chan X is available, would you like to install it now?')) {
|
||||||
return qr.message(data);
|
return window.location = "https://raw.github.com/mayhemydg/4chan-x/" + version + "/4chan_x.user.js";
|
||||||
} else if (data.version && data.version !== VERSION && confirm('An updated version of 4chan X is available, would you like to install it now?')) {
|
|
||||||
return window.location = "https://raw.github.com/mayhemydg/4chan-x/" + data.version + "/4chan_x.user.js";
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
node: function(e) {
|
node: function(e) {
|
||||||
@ -2804,7 +2794,7 @@
|
|||||||
div.dialog > div.move {\
|
div.dialog > div.move {\
|
||||||
cursor: move;\
|
cursor: move;\
|
||||||
}\
|
}\
|
||||||
label, a, .favicon, #qr img {\
|
label, a, .favicon {\
|
||||||
cursor: pointer;\
|
cursor: pointer;\
|
||||||
}\
|
}\
|
||||||
a[href="javascript:;"] {\
|
a[href="javascript:;"] {\
|
||||||
@ -2910,47 +2900,6 @@
|
|||||||
#flavors {\
|
#flavors {\
|
||||||
height: 100%;\
|
height: 100%;\
|
||||||
}\
|
}\
|
||||||
\
|
|
||||||
#qr {\
|
|
||||||
position: fixed;\
|
|
||||||
max-height: 100%;\
|
|
||||||
overflow-x: hidden;\
|
|
||||||
overflow-y: auto;\
|
|
||||||
}\
|
|
||||||
#qr > div.move {\
|
|
||||||
text-align: right;\
|
|
||||||
}\
|
|
||||||
#qr input[name=name] {\
|
|
||||||
float: left;\
|
|
||||||
}\
|
|
||||||
#qr_form {\
|
|
||||||
clear: left;\
|
|
||||||
}\
|
|
||||||
#qr_form, #qr #com_submit, #qr input[name=upfile] {\
|
|
||||||
margin: 0;\
|
|
||||||
}\
|
|
||||||
#qr textarea {\
|
|
||||||
width: 100%;\
|
|
||||||
height: 125px;\
|
|
||||||
}\
|
|
||||||
#qr #close, #qr #autohide {\
|
|
||||||
float: right;\
|
|
||||||
}\
|
|
||||||
#qr:not(:hover) > #autohide:checked ~ .autohide {\
|
|
||||||
height: 0;\
|
|
||||||
overflow: hidden;\
|
|
||||||
}\
|
|
||||||
/* http://stackoverflow.com/questions/2610497/change-an-inputs-html5-placeholder-color-with-css */\
|
|
||||||
#qr input::-webkit-input-placeholder {\
|
|
||||||
color: grey;\
|
|
||||||
}\
|
|
||||||
#qr input:-moz-placeholder {\
|
|
||||||
color: grey;\
|
|
||||||
}\
|
|
||||||
/* qr reCAPTCHA */\
|
|
||||||
#qr img {\
|
|
||||||
border: 1px solid #AAA;\
|
|
||||||
}\
|
|
||||||
\
|
\
|
||||||
#updater {\
|
#updater {\
|
||||||
position: fixed;\
|
position: fixed;\
|
||||||
@ -3008,10 +2957,6 @@
|
|||||||
.filtered {\
|
.filtered {\
|
||||||
text-decoration: line-through;\
|
text-decoration: line-through;\
|
||||||
}\
|
}\
|
||||||
\
|
|
||||||
#files > input {\
|
|
||||||
display: block;\
|
|
||||||
}\
|
|
||||||
'
|
'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -2000,13 +2000,6 @@ Main =
|
|||||||
else
|
else
|
||||||
g.PAGENUM = parseInt(temp) or 0
|
g.PAGENUM = parseInt(temp) or 0
|
||||||
|
|
||||||
if location.hostname is 'sys.4chan.org'
|
|
||||||
if /interactive|complete/.test d.readyState
|
|
||||||
qr.sys()
|
|
||||||
else
|
|
||||||
$.on d, 'DOMContentLoaded', qr.sys
|
|
||||||
return
|
|
||||||
|
|
||||||
$.on window, 'message', Main.message
|
$.on window, 'message', Main.message
|
||||||
|
|
||||||
now = Date.now()
|
now = Date.now()
|
||||||
@ -2151,11 +2144,9 @@ Main =
|
|||||||
options.init()
|
options.init()
|
||||||
|
|
||||||
message: (e) ->
|
message: (e) ->
|
||||||
{origin, data} = e
|
{version} = e.data
|
||||||
if origin is 'http://sys.4chan.org'
|
if version and version isnt VERSION and confirm 'An updated version of 4chan X is available, would you like to install it now?'
|
||||||
qr.message data
|
window.location = "https://raw.github.com/mayhemydg/4chan-x/#{version}/4chan_x.user.js"
|
||||||
else if data.version and data.version isnt VERSION and confirm 'An updated version of 4chan X is available, would you like to install it now?'
|
|
||||||
window.location = "https://raw.github.com/mayhemydg/4chan-x/#{data.version}/4chan_x.user.js"
|
|
||||||
|
|
||||||
node: (e) ->
|
node: (e) ->
|
||||||
{target} = e
|
{target} = e
|
||||||
@ -2174,7 +2165,7 @@ Main =
|
|||||||
div.dialog > div.move {
|
div.dialog > div.move {
|
||||||
cursor: move;
|
cursor: move;
|
||||||
}
|
}
|
||||||
label, a, .favicon, #qr img {
|
label, a, .favicon {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
a[href="javascript:;"] {
|
a[href="javascript:;"] {
|
||||||
@ -2281,47 +2272,6 @@ Main =
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#qr {
|
|
||||||
position: fixed;
|
|
||||||
max-height: 100%;
|
|
||||||
overflow-x: hidden;
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
#qr > div.move {
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
#qr input[name=name] {
|
|
||||||
float: left;
|
|
||||||
}
|
|
||||||
#qr_form {
|
|
||||||
clear: left;
|
|
||||||
}
|
|
||||||
#qr_form, #qr #com_submit, #qr input[name=upfile] {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
#qr textarea {
|
|
||||||
width: 100%;
|
|
||||||
height: 125px;
|
|
||||||
}
|
|
||||||
#qr #close, #qr #autohide {
|
|
||||||
float: right;
|
|
||||||
}
|
|
||||||
#qr:not(:hover) > #autohide:checked ~ .autohide {
|
|
||||||
height: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
/* http://stackoverflow.com/questions/2610497/change-an-inputs-html5-placeholder-color-with-css */
|
|
||||||
#qr input::-webkit-input-placeholder {
|
|
||||||
color: grey;
|
|
||||||
}
|
|
||||||
#qr input:-moz-placeholder {
|
|
||||||
color: grey;
|
|
||||||
}
|
|
||||||
/* qr reCAPTCHA */
|
|
||||||
#qr img {
|
|
||||||
border: 1px solid #AAA;
|
|
||||||
}
|
|
||||||
|
|
||||||
#updater {
|
#updater {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
@ -2378,10 +2328,6 @@ Main =
|
|||||||
.filtered {
|
.filtered {
|
||||||
text-decoration: line-through;
|
text-decoration: line-through;
|
||||||
}
|
}
|
||||||
|
|
||||||
#files > input {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
'
|
'
|
||||||
|
|
||||||
Main.init()
|
Main.init()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user