From ea64b00e234691463f29bf813ee3cb8f5f3e5a67 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Mon, 17 Aug 2015 10:41:28 +0100 Subject: [PATCH] Update admin area jquery and jquery-ui dependencies no issue - updates jquery from 1.9.x to 2.1.x, dropping support for old IE - updates jquery-ui from 1.10.4 to 1.11.4 --- core/client/Brocfile.js | 2 +- core/client/bower.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/client/Brocfile.js b/core/client/Brocfile.js index e3045cd20e..08cd8408c5 100644 --- a/core/client/Brocfile.js +++ b/core/client/Brocfile.js @@ -44,7 +44,7 @@ app.import('bower_components/showdown-ghost/src/extensions/highlight.js'); app.import('bower_components/moment/moment.js'); app.import('bower_components/keymaster/keymaster.js'); app.import('bower_components/devicejs/lib/device.js'); -app.import('bower_components/jquery-ui/ui/jquery-ui.js'); +app.import('bower_components/jquery-ui/jquery-ui.js'); app.import('bower_components/jquery-file-upload/js/jquery.fileupload.js'); app.import('bower_components/blueimp-load-image/js/load-image.all.min.js'); app.import('bower_components/jquery-file-upload/js/jquery.fileupload-process.js'); diff --git a/core/client/bower.json b/core/client/bower.json index 323d21cf72..1a23e6e824 100644 --- a/core/client/bower.json +++ b/core/client/bower.json @@ -14,10 +14,10 @@ "ember-simple-auth": "0.8.0", "fastclick": "1.0.6", "google-caja": "5669.0.0", - "jquery": "1.11.2", + "jquery": "2.1.4", "jquery-file-upload": "9.5.6", "jquery-hammerjs": "1.0.1", - "jquery-ui": "1.10.4", + "jquery-ui": "1.11.4", "jqueryui-touch-punch": "furf/jquery-ui-touch-punch", "keymaster": "1.6.3", "loader.js": "3.2.1",