Changeset 1536 for branches/3.0

Timestamp:

12/01/2006 01:51:21 PM (2 years ago)

Author:

xue

Message:

fixed #468.

Location:

branches/3.0

Files:

• HISTORY (modified) (1 diff)
• framework/Exceptions/messages.txt (modified) (2 diffs)
• framework/Web/UI/TTemplateManager.php (modified) (2 diffs)
• framework/Web/UI/TThemeManager.php (modified) (3 diffs)

branches/3.0/HISTORY

@@ -8 +8 @@
 BUG: TPager would not display if it was invisible previously (Qiang)
 ENH: Ticket#446 - Added TMetaTagCollection.getMetaTagByID method (Qiang)
+ENH: Ticket#468 - Added support of using all property tags in skins (Qiang)
 ENH: Ticket#471 - Added methods in TAssetManager to expose published path and URL (Qiang)
 CHG: Ticket#437 - __autoload is replaced by spl_autoload_register (Qiang)

branches/3.0/framework/Exceptions/messages.txt

@@ -125 +125 @@
 template_content_unexpected                             = Unexpected content is encountered when instantiating template: {0}.
 template_include_invalid                                = Invalid template inclusion. Make sure {0} is a valid namespace pointing to an existing template file whose extension is .tpl.
+template_tag_unexpected                                 = Initialization for property {0} contains an unknown tag type {1}.
 
 xmldocument_file_read_failed                    = TXmlDocument is unable to read file '{0}'.
@@ -157 +158 @@
 theme_property_readonly                                 = Skin is being applied to a read-only control property '{0}.{1}'.
 theme_property_undefined                                = Skin is being applied to an inexistent control property '{0}.{1}'.
+theme_tag_unexpected                                    = Initialization for property {0} contains an unknown tag type {1}.
 
 control_object_reregistered                             = Duplicated object ID '{0}' found.

branches/3.0/framework/Web/UI/TTemplateManager.php

@@ -458 +458 @@
                                         break;
                                 default:        // an error if reaching here
+                                        throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
                                         break;
                         }
@@ -503 +504 @@
                                         break;
                                 default:        // an error if reaching here
+                                        throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
                                         break;
                         }

branches/3.0/framework/Web/UI/TThemeManager.php

@@ -302 +302 @@
                                                 if(isset($this->_skins[$type][$id]))
                                                         throw new TConfigurationException('theme_skinid_duplicated',$type,$id,dirname($themePath));
+                                                /*
                                                 foreach($skin[2] as $name=>$value)
                                                 {
@@ -307 +308 @@
                                                                 throw new TConfigurationException('theme_databind_forbidden',dirname($themePath),$type,$id);
                                                 }
+                                                */
                                                 $this->_skins[$type][$id]=$skin[2];
                                         }
@@ -364 +366 @@
                                 if(is_array($value))
                                 {
-                                        if($value[0]===TTemplate::CONFIG_EXPRESSION)
-                                                $value=$this->evaluateExpression($value[1]);
-                                        else if($value[0]===TTemplate::CONFIG_ASSET)
-                                                $value=$this->_themeUrl.'/'.ltrim($value[1],'/');
+                                        switch($value[0])
+                                        {
+                                                case TTemplate::CONFIG_EXPRESSION:
+                                                        $value=$this->evaluateExpression($value[1]);
+                                                        break;
+                                                case TTemplate::CONFIG_ASSET:
+                                                        $value=$this->_themeUrl.'/'.ltrim($value[1],'/');
+                                                        break;
+                                                case TTemplate::CONFIG_DATABIND:
+                                                        $control->bindProperty($name,$value[1]);
+                                                        break;
+                                                case TTemplate::CONFIG_PARAMETER:
+                                                        $control->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+                                                        break;
+                                                case TTemplate::CONFIG_TEMPLATE:
+                                                        $control->setSubProperty($name,$value[1]);
+                                                        break;
+                                                case TTemplate::CONFIG_LOCALIZATION:
+                                                        $control->setSubProperty($name,Prado::localize($value[1]));
+                                                        break;
+                                                default:
+                                                        throw new TConfigurationException('theme_tag_unexpected',$name,$value[0]);
+                                                        break;
+                                        }
                                 }
-                                if(strpos($name,'.')===false)   // is simple property or custom attribute
+                                if(!is_array($value))
                                 {
-                                        if($control->hasProperty($name))
+                                        if(strpos($name,'.')===false)   // is simple property or custom attribute
                                         {
-                                                if($control->canSetProperty($name))
+                                                if($control->hasProperty($name))
                                                 {
-                                                        $setter='set'.$name;
-                                                        $control->$setter($value);
+                                                        if($control->canSetProperty($name))
+                                                        {
+                                                                $setter='set'.$name;
+                                                                $control->$setter($value);
+                                                        }
+                                                        else
+                                                                throw new TConfigurationException('theme_property_readonly',$type,$name);
                                                 }
                                                 else
-                                                        throw new TConfigurationException('theme_property_readonly',$type,$name);
+                                                        throw new TConfigurationException('theme_property_undefined',$type,$name);
                                         }
-                                        else
-                                                throw new TConfigurationException('theme_property_undefined',$type,$name);
+                                        else    // complex property
+                                                $control->setSubProperty($name,$value);
                                 }
-                                else    // complex property
-                                        $control->setSubProperty($name,$value);
                         }
                         return true;