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

some fixes related with the previous removal of js block from e_css

Browse Source
This commit is contained in:
secretr
2012-02-16 14:18:17 +00:00
parent 80ad24eeef
commit 3f3cdbfcd6
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_admin/header.php
View File

@@ -2,16 +2,14 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2012 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* Admin Header * Admin Header
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ * $URL$
* $Revision$ * $Id$
* $Date$
* $Author$
*/ */
if (!defined('e107_INIT')) if (!defined('e107_INIT'))
@@ -206,6 +204,12 @@ if ((isset($pref['enable_png_image_fix']) && $pref['enable_png_image_fix'] == tr
echo "<![endif]-->\n"; echo "<![endif]-->\n";
} }
//
// Unobtrusive JS via CSS, prevent 3rd party code overload
//
require_once(e_FILE."/e_css.php");
// //
// E: Send JS // E: Send JS
// //
@@ -361,11 +365,6 @@ echo "
e107::getJs()->renderJs('header', 5); e107::getJs()->renderJs('header', 5);
e107::getJs()->renderJs('header_inline', 5); e107::getJs()->renderJs('header_inline', 5);
//
// Unobtrusive JS via CSS, prevent 3rd party code overload
//
require_once(e_FILE."/e_css.php");
/* /*
* Fire Event e107:loaded * Fire Event e107:loaded
* TODO - remove it from here, should be registered to e_jsmanager * TODO - remove it from here, should be registered to e_jsmanager
@@ -373,6 +372,7 @@ require_once(e_FILE."/e_css.php");
*/ */
echo "<script type='text/javascript'>\n"; echo "<script type='text/javascript'>\n";
echo "<!--\n"; echo "<!--\n";
echo "\$('e-js-css').remove();\n"; // unobtrusive JS - moved here from external e_css.php
echo "document.observe('dom:loaded', function () {\n"; echo "document.observe('dom:loaded', function () {\n";
echo "e107Event.trigger('loaded', null, document);\n"; echo "e107Event.trigger('loaded', null, document);\n";
echo "});\n"; echo "});\n";

4
e107_themes/templates/header_default.php
View File

@@ -2,7 +2,7 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2011 e107 Inc (e107.org) * Copyright (C) 2008-2012 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
@@ -494,7 +494,7 @@ if (count($js_body_onload)) $body_onload = " onload=\"".implode(" ",$js_body_onl
*/ */
echo "<script type='text/javascript'>\n"; echo "<script type='text/javascript'>\n";
echo "<!--\n"; echo "<!--\n";
echo "$('e-js-css').remove();\n"; // unobtrusive JS - moved here from external e_css.php echo "\$('e-js-css').remove();\n"; // unobtrusive JS - moved here from external e_css.php
echo "document.observe('dom:loaded', function() {\n"; echo "document.observe('dom:loaded', function() {\n";
echo "e107Event.trigger('loaded', {element: null}, document);\n"; echo "e107Event.trigger('loaded', {element: null}, document);\n";
echo "});\n"; echo "});\n";