Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the .error class to .warning.

Browse Source
This commit is contained in:
Nicolas Stepien 2012-01-25 20:23:37 +01:00
parent a65faabcbe
commit 93895e081e
2 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
4chan_x.user.js
View File

@ -1259,7 +1259,7 @@
}, },
error: function(err, node) { error: function(err, node) {
var el; var el;
el = $('.error', qr.el); el = $('.warning', qr.el);
el.textContent = err; el.textContent = err;
if (node) $.replace(el.firstChild, node); if (node) $.replace(el.firstChild, node);
qr.open(); qr.open();
@ -1268,7 +1268,7 @@
} }
}, },
cleanError: function() { cleanError: function() {
return $('.error', qr.el).textContent = null; return $('.warning', qr.el).textContent = null;
}, },
status: function(data) { status: function(data) {
var disabled, input, value; var disabled, input, value;
@ -1540,7 +1540,7 @@
}); });
qr.mimeTypes = mimeTypes.split(', '); qr.mimeTypes = mimeTypes.split(', ');
qr.spoiler = !!$('#com_submit + label'); qr.spoiler = !!$('#com_submit + label');
qr.el = ui.dialog('qr', 'top:0;right:0;', "<div class=move> Quick Reply <input type=checkbox name=autohide id=autohide title=Auto-hide> <span>" + (g.REPLY ? '' : threads) + " <a class=close>x</a></span></div><form> <div><input id=dump class=field type=button title='Dump mode' value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div> <output id=replies><div><a id=addReply href=javascript:;>+</a></div></output> <div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div> <div class=captcha title=Reload><img></div> <div><input name=captcha title=Verification class=field autocomplete=off size=1></div> <div><input type=file name=upfile max=" + ($('[name=MAX_FILE_SIZE]').value) + " accept='" + mimeTypes + "' multiple><input type=submit></div> <label" + (qr.spoiler ? '' : ' hidden') + "><input type=checkbox id=spoiler> Spoiler Image?</label> <div class=error></div></form>"); qr.el = ui.dialog('qr', 'top:0;right:0;', "<div class=move> Quick Reply <input type=checkbox name=autohide id=autohide title=Auto-hide> <span>" + (g.REPLY ? '' : threads) + " <a class=close>x</a></span></div><form> <div><input id=dump class=field type=button title='Dump mode' value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div> <output id=replies><div><a id=addReply href=javascript:;>+</a></div></output> <div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div> <div class=captcha title=Reload><img></div> <div><input name=captcha title=Verification class=field autocomplete=off size=1></div> <div><input type=file name=upfile max=" + ($('[name=MAX_FILE_SIZE]').value) + " accept='" + mimeTypes + "' multiple><input type=submit></div> <label" + (qr.spoiler ? '' : ' hidden') + "><input type=checkbox id=spoiler> Spoiler Image?</label> <div class=warning></div></form>");
if (!g.REPLY) { if (!g.REPLY) {
$.on($('select', qr.el), 'mousedown', function(e) { $.on($('select', qr.el), 'mousedown', function(e) {
return e.stopPropagation(); return e.stopPropagation();
@ -1837,12 +1837,12 @@
<div></div>\ <div></div>\
<input type=radio name=tab hidden id=flavors_tab>\ <input type=radio name=tab hidden id=flavors_tab>\
<div>\ <div>\
<div class=error><code>Sauce</code> is disabled.</div>\ <div class=warning><code>Sauce</code> is disabled.</div>\
<textarea name=flavors id=flavors></textarea>\ <textarea name=flavors id=flavors></textarea>\
</div>\ </div>\
<input type=radio name=tab hidden id=filter_tab>\ <input type=radio name=tab hidden id=filter_tab>\
<div>\ <div>\
<div class=error><code>Filter</code> is disabled.</div>\ <div class=warning><code>Filter</code> is disabled.</div>\
Use <a href=https://developer.mozilla.org/en/JavaScript/Guide/Regular_Expressions>regular expressions</a>, one per line.<br>\ Use <a href=https://developer.mozilla.org/en/JavaScript/Guide/Regular_Expressions>regular expressions</a>, one per line.<br>\
For example, <code>/weeaboo/i</code> will filter posts containing `weeaboo` case-insensitive.\ For example, <code>/weeaboo/i</code> will filter posts containing `weeaboo` case-insensitive.\
<p>Name:<br><textarea name=name></textarea></p>\ <p>Name:<br><textarea name=name></textarea></p>\
@ -1856,12 +1856,12 @@
</div>\ </div>\
<input type=radio name=tab hidden id=rice_tab>\ <input type=radio name=tab hidden id=rice_tab>\
<div>\ <div>\
<div class=error><code>Quote Backlinks</code> are disabled.</div>\ <div class=warning><code>Quote Backlinks</code> are disabled.</div>\
<ul>\ <ul>\
Backlink formatting\ Backlink formatting\
<li><input type=text name=backlink> : <span id=backlinkPreview></span></li>\ <li><input type=text name=backlink> : <span id=backlinkPreview></span></li>\
</ul>\ </ul>\
<div class=error><code>Time Formatting</code> is disabled.</div>\ <div class=warning><code>Time Formatting</code> is disabled.</div>\
<ul>\ <ul>\
Time formatting\ Time formatting\
<li><input type=text name=time> : <span id=timePreview></span></li>\ <li><input type=text name=time> : <span id=timePreview></span></li>\
@ -1872,7 +1872,7 @@
<li>Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P</li>\ <li>Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P</li>\
<li>Minutes: %M</li>\ <li>Minutes: %M</li>\
</ul>\ </ul>\
<div class=error><code>Unread Count</code> is disabled.</div>\ <div class=warning><code>Unread Count</code> is disabled.</div>\
Unread favicons<br>\ Unread favicons<br>\
<select name=favicon>\ <select name=favicon>\
<option value=ferongr>ferongr</option>\ <option value=ferongr>ferongr</option>\
@ -1885,7 +1885,7 @@
</div>\ </div>\
<input type=radio name=tab hidden id=keybinds_tab>\ <input type=radio name=tab hidden id=keybinds_tab>\
<div>\ <div>\
<div class=error><code>Keybinds</code> are disabled.</div>\ <div class=warning><code>Keybinds</code> are disabled.</div>\
<table><tbody>\ <table><tbody>\
<tr><th>Actions</th><th>Keybinds</th></tr>\ <tr><th>Actions</th><th>Keybinds</th></tr>\
<tr><td>Open Options</td><td><input name=openOptions></td></tr>\ <tr><td>Open Options</td><td><input name=openOptions></td></tr>\
@ -1963,7 +1963,7 @@
$.on(input, 'keydown', options.keybind); $.on(input, 'keydown', options.keybind);
} }
indicators = {}; indicators = {};
_ref4 = $$('.error', dialog); _ref4 = $$('.warning', dialog);
for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) { for (_k = 0, _len3 = _ref4.length; _k < _len3; _k++) {
indicator = _ref4[_k]; indicator = _ref4[_k];
key = indicator.firstChild.textContent; key = indicator.firstChild.textContent;
@ -2227,7 +2227,7 @@
if (this.status === 404) { if (this.status === 404) {
updater.timer.textContent = ''; updater.timer.textContent = '';
updater.count.textContent = 404; updater.count.textContent = 404;
updater.count.className = 'error'; updater.count.className = 'warning';
clearTimeout(updater.timeoutID); clearTimeout(updater.timeoutID);
d.title = d.title.match(/^.+-/)[0] + ' 404'; d.title = d.title.match(/^.+-/)[0] + ' 404';
g.dead = true; g.dead = true;
@ -2256,7 +2256,7 @@
}); });
if ($('title', body).textContent === '4chan - Banned') { if ($('title', body).textContent === '4chan - Banned') {
updater.count.textContent = 'Banned'; updater.count.textContent = 'Banned';
updater.count.className = 'error'; updater.count.className = 'warning';
return; return;
} }
id = ((_ref = $('td[id]', updater.br.previousElementSibling)) != null ? _ref.id : void 0) || 0; id = ((_ref = $('td[id]', updater.br.previousElementSibling)) != null ? _ref.id : void 0) || 0;
@ -2939,7 +2939,7 @@
imgcount = $.id('imagecount'); imgcount = $.id('imagecount');
imgcount.textContent = ++threadStats.images; imgcount.textContent = ++threadStats.images;
if (threadStats.images > threadStats.imgLimit) { if (threadStats.images > threadStats.imgLimit) {
return imgcount.className = 'error'; return imgcount.className = 'warning';
} }
} }
}; };
@ -3596,15 +3596,9 @@ textarea.field {\
.new {\ .new {\
background: lime;\ background: lime;\
}\ }\
.error {\ .warning {\
color: red;\ color: red;\
}\ }\
#error {\
cursor: default;\
}\
#error[href] {\
cursor: pointer;\
}\
td.replyhider {\ td.replyhider {\
vertical-align: top;\ vertical-align: top;\
}\ }\

34
script.coffee
View File

@ -906,13 +906,13 @@ qr =
$.removeClass qr.el, 'autohide' $.removeClass qr.el, 'autohide'
error: (err, node) -> error: (err, node) ->
el = $('.error', qr.el) el = $('.warning', qr.el)
el.textContent = err el.textContent = err
$.replace el.firstChild, node if node $.replace el.firstChild, node if node
qr.open() qr.open()
alert err if d.hidden or d.oHidden or d.mozHidden or d.webkitHidden alert err if d.hidden or d.oHidden or d.mozHidden or d.webkitHidden
cleanError: -> cleanError: ->
$('.error', qr.el).textContent = null $('.warning', qr.el).textContent = null
status: (data={}) -> status: (data={}) ->
if data.ready if data.ready
@ -1134,7 +1134,7 @@ qr =
<div><input name=captcha title=Verification class=field autocomplete=off size=1></div> <div><input name=captcha title=Verification class=field autocomplete=off size=1></div>
<div><input type=file name=upfile max=#{$('[name=MAX_FILE_SIZE]').value} accept='#{mimeTypes}' multiple><input type=submit></div> <div><input type=file name=upfile max=#{$('[name=MAX_FILE_SIZE]').value} accept='#{mimeTypes}' multiple><input type=submit></div>
<label#{if qr.spoiler then '' else ' hidden'}><input type=checkbox id=spoiler> Spoiler Image?</label> <label#{if qr.spoiler then '' else ' hidden'}><input type=checkbox id=spoiler> Spoiler Image?</label>
<div class=error></div> <div class=warning></div>
</form>" </form>"
unless g.REPLY unless g.REPLY
$.on $('select', qr.el), 'mousedown', (e) -> e.stopPropagation() $.on $('select', qr.el), 'mousedown', (e) -> e.stopPropagation()
@ -1380,12 +1380,12 @@ options =
<div></div> <div></div>
<input type=radio name=tab hidden id=flavors_tab> <input type=radio name=tab hidden id=flavors_tab>
<div> <div>
<div class=error><code>Sauce</code> is disabled.</div> <div class=warning><code>Sauce</code> is disabled.</div>
<textarea name=flavors id=flavors></textarea> <textarea name=flavors id=flavors></textarea>
</div> </div>
<input type=radio name=tab hidden id=filter_tab> <input type=radio name=tab hidden id=filter_tab>
<div> <div>
<div class=error><code>Filter</code> is disabled.</div> <div class=warning><code>Filter</code> is disabled.</div>
Use <a href=https://developer.mozilla.org/en/JavaScript/Guide/Regular_Expressions>regular expressions</a>, one per line.<br> Use <a href=https://developer.mozilla.org/en/JavaScript/Guide/Regular_Expressions>regular expressions</a>, one per line.<br>
For example, <code>/weeaboo/i</code> will filter posts containing `weeaboo` case-insensitive. For example, <code>/weeaboo/i</code> will filter posts containing `weeaboo` case-insensitive.
<p>Name:<br><textarea name=name></textarea></p> <p>Name:<br><textarea name=name></textarea></p>
@ -1399,12 +1399,12 @@ options =
</div> </div>
<input type=radio name=tab hidden id=rice_tab> <input type=radio name=tab hidden id=rice_tab>
<div> <div>
<div class=error><code>Quote Backlinks</code> are disabled.</div> <div class=warning><code>Quote Backlinks</code> are disabled.</div>
<ul> <ul>
Backlink formatting Backlink formatting
<li><input type=text name=backlink> : <span id=backlinkPreview></span></li> <li><input type=text name=backlink> : <span id=backlinkPreview></span></li>
</ul> </ul>
<div class=error><code>Time Formatting</code> is disabled.</div> <div class=warning><code>Time Formatting</code> is disabled.</div>
<ul> <ul>
Time formatting Time formatting
<li><input type=text name=time> : <span id=timePreview></span></li> <li><input type=text name=time> : <span id=timePreview></span></li>
@ -1415,7 +1415,7 @@ options =
<li>Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P</li> <li>Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P</li>
<li>Minutes: %M</li> <li>Minutes: %M</li>
</ul> </ul>
<div class=error><code>Unread Count</code> is disabled.</div> <div class=warning><code>Unread Count</code> is disabled.</div>
Unread favicons<br> Unread favicons<br>
<select name=favicon> <select name=favicon>
<option value=ferongr>ferongr</option> <option value=ferongr>ferongr</option>
@ -1428,7 +1428,7 @@ options =
</div> </div>
<input type=radio name=tab hidden id=keybinds_tab> <input type=radio name=tab hidden id=keybinds_tab>
<div> <div>
<div class=error><code>Keybinds</code> are disabled.</div> <div class=warning><code>Keybinds</code> are disabled.</div>
<table><tbody> <table><tbody>
<tr><th>Actions</th><th>Keybinds</th></tr> <tr><th>Actions</th><th>Keybinds</th></tr>
<tr><td>Open Options</td><td><input name=openOptions></td></tr> <tr><td>Open Options</td><td><input name=openOptions></td></tr>
@ -1502,7 +1502,7 @@ options =
#indicate if the settings require a feature to be enabled #indicate if the settings require a feature to be enabled
indicators = {} indicators = {}
for indicator in $$ '.error', dialog for indicator in $$ '.warning', dialog
key = indicator.firstChild.textContent key = indicator.firstChild.textContent
indicator.hidden = conf[key] indicator.hidden = conf[key]
indicators[key] = indicator indicators[key] = indicator
@ -1720,7 +1720,7 @@ updater =
if @status is 404 if @status is 404
updater.timer.textContent = '' updater.timer.textContent = ''
updater.count.textContent = 404 updater.count.textContent = 404
updater.count.className = 'error' updater.count.className = 'warning'
clearTimeout updater.timeoutID clearTimeout updater.timeoutID
d.title = d.title.match(/^.+-/)[0] + ' 404' d.title = d.title.match(/^.+-/)[0] + ' 404'
g.dead = true g.dead = true
@ -1750,7 +1750,7 @@ updater =
#this only works on Chrome because of cross origin policy #this only works on Chrome because of cross origin policy
if $('title', body).textContent is '4chan - Banned' if $('title', body).textContent is '4chan - Banned'
updater.count.textContent = 'Banned' updater.count.textContent = 'Banned'
updater.count.className = 'error' updater.count.className = 'warning'
return return
id = $('td[id]', updater.br.previousElementSibling)?.id or 0 id = $('td[id]', updater.br.previousElementSibling)?.id or 0
@ -2226,7 +2226,7 @@ threadStats =
imgcount = $.id 'imagecount' imgcount = $.id 'imagecount'
imgcount.textContent = ++threadStats.images imgcount.textContent = ++threadStats.images
if threadStats.images > threadStats.imgLimit if threadStats.images > threadStats.imgLimit
imgcount.className = 'error' imgcount.className = 'warning'
unread = unread =
init: -> init: ->
@ -2835,15 +2835,9 @@ textarea.field {
.new { .new {
background: lime; background: lime;
} }
.error { .warning {
color: red; color: red;
} }
#error {
cursor: default;
}
#error[href] {
cursor: pointer;
}
td.replyhider { td.replyhider {
vertical-align: top; vertical-align: top;
} }