Changeset 1538

Timestamp:

12/01/2006 03:39:16 PM (2 years ago)

Author:

xue

Message:

merge from 3.0 branch till 1537.

Location:

trunk

Files:

• HISTORY (modified) (2 diffs)
• framework/Exceptions/messages.txt (modified) (2 diffs)
• framework/Web/UI/TTemplateManager.php (modified) (3 diffs)
• framework/Web/UI/TThemeManager.php (modified) (3 diffs)
• tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php (modified) (1 diff)
• tests/FunctionalTests/tickets/protected/pages/Ticket205.page (modified) (1 diff)
• tests/FunctionalTests/tickets/protected/pages/Ticket207.page (modified) (1 diff)

trunk/HISTORY

@@ -19 +19 @@
 ==============================
 BUG: Ticket#442 - TPageService getBasePath in namespace form (Qiang)
+BUG: Ticket#443 - Template comment tag messed up with HTML comment tag (Qiang)
 BUG: Ticket#467 - typo in TUrlMapping.php (Qiang)
 BUG: TTableCell should render   only when Text is not set and there's no child (Qiang)
@@ -24 +25 @@
 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)

trunk/framework/Exceptions/messages.txt

@@ -126 +126 @@
 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}'.
@@ -158 +159 @@
 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.

trunk/framework/Web/UI/TTemplateManager.php

@@ -178 +178 @@
          *  '<prop:([\w\.]+)((?:\s*[\w\.]+=\'.*?\'|\s*[\w\.]+=".*?"|\s*[\w\.]+=<%.*?%>)*)\s*\/>' - group subproperty tags
          */
-        const REGEX_RULES='/<!--.*?--!>|<!--.*?-->|<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\\$=\\[](.*?)%>|<prop:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/>/msS';
+        const REGEX_RULES='/<!--.*?--!?>|<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\\$=\\[](.*?)%>|<prop:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/>/msS';
 
         /**
@@ -485 +485 @@
                                         break;
                                 default:        // an error if reaching here
+                                        throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
                                         break;
                         }
@@ -530 +531 @@
                                         break;
                                 default:        // an error if reaching here
+                                        throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
                                         break;
                         }

trunk/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;

trunk/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php

@@ -25 +25 @@
                 // verify specific table tags
                 $this->verifyElementPresent("ctl0_body_DataGrid");
-                $this->verifyAttribute("ctl0_body_DataGrid@rules","all");
                 $this->verifyAttribute("ctl0_body_DataGrid@cellpadding","2");
-                $this->verifyAttribute("ctl0_body_DataGrid@cellspacing","0");
         }
 }

trunk/tests/FunctionalTests/tickets/protected/pages/Ticket205.page

@@ -21 +21 @@
                 OnServerValidate="customValidate"
                 ClientValidationFunction="clientSideCustomValidate"
-                ClientSide.OnError="alert('error')"
+                ClientSide.OnValidationError="alert('error')"
                 ErrorMessage="must equal to 'Prado'" />
         <com:TButton ID="button1" Text="Submit!" />

trunk/tests/FunctionalTests/tickets/protected/pages/Ticket207.page

@@ -7 +7 @@
                 ControlToValidate="text1" Text="Error"
                 ClientSide.ObserveChanges="false"
-            ClientSide.OnError="alert('error on text1 fired')" />
+            ClientSide.OnValidationError="alert('error on text1 fired')" />
           <br />
           <com:TTextBox ID="text2" /><br />