Merge branch 'master' of github.com:MayhemYDG/4chan-x

This commit is contained in:
Nicolas Stepien 2012-12-11 12:17:13 +01:00
commit 3c6d7e0c4f
2 changed files with 12 additions and 3 deletions

View File

@ -2696,7 +2696,7 @@
return $.ready(Options.initReady); return $.ready(Options.initReady);
}, },
initReady: function() { initReady: function() {
var a, settings, _i, _len, _ref; var a, setting, settings, _i, _len, _ref;
_ref = ['navtopright', 'navbotright']; _ref = ['navtopright', 'navbotright'];
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
settings = _ref[_i]; settings = _ref[_i];
@ -2706,7 +2706,12 @@
textContent: '4chan X Settings' textContent: '4chan X Settings'
}); });
$.on(a, 'click', Options.dialog); $.on(a, 'click', Options.dialog);
$.prepend($.id(settings), [$.tn('['), a, $.tn('] ')]); setting = $.id(settings);
if (Conf['Disable 4chan\'s extension']) {
$.replace(setting.childNodes[1], a);
continue;
}
$.prepend(setting, [$.tn('['), a, $.tn('] ')]);
} }
if (!$.get('firstrun')) { if (!$.get('firstrun')) {
$.set('firstrun', true); $.set('firstrun', true);

View File

@ -2148,7 +2148,11 @@ Options =
className: 'settingsWindowLink' className: 'settingsWindowLink'
textContent: '4chan X Settings' textContent: '4chan X Settings'
$.on a, 'click', Options.dialog $.on a, 'click', Options.dialog
$.prepend $.id(settings), [$.tn('['), a, $.tn('] ')] setting = $.id settings
if Conf['Disable 4chan\'s extension']
$.replace setting.childNodes[1], a
continue
$.prepend setting, [$.tn('['), a, $.tn('] ')]
unless $.get 'firstrun' unless $.get 'firstrun'
$.set 'firstrun', true $.set 'firstrun', true
# Prevent race conditions # Prevent race conditions