Changeset 6621

Timestamp:

12/20/07 16:59:42 (1 year ago)

Author:

kubens

Message:

Added method asVar
Added logic for anonymousClass
Changed parameters handling

Files:

• plugins/sfExtjs2Plugin/trunk/config/config.php (modified) (4 diffs)
• plugins/sfExtjs2Plugin/trunk/lib/helper/sfExtjs2Helper.php (modified) (32 diffs)

plugins/sfExtjs2Plugin/trunk/config/config.php

@@ -1 +1 @@
-<?php
-3
+5
-sfConfig::set('sf_extjs2_comment', true);
-#
-# array values that don't need quotes
-#
-sfConfig::set('sf_extjs2_quote_except', 
-  array(
-    'value' => array('true', 'false', 'new Ext.', 'function', 'Ext.'),
-    'key'   => array('renderer', 'store', 'defaults', 'plugins', 'cm', 'ds', 'view', 'tbar', 'bbar')
-  )
-);
-#
-# adapters
@@ -59 +50 @@
-# attributes which must handled as array
-#
-
+
+
+
+
+
+
+
+
+
+
-#
-# mapping plugin method against class
@@ -66 +66 @@
-  array(
-    // data
-
-
-
+  
+  
+  
-    // widgets
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  )
-);
@@ -255 +256 @@
-);
-
+
+sfConfig::set('Ext.KeyMap',
+  array(
+    'class'       => 'Ext.KeyMap',
+    'attributes'  => array()
+  )
+);
+
+
+sfConfig::set('anonymousClass',
+  array(
+    'class'       => 'anonymousClass',
+    'attributes'  => array()
+  )
+);
+
+
-?>

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

