Changeset 6492

Timestamp:

12/13/07 23:21:16 (1 year ago)

Author:

Leon.van.der.Ree

Message:

make use of quoteExcept in recursion and added sfExtjsVar so you can add javascript-variables in your config

Files:

• plugins/sfExtjs2Plugin/trunk/lib/helper/sfExtjs2Helper.php (modified) (3 diffs)

plugins/sfExtjs2Plugin/trunk/lib/helper/sfExtjs2Helper.php

@@ -25 +25 @@
- *                                         - created
- */
+
+class sfExtjsVar {
+
+  private $var  = '';
+  
+  public function __construct($var)
+  {
+    $this->var = $var;
+  }
+  
+  public function __toString()
+  {
+    return $this->var;
+  }
+  
+}
+
-class sfExtjs2Plugin {
-
@@ -111 +128 @@
-      #enables us to have empty keys removed
-      if(is_null($value)) continue;
-
+
-      #quotes everything not in the quote_except value list
-!is_array($value)
-
-(sfExtjs2Plugin::quote_except($key, $value) ? '\''.$value.'\'' : $value)
+ !is_array($value) && sfExtjs2Plugin::quote_except($key, $value) && !($value instanceof sfExtjsVar) 
+
+'\''.$value.'\''
-      }
-      else
@@ -449 +466 @@
-      foreach ($array_value as $key => $v)
-      {
-($v != 'true') && ($v != 'false'
+sfExtjs2Plugin::quote_except($key, $v) && !($v instanceof sfExtjsVar
-        {
-          $value .= sprintf('%s%s:\'%s\'', ($value === '{' ? '' : ','), $key, sfExtjs2Plugin::_process_value($v));