Changeset 5332 in subversion

Timestamp:

Oct 12, 2011 3:15:41 AM (20 months ago)

Author:

alec

Message:

• Fixed "jumping" Filters tab

File:

• trunk/plugins/managesieve/managesieve.php (modified) (4 diffs)

trunk/plugins/managesieve/managesieve.php

@@ -64 +64 @@
 
         if ($this->rc->task == 'settings') {
-            // load localization
-            $this->add_texts('localization/', array('filters','managefilters'));
-
-            if (!strpos($this->rc->action, 'managesieve')) {
-                $this->include_script('managesieve.js');
-            }
+            $this->init_ui();
         }
         else if ($this->rc->task == 'mail') {
@@ -80 +75 @@
             }
         }
+    }
+
+    /**
+     * Initializes plugin's UI (localization, js script)
+     */
+    private function init_ui()
+    {
+        if ($this->ui_initialized)
+            return;
+
+        // load localization
+        $this->add_texts('localization/', array('filters','managefilters'));
+        $this->include_script('managesieve.js');
+
+        $this->ui_initialized = true;
     }
 
@@ -87 +97 @@
     function mail_task_handler()
     {
-        // load localization
-        $this->add_texts('localization/');
-
         // use jQuery for popup window
         $this->require_plugin('jqueryui'); 
 
-        // include main js script
-        $this->include_script('managesieve.js');
+        // include js script and localization
+        $this->init_ui();
 
         // include styles
@@ -282 +289 @@
     function managesieve_actions()
     {
-        // load localization
-        $this->add_texts('localization/', array('filters','managefilters'));
-
-        // include main js script
-        if ($this->api->output->type == 'html') {
-            $this->include_script('managesieve.js');
-        }
+        $this->init_ui();
 
         $error = $this->managesieve_start();