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

Fix Unread Count with JSON features

Browse Source
This commit is contained in:
Zixaphir 2014-01-10 23:41:09 -07:00
parent 685f74de50
commit 1900bbfa27
3 changed files with 46 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
builds/4chan-X.user.js
View File

@ -11943,28 +11943,23 @@
Main.handleErrors(errors);
}
},
ready: function() {
var condition, err, errors, feature, name, _i, _len, _ref, _ref1;
_ref = [['Unread Count', Unread, Conf['Unread Count']], ['Quote Threading', QuoteThreading, Conf['Quote Threading'] && !Conf['Unread Count']]];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
_ref1 = _ref[_i], name = _ref1[0], feature = _ref1[1], condition = _ref1[2];
try {
if (condition) {
feature.ready();
}
} catch (_error) {
err = _error;
if (!errors) {
errors = [];
}
errors.push({
message: "Failed to reconnect feature " + name + ".",
error: err
});
ready: function(name, feature, condition) {
var err, error;
try {
if (condition) {
feature();
}
} catch (_error) {
err = _error;
error = [
{
message: "Quote Threading Failed.",
error: err
}
];
}
if (errors) {
Main.handleErrors(errors);
if (error) {
Main.handleErrors(error);
}
return QR.generatePostableThreadsList();
},
@ -12170,7 +12165,7 @@
}
Main.callbackNodes(Thread, [thread]);
Main.callbackNodes(Post, posts);
Navigate.ready();
Navigate.ready('Quote Threading', QuoteThreading.force, Conf['Quote Threading']);
return Navigate.buildThread();
},
buildThread: function() {
@ -12179,6 +12174,7 @@
$.rmAll(board);
$.add(board, Navigate.threadRoot);
if (Conf['Unread Count']) {
Navigate.ready('Unread Count', Unread.ready, Conf['Unread Count']);
Unread.read();
return Unread.update();
}
@ -12190,18 +12186,6 @@
id: 'popState'
});
return Navigate.navigate.call(a);
},
refresh: function(context) {
var boardID, feature, name, threadID, view, _i, _len, _ref, _ref1;
return;
boardID = context.boardID, view = context.view, threadID = context.threadID;
_ref = Main.features;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
_ref1 = _ref[_i], name = _ref1[0], feature = _ref1[1];
if (feature.refresh) {
feature.refresh();
}
}
}
};

50
builds/crx/script.js
View File

@ -11932,28 +11932,23 @@
Main.handleErrors(errors);
}
},
ready: function() {
var condition, err, errors, feature, name, _i, _len, _ref, _ref1;
_ref = [['Unread Count', Unread, Conf['Unread Count']], ['Quote Threading', QuoteThreading, Conf['Quote Threading'] && !Conf['Unread Count']]];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
_ref1 = _ref[_i], name = _ref1[0], feature = _ref1[1], condition = _ref1[2];
try {
if (condition) {
feature.ready();
}
} catch (_error) {
err = _error;
if (!errors) {
errors = [];
}
errors.push({
message: "Failed to reconnect feature " + name + ".",
error: err
});
ready: function(name, feature, condition) {
var err, error;
try {
if (condition) {
feature();
}
} catch (_error) {
err = _error;
error = [
{
message: "Quote Threading Failed.",
error: err
}
];
}
if (errors) {
Main.handleErrors(errors);
if (error) {
Main.handleErrors(error);
}
return QR.generatePostableThreadsList();
},
@ -12159,7 +12154,7 @@
}
Main.callbackNodes(Thread, [thread]);
Main.callbackNodes(Post, posts);
Navigate.ready();
Navigate.ready('Quote Threading', QuoteThreading.force, Conf['Quote Threading']);
return Navigate.buildThread();
},
buildThread: function() {
@ -12168,6 +12163,7 @@
$.rmAll(board);
$.add(board, Navigate.threadRoot);
if (Conf['Unread Count']) {
Navigate.ready('Unread Count', Unread.ready, Conf['Unread Count']);
Unread.read();
return Unread.update();
}
@ -12182,18 +12178,6 @@
});
return Navigate.navigate.call(a);
});
},
refresh: function(context) {
var boardID, feature, name, threadID, view, _i, _len, _ref, _ref1;
return;
boardID = context.boardID, view = context.view, threadID = context.threadID;
_ref = Main.features;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
_ref1 = _ref[_i], name = _ref1[0], feature = _ref1[1];
if (feature.refresh) {
feature.refresh();
}
}
}
};

36
src/General/Navigate.coffee
View File

@ -81,20 +81,16 @@ Navigate =
return
ready: ->
for [name, feature, condition] in [
['Unread Count', Unread, Conf['Unread Count']]
['Quote Threading', QuoteThreading, Conf['Quote Threading'] and not Conf['Unread Count']]
]
try
feature.ready() if condition
catch err
errors = [] unless errors
errors.push
message: "Failed to reconnect feature #{name}."
error: err
ready: (name, feature, condition) ->
try
feature() if condition
catch err
error = [
message: "Quote Threading Failed."
error: err
]
Main.handleErrors errors if errors
Main.handleErrors error if error
QR.generatePostableThreadsList()
updateContext: (view) ->
@ -220,8 +216,6 @@ Navigate =
Navigate.notice = new Notice 'info', 'Loading thread...'
), 3 * $.SECOND
# Navigate.refresh {boardID, view, threadID}
load: (e) ->
$.rmClass Index.button, 'fa-spin'
{req, notice} = Navigate
@ -278,7 +272,7 @@ Navigate =
Main.callbackNodes Thread, [thread]
Main.callbackNodes Post, posts
Navigate.ready()
Navigate.ready 'Quote Threading', QuoteThreading.force, Conf['Quote Threading']
Navigate.buildThread()
@ -286,7 +280,9 @@ Navigate =
board = $ '.board'
$.rmAll board
$.add board, Navigate.threadRoot
if Conf['Unread Count']
Navigate.ready 'Unread Count', Unread.ready, Conf['Unread Count']
Unread.read()
Unread.update()
@ -300,11 +296,3 @@ Navigate =
id: 'popState'
Navigate.navigate.call a
refresh: (context) ->
return
{boardID, view, threadID} = context
# Refresh features
feature.refresh() for [name, feature] in Main.features when feature.refresh
return