1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 01:54:12 +02:00

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

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

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/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)