adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-18 23:49:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing script output caching in JavascriptHelper

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4338 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-01-27 17:41:32 +00:00
parent 55a4245d01
commit dc00f9b905
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
cake/libs/view/helpers/javascript.php
View file

@ -49,9 +49,12 @@ class JavascriptHelper extends AppHelper {
* *
* @var array * @var array
*/ */
var $tags = array('javascriptblock' => '<script type="text/javascript">%s</script>', var $tags = array(
'javascriptstart' => '<script type="text/javascript">', 'javascriptblock' => '<script type="text/javascript">%s</script>',
'javascriptlink' => '<script type="text/javascript" src="%s"></script>'); 'javascriptstart' => '<script type="text/javascript">',
'javascriptlink' => '<script type="text/javascript" src="%s"></script>',
'javascriptend' => '</script>',
);
/** /**
* Returns a JavaScript script tag. * Returns a JavaScript script tag.
@ -103,7 +106,7 @@ class JavascriptHelper extends AppHelper {
$this->_cachedEvents[] = $script; $this->_cachedEvents[] = $script;
} }
return $this->tags['javascriptend'];
} }
/** /**
* Returns a JavaScript include tag (SCRIPT element) * Returns a JavaScript include tag (SCRIPT element)
@ -244,11 +247,14 @@ class JavascriptHelper extends AppHelper {
/** /**
* Write cached JavaScript events * Write cached JavaScript events
* *
* @param boolean $inline If true, returns JavaScript event code. Otherwise it is added to the
* output of $scripts_for_layout in the layout.
* @return string * @return string
*/ */
function writeEvents() { function writeEvents($inline = true) {
$out = '';
$rules = array(); $rules = array();
if (!empty($this->_rules)) { if (!empty($this->_rules)) {
foreach ($this->_rules as $sel => $event) { foreach ($this->_rules as $sel => $event) {
$rules[] = "\t'{$sel}': function(element, event) {\n\t\t{$event}\n\t}"; $rules[] = "\t'{$sel}': function(element, event) {\n\t\t{$event}\n\t}";
@ -257,7 +263,6 @@ class JavascriptHelper extends AppHelper {
} }
if ($this->_cacheEvents) { if ($this->_cacheEvents) {
$this->_cacheEvents = false; $this->_cacheEvents = false;
$events = $this->_cachedEvents; $events = $this->_cachedEvents;
$data = implode("\n", $events); $data = implode("\n", $events);
@ -273,9 +278,15 @@ class JavascriptHelper extends AppHelper {
if (!file_exists(JS . $filename . '.js')) { if (!file_exists(JS . $filename . '.js')) {
cache(r(WWW_ROOT, '', JS) . $filename . '.js', $data, '+999 days', 'public'); cache(r(WWW_ROOT, '', JS) . $filename . '.js', $data, '+999 days', 'public');
} }
return $this->link($filename); $out = $this->link($filename);
} else { } else {
return $this->codeBlock("\n" . $data . "\n"); $out = $this->codeBlock("\n" . $data . "\n");
}
if ($inline) {
return $out;
} else {
$view =& ClassRegistry::getObject('view');
$view->addScript($out);
} }
} }
} }
@ -378,7 +389,7 @@ class JavascriptHelper extends AppHelper {
* @return null * @return null
*/ */
function afterRender() { function afterRender() {
echo $this->writeEvents(); echo $this->writeEvents(true);
} }
} }