Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-03 06:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added CWebApplication::clientScript and removed CController::clientScript

Browse Source
This commit is contained in:
qiang.xue
2008-11-25 02:22:59 +00:00
parent b6b1379cb6
commit 17678f787a
6 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
framework/web/CClientScript.php
View File

@@ -16,14 +16,13 @@
* @package system.web
* @since 1.0
*/
class CClientScript extends CComponent
class CClientScript extends CApplicationComponent
{
/**
* @var boolean whether JavaScript should be enabled. Defaults to true.
*/
public $enableJavaScript=true;
private $_controller;
private $_packages;
private $_dependencies;
private $_baseUrl;
@@ -36,15 +35,6 @@ class CClientScript extends CComponent
private $_bodyScripts=array();
/**
* Constructor.
* @param CController controller
*/
public function __construct($controller)
{
$this->_controller=$controller;
}
/**
* Cleans all registered scripts.
*/
@@ -58,7 +48,7 @@ class CClientScript extends CComponent
$this->_bodyScriptFiles=array();
$this->_bodyScripts=array();
$this->_controller->recordCachingAction('clientScript','reset',array());
Yii::app()->getController()->recordCachingAction('clientScript','reset',array());
}
/**
@@ -127,6 +117,17 @@ class CClientScript extends CComponent
return $this->_baseUrl=Yii::app()->getAssetManager()->publish(YII_PATH.'/web/js/source');
}
/**
* Sets the base URL of all core javascript files.
* This setter is provided in case when core javascript files are manually published
* to a pre-specified location. This may save asset publishing time for large-scale applications.
* @param string the base URL of all core javascript files.
*/
public function setCoreScriptUrl($value)
{
$this->_baseUrl=$value;
}
/**
* Renders the specified core javascript library.
* Any dependent libraries will also be rendered.
@@ -177,7 +178,7 @@ class CClientScript extends CComponent
{
$this->_coreScripts[$name]=$name;
$params=func_get_args();
$this->_controller->recordCachingAction('clientScript','registerCoreScript',$params);
Yii::app()->getController()->recordCachingAction('clientScript','registerCoreScript',$params);
}
}
@@ -191,7 +192,7 @@ class CClientScript extends CComponent
{
$this->_cssFiles[$url]=$media;
$params=func_get_args();
$this->_controller->recordCachingAction('clientScript','registerCssFile',$params);
Yii::app()->getController()->recordCachingAction('clientScript','registerCssFile',$params);
}
/**
@@ -205,7 +206,7 @@ class CClientScript extends CComponent
$this->_css[$id]=array($css,$media);
$params=func_get_args();
$this->_controller->recordCachingAction('clientScript','registerCss',$params);
Yii::app()->getController()->recordCachingAction('clientScript','registerCss',$params);
}
/**
@@ -218,7 +219,7 @@ class CClientScript extends CComponent
{
$this->_scriptFiles[$url]=$url;
$params=func_get_args();
$this->_controller->recordCachingAction('clientScript','registerScriptFile',$params);
Yii::app()->getController()->recordCachingAction('clientScript','registerScriptFile',$params);
}
}
@@ -231,7 +232,7 @@ class CClientScript extends CComponent
{
$this->_scripts[$id]=$script;
$params=func_get_args();
$this->_controller->recordCachingAction('clientScript','registerScript',$params);
Yii::app()->getController()->recordCachingAction('clientScript','registerScript',$params);
}
/**
@@ -244,7 +245,7 @@ class CClientScript extends CComponent
{
$this->_bodyScriptFiles[$url]=$url;
$params=func_get_args();
$this->_controller->recordCachingAction('clientScript','registerBodyScriptFile',$params);
Yii::app()->getController()->recordCachingAction('clientScript','registerBodyScriptFile',$params);
}
}
@@ -257,7 +258,7 @@ class CClientScript extends CComponent
{
$this->_bodyScripts[$id]=$script;
$params=func_get_args();
$this->_controller->recordCachingAction('clientScript','registerBodyScript',$params);
Yii::app()->getController()->recordCachingAction('clientScript','registerBodyScript',$params);
}
/**