Changeset 2425 for trunk/framework/Web

Timestamp:

04/17/2008 11:39:58 AM (9 months ago)

Author:

mikl

Message:

Minor improvement in fix for #622

Files:

• trunk/framework/Web/UI/ActiveControls/TCallbackClientScript.php (modified) (33 diffs)

trunk/framework/Web/UI/ActiveControls/TCallbackClientScript.php

@@ -165 +165 @@
         public function setAttribute($control, $name, $value)
         {
-        if ($control instanceof TControl && $control instanceof IControlContainer) 
+        if ($control instanceof IControlContainer) 
             $control=$control->getContainerClientID();
                 $this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
@@ -194 +194 @@
         public function show($element)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction('Element.show', $element);
@@ -205 +205 @@
         public function hide($element)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction('Element.hide', $element);
@@ -218 +218 @@
         public function toggle($element, $effect=null, $options=array())
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction('Element.toggle', array($element,$effect,$options));
@@ -229 +229 @@
         public function remove($element)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction('Element.remove', $element);
@@ -247 +247 @@
         public function update($element, $content)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->replace($element, $content, 'Element.update');
@@ -259 +259 @@
         public function addCssClass($element, $cssClass)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction('Element.addClassName', array($element, $cssClass));
@@ -271 +271 @@
         public function removeCssClass($element, $cssClass)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction('Element.removeClassName', array($element, $cssClass));
@@ -293 +293 @@
         public function scrollTo($element)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction('Element.scrollTo', $element);
@@ -315 +315 @@
         public function setStyle($element, $styles)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction('Prado.Element.setStyle', array($element, $styles));
@@ -327 +327 @@
         public function appendContent($element, $content)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->replace($element, $content, 'Prado.Element.Insert.append');
@@ -339 +339 @@
         public function prependContent($element, $content)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->replace($element, $content, 'Prado.Element.Insert.prepend');
@@ -351 +351 @@
         public function insertContentAfter($element, $content)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->replace($element, $content, 'Prado.Element.Insert.after');
@@ -363 +363 @@
         public function insertContentBefore($element, $content)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->replace($element, $content, 'Prado.Element.Insert.before');
@@ -407 +407 @@
         public function replaceContent($element,$content)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->replace($element, $content);
@@ -459 +459 @@
         public function visualEffect($type, $element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->callClientFunction($type, array($element, $options));
@@ -471 +471 @@
         public function appear($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Appear', $element, $options);
@@ -483 +483 @@
         public function blindDown($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.BlindDown', $element, $options);
@@ -495 +495 @@
         public function blindUp($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.BlindUp', $element, $options);
@@ -508 +508 @@
         public function dropOut($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.DropOut', $element, $options);
@@ -520 +520 @@
         public function fade($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Fade', $element, $options);
@@ -532 +532 @@
         public function fold($element, $options = null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Fold', $element, $options);
@@ -544 +544 @@
         public function grow($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Grow', $element, $options);
@@ -556 +556 @@
         public function puff($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Puff', $element, $options);
@@ -568 +568 @@
         public function pulsate($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Pulsate', $element, $options);
@@ -580 +580 @@
         public function shake($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Shake', $element, $options);
@@ -592 +592 @@
         public function shrink($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Shrink', $element, $options);
@@ -604 +604 @@
         public function slideDown($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.SlideDown', $element, $options);
@@ -616 +616 @@
         public function slideUp($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.SlideUp', $element, $options);
@@ -628 +628 @@
         public function squish($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.Squish', $element, $options);
@@ -640 +640 @@
         public function switchOff($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Effect.SwitchOff', $element, $options);
@@ -652 +652 @@
         public function highlight($element, $options=null)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $this->visualEffect('Prado.Effect.Highlight', $element, $options);
@@ -664 +664 @@
         public function setOpacity($element, $value)
         {
-        if ($element instanceof TControl && $element instanceof IControlContainer) 
+        if ($element instanceof IControlContainer) 
             $element=$element->getContainerClientID();
                 $value = TPropertyValue::ensureFloat($value);