Ticket #2224: javascriptHelper.patch

JavascriptHelper.php

@@ -16 +16 @@
- * @subpackage helper
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @author     John Christopher <john.christopher@symfony-project.com>
+ * @author     Fabian Lange <Fabian.Lange@web.de>
- * @author     David Heinemeier Hansson
- * @version    SVN: $Id$
- */
@@ -75 +76 @@
-  }
-
-  /**
+   * Returns options that can have a javascript expression.
+   * These options will not be quoted additionally if they are a string
+   */
+  function get_js_options()
+  {
+    static $js_options;
+    if (!$js_options)
+    {
+      $js_options = array_merge(array(
+        'parameters', 'onUpdate', 'onDrop', 'onShow', 'onHide', 'afterUpdateElement', 'insertion'
+        ), get_ajax_options());
+      foreach (get_callbacks() as $callback)
+      {
+        $js_options[] = 'on'.ucfirst($callback);
+      }
+    }
+
+    return $js_options;
+  }
+
+  /**
-   * Returns a link that'll trigger a javascript function using the
-   * onclick handler and return false after the fact.
-   *
@@ -230 +252 @@
-   */
-  function periodically_call_remote($options = array())
-  {
-$options['frequency']
+_php_type_to_js($options['frequency'])
-    $code = 'new PeriodicalExecuter(function() {'.remote_function($options).'}, '.$frequency.')';
-
-    return javascript_tag($code);
@@ -593 +615 @@
-      unset($options[$key]);
-    }
-
-    foreach (array('tag', 'overlap', 'constraint', 'handle') as $option)
-    {
-      if (isset($options[$option]))
-      {
-        $options[$option] = "'{$options[$option]}'";
-      }
-    }
-
-    if (isset($options['containment']))
-    {
-      $options['containment'] = _array_or_string_for_javascript($options['containment']);
-    }
-
-    if (isset($options['hoverclass']))
-    {
-      $options['hoverclass'] = "'{$options['hoverclass']}'";
-    }
-
-    if (isset($options['only']))
-    {
-      $options['only'] = _array_or_string_for_javascript($options['only']);
@@ -681 +690 @@
-      $options['accept'] = _array_or_string_for_javascript($options['accept']);
-    }
-
-    if (isset($options['hoverclass']))
-    {
-      $options['hoverclass'] = "'{$options['hoverclass']}'";
-    }
-
-    return javascript_tag("Droppables.add('$element_id', "._options_for_javascript($options).")");
-  }
-
@@ -853 +857 @@
-      }
-      if (isset($options['highlightcolor']))
-      {
-"'".$options['highlightcolor']."'"
+$options['highlightcolor']
-      }
-      if (isset($options['highlightendcolor']))
-      {
-"'".$options['highlightendcolor']."'"
+$options['highlightendcolor']
-      }
-      if (isset($options['loadTextURL']))
-      {
@@ -904 +908 @@
-    }
-    if (isset($options['indicator']))
-    {
-"'".$options['indicator']."'"
+$options['indicator']
-    }
-    if (isset($options['on_show']))
-    {
@@ -941 +945 @@
-    $opts = array();
-    foreach ($options as $key => $value)
-    {
-"$key:$value"
+$key.":"._php_type_to_js($value,!in_array($key,get_js_options()))
-    }
-    sort($opts);
-
@@ -964 +968 @@
-  {
-    $js_options = _build_callbacks($options);
-
-'false' : 'true'
-_method_option_to_s($options['method'])
+false : true
+$options['method']
-    if (isset($options['position'])) $js_options['insertion'] = "Insertion.".sfInflector::camelize($options['position']);
-'false' : 'true'
+false : true
-
-    if (isset($options['form']))
-    {
@@ -985 +989 @@
-    return _options_for_javascript($js_options);
-  }
-
-
+
+
+
+
+
+
-  {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-  function _build_observer($klass, $name, $options = array())
@@ -1002 +1025 @@
-    $javascript  = 'new '.$klass.'("'.$name.'", ';
-    if (isset($options['frequency']) && $options['frequency'] > 0)
-    {
-$options['frequency']
+_php_type_to_js($options['frequency'])
-    }
-    $javascript .= "function(element, value) {";
-    $javascript .= $callback.'});';