From 330019bb3d21e437cc7f39b4d2285efa37962b57 Mon Sep 17 00:00:00 2001
From: "Bobby R. Ward" <bobbyrward@gmail.com>
Date: Mon, 20 Feb 2012 17:27:51 -0600
Subject: [PATCH] Fix #2036: new labels are not sorted on torrent right click

---
 .../Label/deluge/plugins/label/data/label.js  | 56 +++++++++++++------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/deluge/plugins/Label/deluge/plugins/label/data/label.js b/deluge/plugins/Label/deluge/plugins/label/data/label.js
index f7c72aa8b..258adf9e2 100644
--- a/deluge/plugins/Label/deluge/plugins/label/data/label.js
+++ b/deluge/plugins/Label/deluge/plugins/label/data/label.js
@@ -357,6 +357,13 @@ Deluge.plugins.LabelPlugin = Ext.extend(Deluge.Plugin, {
 
     name: 'Label',
 
+    noLabelItem: {
+        text: _('No Label'),
+        label: '',
+        handler: this.onTorrentMenuClick,
+        scope: this
+    },
+
     createMenu: function() {
         this.labelMenu = new Ext.menu.Menu({
             items: [{
@@ -386,8 +393,8 @@ Deluge.plugins.LabelPlugin = Ext.extend(Deluge.Plugin, {
         this.filter = filter;
     },
 
-    updateTorrentMenu: function(filter) {
-        for (var state in filter.getStates()) {
+    updateTorrentMenu: function(states) {
+        for (var state in states) {
             if (!state) continue;
             this.torrentMenu.addMenuItem({
                 text: state,
@@ -409,12 +416,7 @@ Deluge.plugins.LabelPlugin = Ext.extend(Deluge.Plugin, {
 
     onEnable: function() {
         this.torrentMenu = new Ext.menu.Menu({
-            items: [{
-                text: _('No Label'),
-                label: '',
-                handler: this.onTorrentMenuClick,
-                scope: this
-            }]
+            items: [ this.noLabelItem ]
         });
 
         this.tmSep = deluge.menus.torrent.add({
@@ -436,7 +438,7 @@ Deluge.plugins.LabelPlugin = Ext.extend(Deluge.Plugin, {
             var filter = deluge.sidebar.getFilter('label');
             filter.list.columns[0].tpl = new Ext.XTemplate(lbltpl);
             this.setFilter(filter);
-            this.updateTorrentMenu(filter);
+            this.updateTorrentMenu(filter.getStates());
             filter.list.refresh();
         } else {
             deluge.sidebar.on('filtercreate', this.onFilterCreate, this);
@@ -448,7 +450,7 @@ Deluge.plugins.LabelPlugin = Ext.extend(Deluge.Plugin, {
 
     onAfterFilterCreate: function(sidebar, filter) {
         if (filter.filter != 'label') return;
-        this.updateTorrentMenu(filter);
+        this.updateTorrentMenu(filter.getStates());
     },
 
     onFilterCreate: function(sidebar, filter) {
@@ -465,12 +467,34 @@ Deluge.plugins.LabelPlugin = Ext.extend(Deluge.Plugin, {
     },
 
     onLabelAdded: function(label) {
-        this.torrentMenu.addMenuItem({
-            text: label,
-            label: label,
-            handler: this.onTorrentMenuClick,
-            scope: this
-        });
+        var filter = deluge.sidebar.getFilter('label');
+        var states = filter.getStates();
+        var statesArray = [];
+
+        for (state in states) {
+            statesArray.push(state);
+        }
+
+        var none = statesArray.shift();
+        var all = statesArray.shift();
+
+        this.torrentMenu.removeAll(true);
+        this.torrentMenu.addMenuItem(this.noLabelItem);
+
+        statesArray.push(label.toLowerCase());
+        statesArray.sort();
+        statesArray.unshift(all);
+
+        console.log(states);
+        console.log(statesArray);
+
+        states = {}
+
+        for (i = 0; i < statesArray.length; ++i) {
+            states[statesArray[i]] = 0;
+        }
+
+        this.updateTorrentMenu(states);
     },
 
     onLabelContextMenu: function(dv, i, node, e) {