diff options
Diffstat (limited to 'framework')
13 files changed, 17 insertions, 17 deletions
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapException.php b/framework/Data/SqlMap/DataMapper/TSqlMapException.php index 65ee6d18..7a30b328 100644 --- a/framework/Data/SqlMap/DataMapper/TSqlMapException.php +++ b/framework/Data/SqlMap/DataMapper/TSqlMapException.php @@ -31,7 +31,7 @@ class TSqlMapException extends TException $tokens=array(); for($i=0;$i<$n;++$i) { - if($args[$i] instanceof SimpleXmlElement) + if($args[$i] instanceof SimpleXMLElement) $tokens['{'.$i.'}']=$this->implodeNode($args[$i]); else $tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]); diff --git a/framework/TPropertyValue.php b/framework/TPropertyValue.php index 8c106f82..89b7f06c 100644 --- a/framework/TPropertyValue.php +++ b/framework/TPropertyValue.php @@ -15,7 +15,7 @@ namespace Prado; use Prado\Exceptions\TInvalidDataValueException; -use Prado\Web\Javascripts\TJavascript; +use Prado\Web\Javascripts\TJavaScript; /** * TPropertyValue class @@ -76,7 +76,7 @@ class TPropertyValue */ public static function ensureString($value) { - if (TJavascript::isJsLiteral($value)) + if (TJavaScript::isJsLiteral($value)) return $value; if (is_bool($value)) return $value?'true':'false'; diff --git a/framework/Web/UI/ActiveControls/TDraggable.php b/framework/Web/UI/ActiveControls/TDraggable.php index 45344b27..0f82ab56 100755 --- a/framework/Web/UI/ActiveControls/TDraggable.php +++ b/framework/Web/UI/ActiveControls/TDraggable.php @@ -164,7 +164,7 @@ class TDraggable extends TPanel else $cs->registerPradoScript('dragdrop'); $writer->addAttribute('id',$this->getClientID()); - $options=TJavascript::encode($this->getPostBackOptions()); + $options=TJavaScript::encode($this->getPostBackOptions()); $class=$this->getClientClassName(); $code="new {$class}('{$this->getClientId()}', {$options}) "; $cs->registerEndScript(sprintf('%08X', crc32($code)), $code); diff --git a/framework/Web/UI/ActiveControls/TDropContainerEventParameter.php b/framework/Web/UI/ActiveControls/TDropContainerEventParameter.php index 3f097b91..5a1dc4dc 100644 --- a/framework/Web/UI/ActiveControls/TDropContainerEventParameter.php +++ b/framework/Web/UI/ActiveControls/TDropContainerEventParameter.php @@ -73,7 +73,7 @@ class TDropContainerEventParameter extends \Prado\TEventParameter public function getDroppedControl () { $control=null; - $service=prado::getApplication()->getService(); + $service=Prado::getApplication()->getService(); if ($service instanceof TPageService) { // Find the control diff --git a/framework/Web/UI/JuiControls/TJuiControlOptions.php b/framework/Web/UI/JuiControls/TJuiControlOptions.php index 2836c5ec..7fd0b321 100644 --- a/framework/Web/UI/JuiControls/TJuiControlOptions.php +++ b/framework/Web/UI/JuiControls/TJuiControlOptions.php @@ -117,7 +117,7 @@ class TJuiControlOptions foreach($this->_control->getValidEvents() as $event) if($this->_control->hasEventHandler('on'.$event)) - $ret[$event]=new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(".TJavascript::encode($this->_control->getUniqueID()).", ".TJavascript::encode($event).", event, ui, this); }"); + $ret[$event]=new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(".TJavaScript::encode($this->_control->getUniqueID()).", ".TJavaScript::encode($event).", event, ui, this); }"); return $ret; } diff --git a/framework/Web/UI/JuiControls/TJuiDraggable.php b/framework/Web/UI/JuiControls/TJuiDraggable.php index 53dc8a1d..b12536ca 100644 --- a/framework/Web/UI/JuiControls/TJuiDraggable.php +++ b/framework/Web/UI/JuiControls/TJuiDraggable.php @@ -101,7 +101,7 @@ class TJuiDraggable extends TActivePanel implements IJuiOptions, ICallbackEventH parent::addAttributesToRender($writer); $writer->addAttribute('id',$this->getClientID()); - $options=TJavascript::encode($this->getPostBackOptions()); + $options=TJavaScript::encode($this->getPostBackOptions()); $cs=$this->getPage()->getClientScript(); $code="jQuery('#".$this->getClientId()."').draggable(".$options.");"; $cs->registerEndScript(sprintf('%08X', crc32($code)), $code); diff --git a/framework/Web/UI/JuiControls/TJuiDroppable.php b/framework/Web/UI/JuiControls/TJuiDroppable.php index 2e915b0a..1181c5cb 100644 --- a/framework/Web/UI/JuiControls/TJuiDroppable.php +++ b/framework/Web/UI/JuiControls/TJuiDroppable.php @@ -121,7 +121,7 @@ class TJuiDroppable extends TActivePanel implements IJuiOptions, ICallbackEventH parent::addAttributesToRender($writer); $writer->addAttribute('id',$this->getClientID()); - $options=TJavascript::encode($this->getPostBackOptions()); + $options=TJavaScript::encode($this->getPostBackOptions()); $cs=$this->getPage()->getClientScript(); $code="jQuery('#".$this->getClientId()."').droppable(".$options.");"; $cs->registerEndScript(sprintf('%08X', crc32($code)), $code); diff --git a/framework/Web/UI/JuiControls/TJuiEventParameter.php b/framework/Web/UI/JuiControls/TJuiEventParameter.php index 5ec578b6..86e52f3a 100644 --- a/framework/Web/UI/JuiControls/TJuiEventParameter.php +++ b/framework/Web/UI/JuiControls/TJuiEventParameter.php @@ -52,7 +52,7 @@ class TJuiEventParameter extends TCallbackEventParameter public function getControl($id) { $control=null; - $service=prado::getApplication()->getService(); + $service=Prado::getApplication()->getService(); if ($service instanceof TPageService) { // Find the control diff --git a/framework/Web/UI/JuiControls/TJuiProgressbar.php b/framework/Web/UI/JuiControls/TJuiProgressbar.php index f15ff900..a5a3ba96 100644 --- a/framework/Web/UI/JuiControls/TJuiProgressbar.php +++ b/framework/Web/UI/JuiControls/TJuiProgressbar.php @@ -97,7 +97,7 @@ class TJuiProgressbar extends TActivePanel implements IJuiOptions, ICallbackEven parent::addAttributesToRender($writer); $writer->addAttribute('id',$this->getClientID()); - $options=TJavascript::encode($this->getPostBackOptions()); + $options=TJavaScript::encode($this->getPostBackOptions()); $cs=$this->getPage()->getClientScript(); $code="jQuery('#".$this->getClientId()."').progressbar(".$options.");"; $cs->registerEndScript(sprintf('%08X', crc32($code)), $code); diff --git a/framework/Web/UI/JuiControls/TJuiResizable.php b/framework/Web/UI/JuiControls/TJuiResizable.php index a494b707..42f0cf53 100644 --- a/framework/Web/UI/JuiControls/TJuiResizable.php +++ b/framework/Web/UI/JuiControls/TJuiResizable.php @@ -104,7 +104,7 @@ class TJuiResizable extends TActivePanel implements IJuiOptions, ICallbackEventH parent::addAttributesToRender($writer); $writer->addAttribute('id',$this->getClientID()); - $options=TJavascript::encode($this->getPostBackOptions()); + $options=TJavaScript::encode($this->getPostBackOptions()); $cs=$this->getPage()->getClientScript(); $code="jQuery('#".$this->getClientId()."').resizable(".$options.");"; $cs->registerEndScript(sprintf('%08X', crc32($code)), $code); diff --git a/framework/Web/UI/JuiControls/TJuiSelectable.php b/framework/Web/UI/JuiControls/TJuiSelectable.php index 20bb72d7..27a02f6d 100644 --- a/framework/Web/UI/JuiControls/TJuiSelectable.php +++ b/framework/Web/UI/JuiControls/TJuiSelectable.php @@ -97,7 +97,7 @@ class TJuiSelectable extends TActivePanel implements IJuiOptions, ICallbackEvent // overload the "OnStop" event to add information about the current selected items if(isset($options['stop'])) { - $options['stop']=new TJavaScriptLiteral('function( event, ui ) { ui.index = new Array(); jQuery(\'#'.$this->getClientID().' .ui-selected\').each(function(idx, item){ ui.index.push(item.id) }); Prado.JuiCallback('.TJavascript::encode($this->getUniqueID()).', \'stop\', event, ui, this); }'); + $options['stop']=new TJavaScriptLiteral('function( event, ui ) { ui.index = new Array(); jQuery(\'#'.$this->getClientID().' .ui-selected\').each(function(idx, item){ ui.index.push(item.id) }); Prado.JuiCallback('.TJavaScript::encode($this->getUniqueID()).', \'stop\', event, ui, this); }'); } return $options; } @@ -110,7 +110,7 @@ class TJuiSelectable extends TActivePanel implements IJuiOptions, ICallbackEvent { parent::addAttributesToRender($writer); $writer->addAttribute('id',$this->getClientID()); - $options=TJavascript::encode($this->getPostBackOptions()); + $options=TJavaScript::encode($this->getPostBackOptions()); $cs=$this->getPage()->getClientScript(); $code="jQuery('#".$this->getClientId()."_0').selectable(".$options.");"; $cs->registerEndScript(sprintf('%08X', crc32($code)), $code); diff --git a/framework/Web/UI/JuiControls/TJuiSortable.php b/framework/Web/UI/JuiControls/TJuiSortable.php index 6c14b6a4..e2263df4 100644 --- a/framework/Web/UI/JuiControls/TJuiSortable.php +++ b/framework/Web/UI/JuiControls/TJuiSortable.php @@ -95,7 +95,7 @@ class TJuiSortable extends TActivePanel implements IJuiOptions, ICallbackEventHa foreach($options as $event => $implementation) { if($event=='sort' || $event=='stop') - $options[$event]=new TJavaScriptLiteral('function( event, ui ) { ui.index = jQuery(this).sortable(\'toArray\'); Prado.JuiCallback('.TJavascript::encode($this->getUniqueID()).', \''.$event.'\', event, ui, this); }'); + $options[$event]=new TJavaScriptLiteral('function( event, ui ) { ui.index = jQuery(this).sortable(\'toArray\'); Prado.JuiCallback('.TJavaScript::encode($this->getUniqueID()).', \''.$event.'\', event, ui, this); }'); } return $options; } @@ -108,7 +108,7 @@ class TJuiSortable extends TActivePanel implements IJuiOptions, ICallbackEventHa { parent::addAttributesToRender($writer); $writer->addAttribute('id',$this->getClientID()); - $options=TJavascript::encode($this->getPostBackOptions()); + $options=TJavaScript::encode($this->getPostBackOptions()); $cs=$this->getPage()->getClientScript(); $code="jQuery('#".$this->getClientId()."_0').sortable(".$options.");"; $cs->registerEndScript(sprintf('%08X', crc32($code)), $code); diff --git a/framework/Web/UI/WebControls/TSliderClientScript.php b/framework/Web/UI/WebControls/TSliderClientScript.php index 3758d87d..a0a16d86 100644 --- a/framework/Web/UI/WebControls/TSliderClientScript.php +++ b/framework/Web/UI/WebControls/TSliderClientScript.php @@ -38,7 +38,7 @@ class TSliderClientScript extends TClientSideOptions */ public function setOnChange($javascript) { - $code=TJavascript::quoteJsLiteral("function (value) { {$javascript} }"); + $code=TJavaScript::quoteJsLiteral("function (value) { {$javascript} }"); $this->setFunction('onChange', $code); } @@ -55,7 +55,7 @@ class TSliderClientScript extends TClientSideOptions */ public function setOnSlide($javascript) { - $code=TJavascript::quoteJsLiteral("function (value) { {$javascript} }"); + $code=TJavaScript::quoteJsLiteral("function (value) { {$javascript} }"); $this->setFunction('onSlide', $code); } |