@@ -4 +4 @@
- * @plugin           sfExtjs2Plugin
- * @description      sfExtjs2Plugin is a symfony plugin that provides an easy to use wrapper for the Ext javascript library
-
-
-
+
+
+
+
+
+
+
- *                    - Added sf_extjs2_comment
- *                   12.17.2007 Leon:
@@ -15 +19 @@
- *                    - Fixed quoting logic for beginApplication
- *                   12.15.2007 Kubens:
- 
+
- *                   11.22.2007 Kubens:
- 
+
- *                     - Added parameters support for Ext.object constructors
- *                    11.17.2007 Kubens:
- *                     - Added features to create custom classes and custom methods
- 
- 
+
+
- *                       adapters and coresponding files before ext-all.js
- *                     - Overworked: load method. Adapters and themes are setuped in config.php
- *                     - Overworked: constructor. If no adapter or theme is passed then default
- 
- 
+
+
- *                     - Fixed the adapter includes to load all required files in the correct order
- *                       moved ext-base into adapters, pass ext as adapter for standalone
- *                       changed all javascript to load first so they will come before files specified in view.yml
- 
+
- *                     - created
- */
@@ -39 +43 @@
-  const LBR_CM = ",\n";
-  const LBR_SM = ";\n";
-
+
-  private $items     = array();
-  private $adapter   = ''; // current adapter
-  private $theme     = ''; // current theme
-  private $namespace = ''; // current namespace
-
+
-  /**
-   * Creates an instance of sfExtjs2Plugin.
- 
+
-   * Usage:
- 
+
-   *   $sfExtjs2Plugin = new sfExtjs2Plugin(
-   *                           array
@@ -67 +71 @@
-
-  /**
- 
- 
-  
+
+
+
-   * Usage:
- 
+
-   *   $sfExtjs2Plugin = new sfExtjs2Plugin(
-   *                           array
@@ -88 +92 @@
-   *                      )
-   *                    );
-                     
+
-   * @param string class
-   * @param array attributes
@@ -105 +109 @@
-  /**
-   * Creates Javascript source for Extjs2.class
- 
+
-   * Usage:
- 
+
-   *   Syntax A = short form without any options
-   *   $sfExtjs2Plugin->Object(array
-   *   (
-   *     'id'       => 'id',
-'document.body'
+$sfExtjs2Plugin->asVar('document.body')
-   *     'items'    => array
-   *     (
-"Object A"
-"Object B"
+Object A
+Object B
-   *     )
-   *   ));
+   *   
+   *   => new Object({id: 'id', renderTo: document.body, items: [new Object(title: 'Object A'), new Object(title: 'Object B')]})   
+   *
-   *
-   *   Syntax B = long form with additional options
@@ -124 +131 @@
-   *   (
-   *     'name'       => 'string',      // option to render Javascript variable
+   *     'parameters' => array
+   *      (
+   *        'parameter1',
+   *        'parameter2'
+   *      ),
-   *     'attributes' => array          // attributes for Ext constructor
-   *     (
@@ -130 +142 @@
-   *       'items'    => array
-   *       (
-"Object A"
-"Object B"
+Object A
+Object B
-   *       )
-
-
-
-
-
-
+
-   *   ));
+   *   
+   *   => new Object(parameter1, parameter2, {id: 'id', renderTo: document.body, items: [new Object(title: 'Object A'), new Object(title: 'Object B')]})   
-   *
-   * @param string class
@@ -154 +163 @@
-      unset($attributes['parameters']);
-    }
-
+
-    # syntax A is a shortform of syntax B
-    # if syntax A is used then convert syntax A to syntax B
@@ -163 +172 @@
-      $attributes['attributes'] = $tmp;
-    }
-
+
-    # list attributes must defined as an Javascript array
-    # therefore all list attributes must be rendered as [attributeA, attributeB, attributeC]
- 
-
- 
+
+
+
-      {
-        $attributes['attributes'][$attribute] = sprintf('[%s]', sfExtjs2Plugin::_build_attributes($attributes['attributes'][$attribute]));
-      }
-    }
-
+
-    // get source of component
-    $source = call_user_func(array('sfExtjs2Plugin', 'getExtObjectComponent'), $attributes['attributes'], sfConfig::get($class), $parameters);
-
+
-    // if 'name' is assigned then we must render
-    // either a Javascript variable or an attribute of this
@@ -189 +198 @@
-      );
-    }
-
+
-    // if 'lbr' assigned then we must render a line break
-    if (is_array($attributes) && array_key_exists('lbr', $attributes))
@@ -195 +204 @@
-      $source .= $attributes['lbr'];
-    }
-
+
-    return $source;
-  }
@@ -201 +210 @@
-  /**
-   * Creates Javascript source for Extjs2.class
- 
+
-   * @param array attributes
-   * @param array config
@@ -211 +220 @@
-    $attributes = sfExtjs2Plugin::_build_attributes($attributes, $config['attributes']);
-    $attributes = sprintf('%s', $attributes != '' ? '{'.$attributes.'}' : '');
-
+
-    $parameters = implode(',', $parameters);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -265 +293 @@
-    $source .= sfExtjs2Plugin::_comment(sprintf("%s// sfExtjs2Helper: %s%s", sfExtjs2Plugin::LBR, sfConfig::get('sf_extjs2_version'), sfExtjs2Plugin::LBR));
-    $source .= sprintf("Ext.BLANK_IMAGE_URL = '%s'%s", sfConfig::get('sf_extjs2_spacer'), sfExtjs2Plugin::LBR_SM);
-
+
-    echo $source;
-  }
@@ -294 +322 @@
-  {
-    $source = '';
-
+
-    // write namespace directive
-    // prevent double output of namespace directive
@@ -300 +328 @@
-    {
-      $this->namespace = $namespace;
- 
+
-      $source .= sprintf("Ext.namespace('%s')%s", $namespace, sfExtjs2Plugin::LBR_SM);
-    }
-
+
-    // write class tag
-    $source .= sfExtjs2Plugin::_comment(sprintf("%s// class: %s.%s%s", sfExtjs2Plugin::LBR, $namespace, $classname, sfExtjs2Plugin::LBR));
-    $source .= sprintf("%s.%s = Ext.extend(%s, {%s", $namespace, $classname, $extend, sfExtjs2Plugin::LBR);
-
+
-    // write attributes
-    $source .= sfExtjs2Plugin::_build_attributes($attributes);
-
+
-    echo $source;
-  }
@@ -335 +363 @@
-   * @return string source
-   */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
-
-  /**
@@ -381 +409 @@
-    $source  = '';
-    $source .= sprintf("%s}}()%s", sfExtjs2Plugin::LBR, sfExtjs2Plugin::LBR_SM);
-
+
-    echo $source;
-  }
@@ -398 +426 @@
-
-    return $source;
+  }
+
+  /**
+   * returns source of custom class
+   *
+   * @param string classname
+   * @package array attributes
+   * @return string source
+   */
+  public function anonymousClass($attributes = array())
+  {
+    $source  = '';
+    $source .= $this->getExtObject('anonymousClass', $attributes);
+
+    return $source;
+  }
+
+  /**
+   * returns string as instance of sfExtjs2Var
+   *
+   * @param string var
+   * @return sfExtjs2Var var
+   */
+  public static function asVar($var)
+  {
+    return new sfExtjs2Var($var);
+  }
+
+  /**
+   * returns source for method
+   * including output of evaled php code
+   *
+   * @param array attributes
+   * @return string source
+   */
+  public static function method($attributes = array())
+  {
+    $source = is_array($attributes) && array_key_exists('source', $attributes) ? $attributes['source'] : $attributes;
+    $source = preg_replace_callback(
+      '/(\<\?php)(.*?)(\?>)/si',
+      array('self', '_methodEvalPHP'),
+      $source
+    );
+    $source = sprintf("function (%s) { %s }", is_array($attributes) && array_key_exists('parameters', $attributes) ? $attributes['parameters'] : '', $source);
+  
+    return new sfExtjs2Var($source);
-  }
-
@@ -413 +487 @@
-    $source = ob_get_contents();
-    ob_end_clean();
-
+
-    return $source;
-  }
-
-  /**
-   * returns source for method
-   * including output of evaled php code
-   *
-   * @param array attributes
-   * @return string source
-   */
-  public static function method($attributes = array())
-  {
-    $source = is_array($attributes) && array_key_exists('source', $attributes) ? $attributes['source'] : $attributes;
-    $source = preg_replace_callback(
-                '/(\<\?php)(.*?)(\?>)/si',
-                array('self', '_methodEvalPHP'),
-                $source
-              );
-    $source = sprintf("function (%s) { %s }", is_array($attributes) && array_key_exists('parameters', $attributes) ? $attributes['parameters'] : '', $source);
-
-    return new sfExtjs2Var($source);
-  }
-
@@ -458 +512 @@
-  {
-    $attributes = '';
-
+
-    $merged_attributes = $default_attributes;
-    if (is_array($custom_attributes) && is_array($default_attributes))
@@ -464 +518 @@
-      $merged_attributes = array_merge($default_attributes, $custom_attributes);
-    }
-
+
-    foreach ($merged_attributes as $key => $value)
-    {
@@ -470 +524 @@
-      {
-        $attributes .= sprintf('%s%s:%s', ($attributes === '' ? '' : ','), $key, sfExtjs2Plugin::_quote($key, $value));
- 
- 
+
+
-      {
-        $attributes .= sprintf('%s%s', ($attributes === '' ? '' : ','), sfExtjs2Plugin::_quote($key, $value));
-      }
-    }
-
+
-    return $attributes;
-  }
-
+
-  /**
-   * quotes everything except:
@@ -485 +539 @@
-   *   values that are sfExtjs2Var
-   *   values and keys that are listed in sf_extjs2_quote_except
-   
+
-   * @param string key
-   * @param string value
-   * @return string attribute
-  
+
-  private static function _quote($key, $value)
-  {
- 
+
-    {
-      $attribute = '';
-      foreach ($value as $k => $v)
-      {
-
+
+
+
+
+
+
+
+
-      }
-    
+
-      $attribute = sprintf('{%s}', $attribute);
-      return $attribute;
-    }
-
- 
+
+
-    {
-      $attribute = $value ? 'true' : 'false';
-      return $attribute;
-    }
-  
- 
+
+
-    {
-      $attribute = '\''.$value.'\'';
-      return $attribute;
-    }
-
+
-    $attribute = $value;
-    return $attribute;
@@ -524 +585 @@
-   * @param string value
-   * @return boolean quote
-  
+
-  private static function _quote_except($key, $value)
-  {
-    $quoteExcept = sfConfig::get('sf_extjs2_quote_except');
-
+
-    if (is_int($key) || is_int($value))
-    {
-      return false;
-    }
-
+
-    $listAttributes = sfConfig::get('sf_extjs2_list_attributes');
- 
+
-    {
-      return false;
-    }
-
+
-    foreach ($quoteExcept['key'] as $except)
-    {
@@ -547 +608 @@
-      }
-    }
-
+
-    foreach ($quoteExcept['value'] as $except)
-    {
@@ -555 +616 @@
-      }
-    }
-
+
-    return true;
-  }
@@ -562 +623 @@
-   * @param string comment
-   * @return string comment
-  
+
-  private static function _comment($comment)
-  {
@@ -569 +630 @@
-      return $comment;
-    }
- 
+
-    {
-      return '';
@@ -575 +636 @@
-  }
-
-
+  
-
-/**
- * @class            sfExtjs2Var
-  
+
- * @author           Leon van der Ree
- * @version          0.0.01
- 
+
- *                     - created
- */
@@ -593 +654 @@
-    $this->var = $var;
-  }
-
+
-  public function __toString()
-  {
-    return $this->var;
-  }
-
+
-}
-
-
+
-?>