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

merge from 1.0

Browse Source
This commit is contained in:
qiang.xue
2009-02-26 21:23:53 +00:00
parent be3e6d5209
commit 7810bdbcf5
16 changed files with 753 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
framework/web/CClientScript.php
View File

@@ -43,6 +43,18 @@ class CClientScript extends CApplicationComponent
* @var boolean whether JavaScript should be enabled. Defaults to true.
*/
public $enableJavaScript=true;
/**
* @var array the mapping between script file names and the corresponding script URLs.
* The array keys are script file names (without directory part) and the array values are the corresponding URLs.
* If an array value is false, the corresponding script file will not be rendered.
* If an array key is '*.js' or '*.css', the corresponding URL will replace all
* all JavaScript files or CSS files, respectively.
*
* This property is mainly used to optimize the generated HTML pages
* by merging different scripts files into fewer and optimized script files.
* @since 1.0.3
*/
public $scriptMap=array();
private $_hasScripts=false;
private $_packages;
@@ -85,6 +97,11 @@ class CClientScript extends CApplicationComponent
if(!$this->_hasScripts)
return;
$this->renderCoreScripts();
if(!empty($this->scriptMap))
$this->remapScripts();
$this->renderHead($output);
if($this->enableJavaScript)
{
@@ -93,6 +110,87 @@ class CClientScript extends CApplicationComponent
}
}
/**
* Uses {@link scriptMap} to re-map the registered scripts.
* @since 1.0.3
*/
protected function remapScripts()
{
$cssFiles=array();
foreach($this->_cssFiles as $url=>$media)
{
$name=basename($url);
if(isset($this->scriptMap[$name]))
{
if($this->scriptMap[$name]!==false)
$cssFiles[$this->scriptMap[$name]]=$media;
}
else if(isset($this->scriptMap['*.css']))
$cssFiles[$this->scriptMap['*.css']]=$media;
else
$cssFiles[$url]=$media;
}
$this->_cssFiles=$cssFiles;
$jsFiles=array();
foreach($this->_scriptFiles as $position=>$scripts)
{
$jsFiles[$position]=array();
foreach($scripts as $key=>$script)
{
$name=basename($script);
if(isset($this->scriptMap[$name]))
{
if($this->scriptMap[$name]!==false)
$jsFiles[$position][$name]=$this->scriptMap[$name];
}
else if(isset($this->scriptMap['*.js']))
$jsFiles[$position][$this->scriptMap['*.js']]=$this->scriptMap['*.js'];
else
$jsFiles[$position][$key]=$script;
}
}
$this->_scriptFiles=$jsFiles;
}
/**
* Renders the specified core javascript library.
* @since 1.0.3
*/
public function renderCoreScripts()
{
$baseUrl=$this->getCoreScriptUrl();
$cssFiles=array();
$jsFiles=array();
foreach($this->_coreScripts as $name)
{
foreach($this->_packages[$name] as $path)
{
$url=$baseUrl.'/'.$path;
if(substr($path,-4)==='.css')
$cssFiles[$url]='';
else
$jsFiles[$url]=$url;
}
}
// merge in place
if($cssFiles!==array())
{
foreach($this->_cssFiles as $cssFile=>$media)
$cssFiles[$cssFile]=$media;
$this->_cssFiles=$cssFiles;
}
if($jsFiles!==array())
{
if(isset($this->_scriptFiles[self::POS_HEAD]))
{
foreach($this->_scriptFiles[self::POS_HEAD] as $url)
$jsFiles[$url]=$url;
}
$this->_scriptFiles[self::POS_HEAD]=$jsFiles;
}
}
/**
* Inserts the scripts in the head section.
* @param string the output to be inserted with scripts.
@@ -110,12 +208,6 @@ class CClientScript extends CApplicationComponent
$html.=CHtml::css($css[0],$css[1])."\n";
if($this->enableJavaScript)
{
foreach($this->_coreScripts as $name)
{
if(is_string($name))
$html.=$this->renderCoreScript($name);
}
if(isset($this->_scriptFiles[self::POS_HEAD]))
{
foreach($this->_scriptFiles[self::POS_HEAD] as $scriptFile)
@@ -227,45 +319,6 @@ class CClientScript extends CApplicationComponent
$this->_baseUrl=$value;
}
/**
* Renders the specified core javascript library.
* Any dependent libraries will also be rendered.
* @param string name of core javascript library. See framework/web/js/packages.php
* for valid names.
* @return string the rendering result
*/
public function renderCoreScript($name)
{
if(isset($this->_coreScripts[$name]) && $this->_coreScripts[$name]===true || !$this->enableJavaScript)
return '';
$this->_coreScripts[$name]=true;
if($this->_packages===null)
{
$config=require(YII_PATH.'/web/js/packages.php');
$this->_packages=$config[0];
$this->_dependencies=$config[1];
}
$baseUrl=$this->getCoreScriptUrl();
$html='';
if(isset($this->_dependencies[$name]))
{
foreach($this->_dependencies[$name] as $depName)
$html.=$this->renderCoreScript($depName);
}
if(isset($this->_packages[$name]))
{
foreach($this->_packages[$name] as $path)
{
if(substr($path,-4)==='.css')
$html.=CHtml::cssFile($baseUrl.'/'.$path)."\n";
else
$html.=CHtml::scriptFile($baseUrl.'/'.$path)."\n";
}
}
return $html;
}
/**
* Registers a core javascript library.
* @param string the core javascript library name
@@ -273,6 +326,23 @@ class CClientScript extends CApplicationComponent
*/
public function registerCoreScript($name)
{
if(isset($this->_coreScripts[$name]))
return;
if($this->_packages===null)
{
$config=require(YII_PATH.'/web/js/packages.php');
$this->_packages=$config[0];
$this->_dependencies=$config[1];
}
if(!isset($this->_packages[$name]))
return;
if(isset($this->_dependencies[$name]))
{
foreach($this->_dependencies[$name] as $depName)
$this->registerCoreScript($depName);
}
$this->_hasScripts=true;
$this->_coreScripts[$name]=$name;
$params=func_get_args();