mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-06-18 12:43:42 +00:00
merging changes from sandboxes
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@856 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
37da997748
commit
1dce095546
35 changed files with 549 additions and 428 deletions
libs/helpers
|
@ -30,14 +30,6 @@
|
|||
*/
|
||||
|
||||
|
||||
if(!defined("TAG_JAVASCRIPT")) {
|
||||
define("TAG_JAVASCRIPT", '<script type="text/javascript">%s</script>');
|
||||
}
|
||||
|
||||
if(!defined("TAG_JAVASCRIPT_INCLUDE")) {
|
||||
define("TAG_JAVASCRIPT_INCLUDE", '<script type="text/javascript" src="%s"></script>');
|
||||
}
|
||||
|
||||
/**
|
||||
* Javascript Helper class for easy use of JavaScript.
|
||||
*
|
||||
|
@ -57,7 +49,7 @@ class JavascriptHelper extends Helper
|
|||
*/
|
||||
function codeBlock($script)
|
||||
{
|
||||
return sprintf(TAG_JAVASCRIPT, $script);
|
||||
return sprintf($this->tags['javascriptBlock'], $script);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -68,7 +60,18 @@ class JavascriptHelper extends Helper
|
|||
*/
|
||||
function link($url)
|
||||
{
|
||||
return sprintf(TAG_JAVASCRIPT_INCLUDE, $this->base.$url);
|
||||
return sprintf($this->tags['javascriptLink'], $this->base.$url);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a JavaScript include tag for an externally-hosted script
|
||||
*
|
||||
* @param string $url URL to JavaScript file.
|
||||
* @return string
|
||||
*/
|
||||
function linkOut($url)
|
||||
{
|
||||
return sprintf($this->tags['javascriptLink'], $url);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue