Changeset 2430 for trunk/framework/Web

Timestamp:

04/18/2008 03:17:29 AM (9 months ago)

Author:

tof

Message:

More fixes for #828

Location:

trunk/framework/Web

Files:

• Javascripts/source/prado/validator/validation3.js (modified) (1 diff)
• UI/WebControls/TCheckBoxList.php (modified) (4 diffs)

trunk/framework/Web/Javascripts/source/prado/validator/validation3.js

@@ -608 +608 @@
                 this.options = options;
                 this.control = $(options.ControlToValidate);
-                if (!this.control && this.isListControlType()){
-                        this.control = $(options.ControlToValidate + '_c0').parentNode;
-                }
-
                 this.message = $(options.ID);
                 if(this.control && this.message)

trunk/framework/Web/UI/WebControls/TCheckBoxList.php

@@ -361 +361 @@
 
         /**
+         * Wether the list should be rendered inside a span or not
+         * 
+         *@return boolean true if we need a span
+         */
+        protected function getSpanNeeded ()
+        {
+                if ($this->getRepeatLayout()===TRepeatLayout::Raw)
+                {
+                        $id=$this->getID();
+                        // Check if we have a validator registered for this control
+                        foreach ($this->getPage()->getValidators() as $v)
+                        {
+                                if ($v->getControlToValidate()===$id)
+                                        return true;
+                        }
+                }
+                return false;
+        }
+        
+        /**
          * Renders the checkbox list control.
          * This method overrides the parent implementation.
@@ -369 +389 @@
                 if($this->getItemCount()>0)
                 {
+                        if ($needSpan=$this->getSpanNeeded())
+                        {
+                                $writer->addAttribute('id', $this->getClientId());
+                                $writer->renderBeginTag('span');
+                        }
                         $this->_isEnabled=$this->getEnabled(true);
                         $repeatInfo=$this->getRepeatInfo();
@@ -381 +406 @@
                         $this->setAccessKey($accessKey);
                         $this->setTabIndex($tabIndex);
+                        if ($needSpan)
+                                $writer->renderEndTag();
                 }
                 //checkbox skipped the client control script in addAttributesToRender
@@ -435 +462 @@
                 return $options;
         }
+        
 }