mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00
Code Issues Releases Wiki Activity

Issue #1183 Switch all CDN sources to https to prevent browser alerts. Optimization of some javascript loading. jQuery updated to 2.1.4

Browse Source
This commit is contained in:
Cameron 2015-09-17 12:48:06 -07:00
parent 5ef1d56ec6
commit e50456264f
8 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/header.php
View File

@ -75,10 +75,10 @@ function loadJSAddons()
//e107::css('core', 'chosen/chosen.css', 'jquery');
//e107::js('core', 'chosen/chosen.jquery.min.js', 'jquery', 2);
e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2);
// e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2); // loaded in form-handler.
// e107::css('core', 'bootstrap-tag/bootstrap-tag.css', 'jquery');
e107::js('core', 'bootstrap-tag/bootstrap-tag.js', 'jquery', 2);
// e107::js('core', 'bootstrap-tag/bootstrap-tag.js', 'jquery', 2);
// e107::js("core", "tags/jquery.tagit.js","jquery",3);

14
e107_handlers/form_handler.php
View File

@ -1197,7 +1197,19 @@ class e_form
$options['pattern'] = vartrue($options['pattern'],'[\S]{4,}');
$options['required'] = varset($options['required'], 1);
$options['class'] = vartrue($options['class'],'e-password');
e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2);
e107::js('footer-inline', '
$(".e-password").pwdMeter({
minLength: 6,
displayGeneratePassword: true,
generatePassText: "Generate",
randomPassLength: 12
});
');
if(deftrue('BOOTSTRAP') == 3)
{
$options['class'] .= ' form-control';

30
e107_handlers/js_manager.php
View File

@ -44,7 +44,8 @@ class e_jsmanager
// "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/jquery/2.1.1/jquery.min.js"
// "http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"
"https://cdn.jsdelivr.net/jquery/2.1.4/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",
@ -240,26 +241,15 @@ class e_jsmanager
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(
"https://cdn.jsdelivr.net/jquery/2.1.4/jquery.min.js",
"https://cdn.jsdelivr.net/jquery.ui/1.11.4/jquery-ui.min.js",
"https://cdn.jsdelivr.net/jquery.ui/1.11.4/themes/smoothness/jquery-ui.min.css"
);
if(e107::getPref('admintheme')=='bootstrap3') // Bootstrap 3 admin area.
{
$this->_libraries['jquery'] = array(
"http://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js",
"https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js",
"https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/themes/smoothness/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",
);
}
else // Bootstrap 2 admin area.
{
$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",
);
}
// "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js",
// "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/themes/smoothness/jquery-ui.css",
//https://cdn.jsdelivr.net/jquery.ui/1.11.4/jquery-ui.min.css
}
if(isset($_SERVER['E_DEV_LOCALJS']) && $_SERVER['E_DEV_LOCALJS'] === 'true') // Test with Local JS Framework files.

7
e107_plugins/featurebox/e_header.php
View File

@ -1,6 +1,9 @@
<?php
if (!defined('e107_INIT')){ exit; }
//TODO add checks so that it's only loaded when needed.
e107::css('core','camera/css/camera.css','jquery');
//TODO add checks so that it's only loaded when needed.
if(USER_AREA)
{
e107::css('core','camera/css/camera.css','jquery');
}
?>

2
e107_themes/bootstrap3/admin_style.css
View File

@ -160,7 +160,7 @@ td.options .btn-group { display: flex; }
#admin-ui-modal { width: 90%; }
.editable-input .form-control { width:300px } /* x-editable */

11
e107_themes/bootstrap3/admin_theme.php
View File

@ -5,9 +5,16 @@ define("SEP"," <span class='fa fa-play e-breadcrumb'></span> ");
define("BOOTSTRAP", 3);
define('FONTAWESOME', 4);
e107::js("url", "http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js",'jquery', 2);
// e107::js("url", "https://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js",'jquery', 2);
// e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css');
e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
// e107::css('url', "https://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
e107::js("url", "https://cdn.jsdelivr.net/bootstrap/3.3.5/js/bootstrap.min.js", 'jquery', 2);
// e107::css('url', 'https://cdn.jsdelivr.net/bootstrap/3.3.5/css/bootstrap.min.css');
e107::css('url', 'https://cdn.jsdelivr.net/fontawesome/4.4.0/css/font-awesome.min.css');
// Too slow.
// e107::css('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css");

15
e107_themes/bootstrap3/theme.php
View File

@ -8,9 +8,18 @@ define("BOOTSTRAP", 3);
define("FONTAWESOME", 4);
define('VIEWPORT', "width=device-width, initial-scale=1.0");
e107::js("url", "http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js");
e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css');
e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
//e107::js("url", "https://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js");
//e107::css('url', 'https://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css');
// e107::css('url', "https://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
// @see https://www.cdnperf.com
// Warning: Some bootstrap CDNs are not compiled with popup.js
// use https if e107 is using https.
e107::js("url", "https://cdn.jsdelivr.net/bootstrap/3.3.5/js/bootstrap.min.js", 'jquery', 2);
e107::css('url', 'https://cdn.jsdelivr.net/bootstrap/3.3.5/css/bootstrap.min.css');
e107::css('url', 'https://cdn.jsdelivr.net/fontawesome/4.4.0/css/font-awesome.min.css');
e107::js("footer-inline", "$('.e-tip').tooltip({container: 'body'})"); // activate bootstrap tooltips.

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

@ -88,7 +88,7 @@ $(document).ready(function()
$('div.e-container').editable({
selector: '.e-editable',
selector: '.e-editable'
});
// $('.e-editable').editable();
@ -417,7 +417,7 @@ $(document).ready(function()
});
$(".e-tags").tag();
// $(".e-tags").tag();
@ -461,12 +461,13 @@ $(document).ready(function()
}
// backend
$(".e-password").pwdMeter({
/*
$(".e-password").pwdMeter({
minLength: 6,
displayGeneratePassword: true,
generatePassText: "Generate",
randomPassLength: 12
});
});*/