Merge branch 'v3'

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-03-23 14:33:16 -07:00
commit 528e5667ef
5 changed files with 20 additions and 20 deletions

View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.9.7 - 2014-03-22 * appchan x - Version 2.9.7 - 2014-03-23
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

View File

@ -25,7 +25,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.9.7 - 2014-03-22 * appchan x - Version 2.9.7 - 2014-03-23
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -4645,9 +4645,6 @@
}); });
$.on(this.button, 'click', this.update); $.on(this.button, 'click', this.update);
Header.addShortcut(this.button, 1); Header.addShortcut(this.button, 1);
if (g.BOARD.ID === 'f') {
return;
}
this.db = new DataBoard('pinnedThreads'); this.db = new DataBoard('pinnedThreads');
Thread.callbacks.push({ Thread.callbacks.push({
name: 'Thread Pinning', name: 'Thread Pinning',
@ -11852,7 +11849,8 @@
ThreadUpdater.root = this.OP.nodes.root.parentNode; ThreadUpdater.root = this.OP.nodes.root.parentNode;
ThreadUpdater.lastPost = +this.posts.keys[this.posts.keys.length - 1]; ThreadUpdater.lastPost = +this.posts.keys[this.posts.keys.length - 1];
ThreadUpdater.cb.interval.call($.el('input', { ThreadUpdater.cb.interval.call($.el('input', {
value: Conf['Interval'] value: Conf['Interval'],
name: 'Interval'
})); }));
$.on(window, 'online offline', ThreadUpdater.cb.online); $.on(window, 'online offline', ThreadUpdater.cb.online);
$.on(d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost); $.on(d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost);
@ -11919,14 +11917,16 @@
return !d.hidden; return !d.hidden;
}; };
}, },
interval: function() { interval: function(e) {
var val; var val;
val = parseInt(this.value, 10); val = parseInt(this.value, 10);
if (val < 1) { if (val < 1) {
val = 1; val = 1;
} }
ThreadUpdater.interval = this.value = val; ThreadUpdater.interval = this.value = val;
return $.cb.value.call(this); if (e) {
return $.cb.value.call(this);
}
}, },
load: function(e) { load: function(e) {
var klass, req, text, _ref; var klass, req, text, _ref;

View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* appchan x - Version 2.9.7 - 2014-03-22 * appchan x - Version 2.9.7 - 2014-03-23
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -4703,9 +4703,6 @@
}); });
$.on(this.button, 'click', this.update); $.on(this.button, 'click', this.update);
Header.addShortcut(this.button, 1); Header.addShortcut(this.button, 1);
if (g.BOARD.ID === 'f') {
return;
}
this.db = new DataBoard('pinnedThreads'); this.db = new DataBoard('pinnedThreads');
Thread.callbacks.push({ Thread.callbacks.push({
name: 'Thread Pinning', name: 'Thread Pinning',
@ -11866,7 +11863,8 @@
ThreadUpdater.root = this.OP.nodes.root.parentNode; ThreadUpdater.root = this.OP.nodes.root.parentNode;
ThreadUpdater.lastPost = +this.posts.keys[this.posts.keys.length - 1]; ThreadUpdater.lastPost = +this.posts.keys[this.posts.keys.length - 1];
ThreadUpdater.cb.interval.call($.el('input', { ThreadUpdater.cb.interval.call($.el('input', {
value: Conf['Interval'] value: Conf['Interval'],
name: 'Interval'
})); }));
$.on(window, 'online offline', ThreadUpdater.cb.online); $.on(window, 'online offline', ThreadUpdater.cb.online);
$.on(d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost); $.on(d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost);
@ -11933,14 +11931,16 @@
return !d.hidden; return !d.hidden;
}; };
}, },
interval: function() { interval: function(e) {
var val; var val;
val = parseInt(this.value, 10); val = parseInt(this.value, 10);
if (val < 1) { if (val < 1) {
val = 1; val = 1;
} }
ThreadUpdater.interval = this.value = val; ThreadUpdater.interval = this.value = val;
return $.cb.value.call(this); if (e) {
return $.cb.value.call(this);
}
}, },
load: function(e) { load: function(e) {
var klass, req, text, _ref; var klass, req, text, _ref;

View File

@ -13,8 +13,6 @@ Index =
$.on @button, 'click', @update $.on @button, 'click', @update
Header.addShortcut @button, 1 Header.addShortcut @button, 1
return if g.BOARD.ID is 'f'
@db = new DataBoard 'pinnedThreads' @db = new DataBoard 'pinnedThreads'
Thread.callbacks.push Thread.callbacks.push
name: 'Thread Pinning' name: 'Thread Pinning'

View File

@ -97,7 +97,9 @@ ThreadUpdater =
ThreadUpdater.root = @OP.nodes.root.parentNode ThreadUpdater.root = @OP.nodes.root.parentNode
ThreadUpdater.lastPost = +@posts.keys[@posts.keys.length - 1] ThreadUpdater.lastPost = +@posts.keys[@posts.keys.length - 1]
ThreadUpdater.cb.interval.call $.el 'input', value: Conf['Interval'] ThreadUpdater.cb.interval.call $.el 'input',
value: Conf['Interval']
name: 'Interval'
$.on window, 'online offline', ThreadUpdater.cb.online $.on window, 'online offline', ThreadUpdater.cb.online
$.on d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost $.on d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost
@ -148,11 +150,11 @@ ThreadUpdater =
-> true -> true
else else
-> not d.hidden -> not d.hidden
interval: -> interval: (e) ->
val = parseInt @value, 10 val = parseInt @value, 10
if val < 1 then val = 1 if val < 1 then val = 1
ThreadUpdater.interval = @value = val ThreadUpdater.interval = @value = val
$.cb.value.call @ $.cb.value.call @ if e
load: (e) -> load: (e) ->
{req} = ThreadUpdater {req} = ThreadUpdater
switch req.status switch req.status