We don't have flex...

So let's manually sort our menus!
This commit is contained in:
Zixaphir 2013-04-22 15:33:15 -07:00
parent fcbdfdd63e
commit 1aad1524b0
7 changed files with 25 additions and 26 deletions

View File

@ -1807,6 +1807,9 @@
menu = this.makeMenu();
currentMenu = menu;
lastToggledButton = button;
this.entries.sort(function(first, second) {
return first.order - second.order;
});
_ref = this.entries;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
entry = _ref[_i];
@ -3292,7 +3295,7 @@
return $.event('AddMenuEntry', {
type: 'header',
el: el,
order: 80,
order: 105,
subEntries: subEntries
});
},
@ -8332,7 +8335,7 @@
return true;
},
toggle: function() {
var container, containers, node, nodes, replies, reply, thread, _i, _j, _k, _len, _len1, _len2;
var container, containers, node, nodes, replies, reply, thread, _i, _j, _len, _len1;
thread = $('.thread');
replies = $$('.thread > .replyContainer, .threadContainer > .replyContainer', thread);
@ -8350,10 +8353,6 @@
})();
for (_i = 0, _len = nodes.length; _i < _len; _i++) {
node = nodes[_i];
Unread.node.call(node);
}
for (_j = 0, _len1 = nodes.length; _j < _len1; _j++) {
node = nodes[_j];
QuoteThreading.node(node);
}
} else {
@ -8366,8 +8365,8 @@
});
$.add(thread, replies);
containers = $$('.threadContainer', thread);
for (_k = 0, _len2 = containers.length; _k < _len2; _k++) {
container = containers[_k];
for (_j = 0, _len1 = containers.length; _j < _len1; _j++) {
container = containers[_j];
$.rm(container);
}
Unread.update(true);

View File

@ -1798,6 +1798,9 @@
menu = this.makeMenu();
currentMenu = menu;
lastToggledButton = button;
this.entries.sort(function(first, second) {
return first.order - second.order;
});
_ref = this.entries;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
entry = _ref[_i];
@ -3283,7 +3286,7 @@
return $.event('AddMenuEntry', {
type: 'header',
el: el,
order: 80,
order: 105,
subEntries: subEntries
});
},
@ -8348,7 +8351,7 @@
return true;
},
toggle: function() {
var container, containers, node, nodes, replies, reply, thread, _i, _j, _k, _len, _len1, _len2;
var container, containers, node, nodes, replies, reply, thread, _i, _j, _len, _len1;
thread = $('.thread');
replies = $$('.thread > .replyContainer, .threadContainer > .replyContainer', thread);
@ -8366,10 +8369,6 @@
})();
for (_i = 0, _len = nodes.length; _i < _len; _i++) {
node = nodes[_i];
Unread.node.call(node);
}
for (_j = 0, _len1 = nodes.length; _j < _len1; _j++) {
node = nodes[_j];
QuoteThreading.node(node);
}
} else {
@ -8382,8 +8381,8 @@
});
$.add(thread, replies);
containers = $$('.threadContainer', thread);
for (_k = 0, _len2 = containers.length; _k < _len2; _k++) {
container = containers[_k];
for (_j = 0, _len1 = containers.length; _j < _len1; _j++) {
container = containers[_j];
$.rm(container);
}
Unread.update(true);

Binary file not shown.

View File

@ -1721,6 +1721,9 @@
menu = this.makeMenu();
currentMenu = menu;
lastToggledButton = button;
this.entries.sort(function(first, second) {
return first.order - second.order;
});
_ref = this.entries;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
entry = _ref[_i];
@ -3206,7 +3209,7 @@
return $.event('AddMenuEntry', {
type: 'header',
el: el,
order: 80,
order: 105,
subEntries: subEntries
});
},
@ -8252,7 +8255,7 @@
return true;
},
toggle: function() {
var container, containers, node, nodes, replies, reply, thread, _i, _j, _k, _len, _len1, _len2;
var container, containers, node, nodes, replies, reply, thread, _i, _j, _len, _len1;
thread = $('.thread');
replies = $$('.thread > .replyContainer, .threadContainer > .replyContainer', thread);
@ -8270,10 +8273,6 @@
})();
for (_i = 0, _len = nodes.length; _i < _len; _i++) {
node = nodes[_i];
Unread.node.call(node);
}
for (_j = 0, _len1 = nodes.length; _j < _len1; _j++) {
node = nodes[_j];
QuoteThreading.node(node);
}
} else {
@ -8286,8 +8285,8 @@
});
$.add(thread, replies);
containers = $$('.threadContainer', thread);
for (_k = 0, _len2 = containers.length; _k < _len2; _k++) {
container = containers[_k];
for (_j = 0, _len1 = containers.length; _j < _len1; _j++) {
container = containers[_j];
$.rm(container);
}
Unread.update(true);

View File

@ -171,7 +171,7 @@ ImageExpand =
$.event 'AddMenuEntry',
type: 'header'
el: el
order: 80
order: 105
subEntries: subEntries
createSubEntry: (type, config) ->

View File

@ -89,7 +89,6 @@ QuoteThreading =
QuoteThreading.enabled = @checked
if @checked
nodes = (Get.postFromNode reply for reply in replies)
Unread.node.call node for node in nodes
QuoteThreading.node node for node in nodes
else
replies.sort (a, b) ->

View File

@ -54,6 +54,9 @@ UI = do ->
menu = @makeMenu()
currentMenu = menu
lastToggledButton = button
@entries.sort (first, second) ->
first.order - second.order
for entry in @entries
@insertEntry entry, menu, data