experimentally rebase labels; make base index configurable

3 files changed, 15 insertions, 3 deletions

diff --git a/js/FeedTree.js b/js/FeedTree.js
index e0b068f17..620efdbf6 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -106,7 +106,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 		var id = args.item.id[0];
 		var bare_id = parseInt(id.substr(id.indexOf(':')+1));
 
-		if (bare_id < -10) {
+		if (bare_id < _label_base_index) {
 			var span = dojo.doc.createElement('span');
 			var fg_color = args.item.fg_color[0];
 			var bg_color = args.item.bg_color[0];
@@ -380,7 +380,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 				var node = tree._itemNodesMap[id];
 
 				if (node) {
-					if (hide && unread == 0 && (bare_id > 0 || bare_id < -10 || !show_special)) {
+					if (hide && unread == 0 && (bare_id > 0 || bare_id < _label_base_index || !show_special)) {
 						Effect.Fade(node[0].rowNode, {duration : 0.3,
 							queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
 					} else {
diff --git a/js/functions.js b/js/functions.js
index a9367da60..fcf82a8ea 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2,6 +2,7 @@ var notify_silent = false;
 var loading_progress = 0;
 var sanity_check_done = false;
 var init_params = {};
+var _label_base_index = -1024;
 
 Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
 	function (callOriginal, options) {
@@ -1986,3 +1987,13 @@ function htmlspecialchars_decode (string, quote_style) {
 
   return string;
 }
+
+
+function label_to_feed_id(label) {
+	return _label_base_index - 1 - Math.abs(label);
+}
+
+function feed_to_label_id(feed) {
+	return _label_base_index - 1 + Math.abs(feed);
+}
+
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 794e94952..cc14461f4 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1920,7 +1920,7 @@ function initHeadlinesMenu() {
 				var bare_id = id.substr(id.indexOf(":")+1);
 				var name = label.name[0];
 
-				bare_id = -11-bare_id;
+				bare_id = feed_to_label_id(bare_id);
 
 				labelAddMenu.addChild(new dijit.MenuItem({
 					label: name,
@@ -2120,3 +2120,4 @@ function displayArticleUrl(id) {
 		exception_error("changeScore", e);
 	}
 }
+