Commit 3c61fc8f authored by colemanw's avatar colemanw

CRM-15890 - Switch jQuery to use bower version

parent ba857072
......@@ -672,9 +672,9 @@ class CRM_Core_Resources {
// Scripts needed by everyone, everywhere
// FIXME: This is too long; list needs finer-grained segmentation
$items = array(
"packages/jquery/jquery-1.11.1$min.js",
"packages/jquery/jquery-ui/jquery-ui$min.js",
"packages/jquery/jquery-ui/jquery-ui$min.css",
"bower_components/jquery/dist/jquery.min.js",
"bower_components/jquery-ui/jquery-ui.min.js",
"bower_components/jquery-ui/themes/smoothness/jquery-ui$min.css",
"packages/backbone/lodash.compat$min.js",
"packages/jquery/plugins/jquery.mousewheel$min.js",
"packages/jquery/plugins/select2/select2$min.js",
......@@ -715,7 +715,7 @@ class CRM_Core_Resources {
if ($config->lcMessages && $config->lcMessages != 'en_US') {
// Search for i18n file in order of specificity (try fr-CA, then fr)
list($lang) = explode('_', $config->lcMessages);
$path = "packages/jquery/jquery-ui/i18n";
$path = "bower_components/jquery-ui/ui/i18n";
foreach (array(str_replace('_', '-', $config->lcMessages), $lang) as $language) {
$localizationFile = "$path/datepicker-{$language}.js";
if ($this->getPath('civicrm', $localizationFile)) {
......
......@@ -14,7 +14,9 @@
"angular-ui-utils": "0.1.x",
"angular-unsavedChanges": "~0.1.1",
"qunit": "1.10.0",
"d3": "3.4.11"
"d3": "3.4.11",
"jquery": "1.11.2",
"jquery-ui": "1.11.2"
},
"resolutions": {
"angular": "~1.3.8"
......
......@@ -2579,7 +2579,7 @@ div.grippie {
}
.crm-container .dark-icon {
background-image: url("../packages/jquery/jquery-ui/images/ui-icons_222222_256x240.png")
background-image: url("../bower_components/jquery-ui/themes/smoothness/images/ui-icons_222222_256x240.png")
}
.crm-container .delete-icon {
background-position: -176px -96px;
......@@ -2820,7 +2820,7 @@ div.grippie {
}
.crm-status-box-outer.status-start {
background: #F8FF03 url("../packages/jquery/jquery-ui/images/animated-overlay.gif");
background: #F8FF03 url("../bower_components/jquery-ui/themes/smoothness/images/animated-overlay.gif");
}
.crm-status-box-outer .crm-status-box-inner {
......
......@@ -95,7 +95,7 @@
}
#crm-container .widget-icon {
background-image:url('../packages/jquery/jquery-ui/images/ui-icons_222222_256x240.png');
background-image:url('../bower_components/jquery-ui/themes/smoothness/images/ui-icons_222222_256x240.png');
height:16px;
width:16px;
padding-right:2px;
......
......@@ -15,7 +15,7 @@ if (!jQuery) {ldelim}
var head= document.getElementsByTagName('head')[0];
var script= document.createElement('script');
script.type= 'text/javascript';
script.src= CRM.config.resourceBase + 'js/packages/jquery/jquery.js';
script.src= CRM.config.resourceBase + 'bower_components/jquery/dist/jquery.min.js';
head.appendChild(script);
{rdelim}
restURL = '{crmURL p="civicrm/api/json"}';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment