extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

only add slider.js for framework (cd=yes), as it is not needed for iframes and gives javascript error

Browse Source
This commit is contained in:
Ralf Becker 2014-01-06 10:36:18 +00:00
parent 7334920cfb
commit da7b9ca9b5
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pixelegg/inc/class.pixelegg_framework.inc.php
View File

@ -39,4 +39,22 @@ class pixelegg_framework extends jdots_framework
{
parent::__construct($template); // call the constructor of the extended class
}
/**
* Render header
*
* Overwritten to load our slider.js
*
* @param array $extra
* @return type
*/
function header(array $extra=array())
{
// load our slider.js, but only if framework requested
if (!self::$header_done && $_GET['cd'] === 'yes')
{
self::validate_file('/pixelegg/js/slider.js');
}
return parent::header($extra);
}
}

2
pixelegg/templates/pixelegg/head.tpl
View File

@ -18,8 +18,6 @@
{app_css}
</style>
{java_script}
<script src="./pixelegg/js/slider.js" type="text/javascript"></script>
</head>
<body {body_tags}>
{include_wz_tooltip}