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

jQuery-UI removed from the front-end. And eventually the admin area if possible.

Browse Source
This commit is contained in:
Cameron
2013-04-14 12:33:06 -07:00
parent 723a38ac96
commit a90b8b943c
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_handlers/js_manager.php
View File

@@ -43,9 +43,10 @@ class e_jsmanager
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/base/jquery-ui.css", // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/base/jquery-ui.css",
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js" // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"
// "http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js", // "http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js",
"http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js", "http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js", // ,
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css", // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js",
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css",
// "http://code.jquery.com/jquery-1.8.3.js", // "http://code.jquery.com/jquery-1.8.3.js",
// "http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css", // "http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css",
// "http://code.jquery.com/ui/1.9.2/jquery-ui.js" // "http://code.jquery.com/ui/1.9.2/jquery-ui.js"
@@ -228,6 +229,15 @@ class e_jsmanager
// Try to auto-detect runtime location // Try to auto-detect runtime location
$this->setInAdmin(defset('e_ADMIN_AREA', false)); $this->setInAdmin(defset('e_ADMIN_AREA', false));
if($this->isInAdmin()) // Include jquery-ui in the admin-area only - Jquery-UI to eventually be removed from e107 completely if possible.
{
$this->_libraries['jquery'] = array(
"http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js",
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js",
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css",
);
}
$customJqueryUrls = e107::getPref('library-jquery-urls'); $customJqueryUrls = e107::getPref('library-jquery-urls');
if(vartrue($customJqueryUrls) && $this->_in_admin === false) if(vartrue($customJqueryUrls) && $this->_in_admin === false)

3
e107_web/js/core/admin.jquery.js
View File

@@ -33,6 +33,9 @@ $(document).ready(function()
}); });
// run tips on title attribute. // run tips on title attribute.
$(".e-tip").each(function() { $(".e-tip").each(function() {

6
e107_web/js/core/all.jquery.js
View File

@@ -224,7 +224,7 @@ $(document).ready(function()
// Tabs ----------------------------------------------------- // Tabs -----------------------------------------------------
/*
$(function() { $(function() {
$( "#tab-container" ).tabs({cache: true}); $( "#tab-container" ).tabs({cache: true});
}); });
@@ -249,7 +249,7 @@ $(document).ready(function()
return false; return false;
}); });
*/
// --------------- Email ---------------------------------------- // --------------- Email ----------------------------------------
@@ -444,7 +444,7 @@ $(document).ready(function()
$(".e-shake" ).effect("shake","",100);
$('.e-rate').each(function() { $('.e-rate').each(function() {
var path = $(this).attr("data-path"); var path = $(this).attr("data-path");