mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 18:14:26 +02:00
Code Issues Releases Wiki Activity

Front-end header work - load oder changed, js manager support (CSS files render).

Browse Source
This commit is contained in:
secretr
2010-02-01 17:15:59 +00:00
parent 797928071a
commit a91d82a398
3 changed files with 209 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_handlers/js_manager.php
View File

@@ -7,8 +7,8 @@
* GNU General Public License (http://gnu.org).
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/js_manager.php,v $
* $Revision: 1.11 $
* $Date: 2010-01-12 07:38:28 $
* $Revision: 1.12 $
* $Date: 2010-02-01 17:15:58 $
* $Author: secretr $
*
*/
@@ -418,12 +418,12 @@ class e_jsmanager
*
* @param string $plugname
* @param string $file_path relative to plugin root folder
* @param integer $zone 1-5 (see header.php)
* @param integer $zone 1-5 (see header.php) - REMOVED, actually we need to prevent zone change
* @return e_jsmanager
*/
public function headerPlugin($plugname, $file_path, $zone = 3)
public function headerPlugin($plugname, $file_path)
{
$this->headerFile('{e_PLUGIN}'.$plugname.'/'.trim($file_path, '/'), $zone);
$this->headerFile('{e_PLUGIN}'.$plugname.'/'.trim($file_path, '/'), 2); // Zone 2 - after libraries
return $this;
}
@@ -528,6 +528,7 @@ class e_jsmanager
return $this;
}
// FIXME - this could break something after CSS support was added, move it to separate method(s), recursion by type!
if(is_array($file_path))
{
foreach ($file_path as $fp => $loc)
@@ -562,7 +563,7 @@ class e_jsmanager
$registry = &$this->_e_jslib_theme;
break;
case 'core_css':
case 'core_css': //FIXME - core CSS should point to new e_WEB/css; add one more case - js_css -> e_WEB/jslib/
$file_path = $runtime_location.'|{e_FILE}jslib/'.trim($file_path, '/');
if(!isset($this->_e_css['core'])) $this->_e_css['core'] = array();
$registry = &$this->_e_css['core'];