From c7f0cc1c2ff649431c2d1aa73872ea43a97c68a2 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 3 May 2010 19:24:04 +0000
Subject: - Fix filters set label after activation

git-svn-id: https://svn.roundcube.net/trunk@3590 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/managesieve/Changelog      |  2 ++
 plugins/managesieve/managesieve.js | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 3f4f154b2..16d7ca8bd 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,3 +1,5 @@
+- Fix filters set label after activation
+
 * version 2.4 [2010-04-01]
 -----------------------------------------------------------
 - Fixed bug in DIGEST-MD5 authentication (http://pear.php.net/bugs/bug.php?id=17285)
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index f93162da3..549afd077 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -438,14 +438,15 @@ if (window.rcmail) {
       if (!this.gui_objects.filtersetslist || !name)
         return false;
 
-      var opts = this.gui_objects.filtersetslist.getElementsByTagName('option');
-      var regx = new RegExp(RegExp.escape(' (' + this.get_label('managesieve.active') + ')'));
+      var opts = this.gui_objects.filtersetslist.getElementsByTagName('option'),
+        label = ' (' + this.get_label('managesieve.active') + ')',
+        regx = new RegExp(RegExp.escape(label));
       
-      for (var x=1; x<opts.length; x++)
+      for (var x=0; x<opts.length; x++)
         if (opts[x].value != name && opts[x].innerHTML.match(regx))
-	  opts[x].innerHTML = opts[x].innerHTML.replace(regx, '');
-	else if (opts[x].value == name)
-	  opts[x].innerHTML = opts[x].innerHTML + ' (' + this.get_label('managesieve.active') + ')';
+	      opts[x].innerHTML = opts[x].innerHTML.replace(regx, '');
+	    else if (opts[x].value == name)
+	      opts[x].innerHTML = opts[x].innerHTML + label;
     };
 
   // Set delete
-- 
cgit v1.2.3