adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3653 from markstory/2.6-html-css

Browse source 
Add once option to css().
This commit is contained in:
José Lorenzo Rodríguez 2014-06-06 09:55:06 +02:00
commit 91224b0ec1
2 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
View file

@ -695,6 +695,31 @@ class HtmlHelperTest extends CakeTestCase {
$this->assertTags($result, $expected);
}
/**
* Test css() with once option.
*
* @return void
*/
public function testCssLinkOnce() {
Configure::write('Asset.filter.css', false);
$result = $this->Html->css('screen', array('once' => true));
$expected = array(
'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'preg:/.*css\/screen\.css/')
);
$this->assertTags($result, $expected);
$result = $this->Html->css('screen', array('once' => true));
$this->assertEquals('', $result);
// Default is once=false
$result = $this->Html->css('screen');
$expected = array(
'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'preg:/.*css\/screen\.css/')
);
$this->assertTags($result, $expected);
}
/**
* Test css link BC usage
*

24
lib/Cake/View/Helper/HtmlHelper.php
View file

@ -112,11 +112,11 @@ class HtmlHelper extends AppHelper {
protected $_crumbs = array();
/**
* Names of script files that have been included once
* Names of script & css files that have been included once
*
* @var array
*/
protected $_includedScripts = array();
protected $_includedAssets = array();
/**
* Options for the currently opened script block buffer if any.
@ -397,6 +397,9 @@ class HtmlHelper extends AppHelper {
*
* - `inline` If set to false, the generated tag will be appended to the 'css' block,
* and included in the `$scripts_for_layout` layout variable. Defaults to true.
* - `once` Whether or not the css file should be checked for uniqueness. If true css
* files will only be included once, use false to allow the same
* css to be included more than once per request.
* - `block` Set the name of the block link/style tag will be appended to.
* This overrides the `inline` option.
* - `plugin` False value will prevent parsing path as a plugin
@ -423,7 +426,12 @@ class HtmlHelper extends AppHelper {
unset($rel);
}
$options += array('block' => null, 'inline' => true, 'rel' => 'stylesheet');
$options += array(
'block' => null,
'inline' => true,
'once' => false,
'rel' => 'stylesheet'
);
if (!$options['inline'] && empty($options['block'])) {
$options['block'] = __FUNCTION__;
}
@ -440,6 +448,12 @@ class HtmlHelper extends AppHelper {
return;
}
if ($options['once'] && isset($this->_includedAssets[$path])) {
return '';
}
unset($options['once']);
$this->_includedAssets[$path] = true;
if (strpos($path, '//') !== false) {
$url = $path;
} else {
@ -538,10 +552,10 @@ class HtmlHelper extends AppHelper {
}
return null;
}
if ($options['once'] && isset($this->_includedScripts[$url])) {
if ($options['once'] && isset($this->_includedAssets[$url])) {
return null;
}
$this->_includedScripts[$url] = true;
$this->_includedAssets[$url] = true;
if (strpos($url, '//') === false) {
$url = $this->assetUrl($url, $options + array('pathPrefix' => Configure::read('App.jsBaseUrl'), 'ext' => '.js'));