Commit d252677f authored by Taylor Otwell's avatar Taylor Otwell

removed get_script and get_style from asset class.

parent d82a3f41
...@@ -197,7 +197,7 @@ class Asset_Container { ...@@ -197,7 +197,7 @@ class Asset_Container {
*/ */
public function styles() public function styles()
{ {
return $this->get_group('style'); return $this->group('style');
} }
/** /**
...@@ -207,7 +207,7 @@ class Asset_Container { ...@@ -207,7 +207,7 @@ class Asset_Container {
*/ */
public function scripts() public function scripts()
{ {
return $this->get_group('script'); return $this->group('script');
} }
/** /**
...@@ -216,7 +216,7 @@ class Asset_Container { ...@@ -216,7 +216,7 @@ class Asset_Container {
* @param string $group * @param string $group
* @return string * @return string
*/ */
protected function get_group($group) protected function group($group)
{ {
if ( ! isset($this->assets[$group]) or count($this->assets[$group]) == 0) return ''; if ( ! isset($this->assets[$group]) or count($this->assets[$group]) == 0) return '';
...@@ -224,34 +224,12 @@ class Asset_Container { ...@@ -224,34 +224,12 @@ class Asset_Container {
foreach ($this->arrange($this->assets[$group]) as $name => $data) foreach ($this->arrange($this->assets[$group]) as $name => $data)
{ {
$assets .= $this->get_asset($group, $name); $assets .= $this->asset($group, $name);
} }
return $assets; return $assets;
} }
/**
* Get the link to a single registered CSS asset.
*
* @param string $name
* @return string
*/
public function get_style($name)
{
return $this->get_asset('style', $name);
}
/**
* Get the link to a single registered JavaScript asset.
*
* @param string $name
* @return string
*/
public function get_script($name)
{
return $this->get_asset('script', $name);
}
/** /**
* Get the HTML link to a registered asset. * Get the HTML link to a registered asset.
* *
...@@ -259,7 +237,7 @@ class Asset_Container { ...@@ -259,7 +237,7 @@ class Asset_Container {
* @param string $name * @param string $name
* @return string * @return string
*/ */
protected function get_asset($group, $name) protected function asset($group, $name)
{ {
if ( ! isset($this->assets[$group][$name])) return ''; if ( ! isset($this->assets[$group][$name])) return '';
......
...@@ -70,7 +70,6 @@ class AssetTest extends PHPUnit_Framework_TestCase { ...@@ -70,7 +70,6 @@ class AssetTest extends PHPUnit_Framework_TestCase {
$container->style('reset', 'css/reset.css'); $container->style('reset', 'css/reset.css');
$container->style('jquery', 'css/jquery.css'); $container->style('jquery', 'css/jquery.css');
$this->assertEquals($container->get_style('reset'), 'css/reset.css media:all');
$this->assertEquals($container->styles(), 'css/reset.css media:allcss/jquery.css media:all'); $this->assertEquals($container->styles(), 'css/reset.css media:allcss/jquery.css media:all');
} }
...@@ -81,7 +80,6 @@ class AssetTest extends PHPUnit_Framework_TestCase { ...@@ -81,7 +80,6 @@ class AssetTest extends PHPUnit_Framework_TestCase {
$container->script('jquery-ui', 'js/jquery-ui.js'); $container->script('jquery-ui', 'js/jquery-ui.js');
$container->script('jquery', 'js/jquery.js', array(), array('test' => 'value')); $container->script('jquery', 'js/jquery.js', array(), array('test' => 'value'));
$this->assertEquals($container->get_script('jquery-ui'), 'js/jquery-ui.js ');
$this->assertEquals($container->scripts(), 'js/jquery-ui.js js/jquery.js test:value'); $this->assertEquals($container->scripts(), 'js/jquery-ui.js js/jquery.js test:value');
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment