Changeset 1053

Show
Ignore:
Timestamp:
08/18/08 01:50:47 (3 months ago)
Author:
laurentj
Message:

removed deprecated code in jforms since the last merge with the jforms branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/manifests/jelix-lib.mn

    r1052 r1053  
    209209  jFormsDataContainer.class.php 
    210210  jFormsDatasource.class.php 
    211   jIFormsBuilderCompiler.iface.php 
    212211 
    213212cd lib/jelix/installer 

  • trunk/lib/jelix/docs/ns/jforms_1.1.rng

    r1033 r1053  
    245245        <ref name="control.common" /> 
    246246        <ref name="UI.attr.readonly" /> 
     247        <optional><attribute name="selectedvalue" /></optional> 
    247248        <oneOrMore> 
    248249            <element name="item"> 

  • trunk/lib/jelix/forms/jFormsBase.class.php

    r1032 r1053  
    557557     */ 
    558558    public function getBuilder($buildertype){ 
     559        global $gJConfig; 
    559560        if($buildertype == '') $buildertype = 'html'; 
    560         if(isset($this->builders[$buildertype])){ 
    561             if(isset($this->builders[$buildertype]['inst'])) 
    562                 return $this->builders[$buildertype]['inst']; 
     561        if(isset($gJConfig->_pluginsPathList_jforms[$buildertype])){ 
     562            if(isset($this->builders[$buildertype])) 
     563                return $this->builders[$buildertype]; 
    563564            include_once(JELIX_LIB_PATH.'forms/jFormsBuilderBase.class.php'); 
    564             include_once ($this->builders[$buildertype][0]); 
    565             $c = $this->builders[$buildertype][1]; 
    566             $o = $this->builders[$buildertype]['inst'] = new $c($this); 
     565            include_once ($gJConfig->_pluginsPathList_jforms[$buildertype].$buildertype.'.jformsbuilder.php'); 
     566            //echo "builder=".$gJConfig->_pluginsPathList_jforms[$buildertype]; 
     567            $c = $buildertype.'JformsBuilder'; 
     568            $o = $this->builders[$buildertype] = new $c($this); 
    567569            return $o; 
    568570        }else{ 

  • trunk/lib/jelix/forms/jFormsCompiler.class.php

    r1050 r1053  
    5151        $source[]='<?php '; 
    5252        $source[]='class '.$selector->getClass().' extends jFormsBase {'; 
    53         $source[]='    protected $builders = array( '; 
    54  
    55         $srcBuilders=array(); 
    56         foreach($gJConfig->_pluginsPathList_jforms as $buildername => $pluginPath) { 
    57             $srcBuilders[$buildername]=array(); 
    58             $srcBuilders[$buildername][] = '<?php '; 
    59             $srcBuilders[$buildername][] = ' require_once(\''.$pluginPath.$buildername.'.jformsbuilder.php\'); '; 
    60             $srcBuilders[$buildername][] = ' class '.$selector->getClass().'_builder_'.$buildername.' extends '.$buildername.'JformsBuilder {'; 
    61             $srcBuilders[$buildername][] = ' public function __construct($form){'; 
    62             $srcBuilders[$buildername][] = '          parent::__construct($form);'; 
    63             $srcBuilders[$buildername][] = '  }'; 
    64              
    65             $source[]='    \''.$buildername.'\'=>array(\''.$selector->getCompiledBuilderFilePath($buildername).'\',\''.$selector->getClass().'_builder_'.$buildername.'\'), '; 
    66         } 
    67  
    68         $source[]='    );'; 
     53         
    6954        $source[]=' public function __construct($sel, &$container, $reset = false){'; 
    7055        $source[]='          parent::__construct($sel, $container, $reset);'; 
    7156 
    72         $compiler->compile($doc, $source, $srcBuilders); 
     57        $compiler->compile($doc, $source); 
    7358 
    7459        $source[]="  }\n} ?>"; 
    7560        jFile::write($selector->getCompiledFilePath(), implode("\n", $source)); 
    7661 
    77         foreach($gJConfig->_pluginsPathList_jforms as $buildername => $pluginPath) { 
    78             $srcBuilders[$buildername][]= '} ?>'; 
    79             jFile::write($selector->getCompiledBuilderFilePath($buildername), implode("\n", $srcBuilders[$buildername])); 
    80         } 
    8162        return true; 
    8263    } 

  • trunk/lib/jelix/forms/jFormsCompiler_jf_1_0.class.php

    r1050 r1053  
    2424    protected $sourceFile; 
    2525 
    26     protected $srcBuilders; 
    27  
    2826    public function __construct($sourceFile) { 
    2927        $this->sourceFile = $sourceFile; 
    3028    } 
    3129 
    32     public function compile ($doc, &$source, &$srcBuilders) { 
     30    public function compile ($doc, &$source) { 
    3331 
    3432        global $gJConfig; 
    35  
    36         $this->srcBuilders = &$srcBuilders; 
    3733 
    3834        $xml = simplexml_import_dom($doc); 

  • trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php

    r1051 r1053  
    127127        $hasSelected = false; 
    128128        $selectedvalue = null; 
     129 
     130        if(isset($attributes['selectedvalue'])){ 
     131            $selectedvalue= (string)$control['selectedvalue']; 
     132            $hasSelected = true; 
     133            unset($attributes['selectedvalue']); 
     134        } 
     135 
    129136        $itemCount = 0; 
    130137        foreach($control->item as $item){ 

  • trunk/lib/jelix/forms/jFormsControl.class.php

    r1050 r1053  
    631631 
    632632    function addChildControl($control, $itemValue = '') { 
    633         $this->childControls[$control->ref]=$control; 
     633        $this->childControls[$control->ref] = $control; 
    634634        $this->items[$itemValue][$control->ref] = $control; 
    635635    } 

  • trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

    r1050 r1053  
    1616 * @subpackage  jelix-plugins 
    1717 */ 
    18 abstract class htmlJformsBuilder extends jFormsBuilderBase { 
     18class htmlJformsBuilder extends jFormsBuilderBase { 
    1919 
    2020    protected $options; 
Download in other formats: Unified Diff Zip Archive