Changeset 4825 in subversion for trunk/roundcubemail/program/include/rcube_template.php

Timestamp:

Jun 1, 2011 1:05:18 PM (2 years ago)

Author:

thomasb

Message:

Add collected text labels in one single function call

File:

• trunk/roundcubemail/program/include/rcube_template.php (modified) (4 diffs)

trunk/roundcubemail/program/include/rcube_template.php

@@ -36 +36 @@
     private $message = null;
     private $js_env = array();
+    private $js_labels = array();
     private $js_commands = array();
     private $object_handlers = array();
@@ -231 +232 @@
 
         foreach ($args as $name) {
-            $this->command('add_label', $name, rcube_label($name));
+            $this->js_labels[$name] = rcube_label($name);
         }
     }
@@ -267 +268 @@
         $this->env = array();
         $this->js_env = array();
+        $this->js_labels = array();
         $this->js_commands = array();
         $this->object_handlers = array();
@@ -452 +454 @@
         if (!$this->framed && !empty($this->js_env)) {
             $out .= JS_OBJECT_NAME . '.set_env('.json_serialize($this->js_env).");\n";
+        }
+        if (!empty($this->js_labels)) {
+            $this->command('add_label', $this->js_labels);
         }
         foreach ($this->js_commands as $i => $args) {