From a90b8b943cfc2b9e04e37fb99571bdddf9effce1 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 14 Apr 2013 12:33:06 -0700 Subject: [PATCH] jQuery-UI removed from the front-end. And eventually the admin area if possible. --- e107_handlers/js_manager.php | 16 +++++++++++++--- e107_web/js/core/admin.jquery.js | 3 +++ e107_web/js/core/all.jquery.js | 6 +++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/e107_handlers/js_manager.php b/e107_handlers/js_manager.php index 0c5b8b268..63384e239 100644 --- a/e107_handlers/js_manager.php +++ b/e107_handlers/js_manager.php @@ -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/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.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/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://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/jquery-ui.js" @@ -228,6 +229,15 @@ class e_jsmanager // Try to auto-detect runtime location $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'); if(vartrue($customJqueryUrls) && $this->_in_admin === false) diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js index 07fa801a1..d86ec9861 100644 --- a/e107_web/js/core/admin.jquery.js +++ b/e107_web/js/core/admin.jquery.js @@ -33,6 +33,9 @@ $(document).ready(function() }); + + + // run tips on title attribute. $(".e-tip").each(function() { diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js index 8f21a2414..1e4197324 100644 --- a/e107_web/js/core/all.jquery.js +++ b/e107_web/js/core/all.jquery.js @@ -224,7 +224,7 @@ $(document).ready(function() // Tabs ----------------------------------------------------- - + /* $(function() { $( "#tab-container" ).tabs({cache: true}); }); @@ -249,7 +249,7 @@ $(document).ready(function() return false; }); - + */ // --------------- Email ---------------------------------------- @@ -444,7 +444,7 @@ $(document).ready(function() - $(".e-shake" ).effect("shake","",100); + $('.e-rate').each(function() { var path = $(this).attr("data-path");