From 85e5c0c21909845efe17b4a98976e8df88f5ba5a Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 9 Nov 2015 17:10:33 +0100 Subject: [PATCH] fixes jquery reference issue (again) --- src/Umbraco.Web.UI.Client/bower.json | 2 +- src/Umbraco.Web.UI.Client/gruntFile.js | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json index 01dcc2999e..cc67e06ae1 100644 --- a/src/Umbraco.Web.UI.Client/bower.json +++ b/src/Umbraco.Web.UI.Client/bower.json @@ -26,6 +26,6 @@ "angular-dynamic-locale": "~0.1.27", "ng-file-upload": "~7.3.8", "tinymce": "~4.1.10", - "codemirror": "~5.3.0" + "codemirror": "~5.3.0" } } diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js index 5982df7643..c830ee3433 100644 --- a/src/Umbraco.Web.UI.Client/gruntFile.js +++ b/src/Umbraco.Web.UI.Client/gruntFile.js @@ -469,18 +469,16 @@ module.exports = function (grunt) { 'rgrove-lazyload': { files: ['lazyload.js'] }, - 'angular-dynamic-locale': { - files: ['tmhDynamicLocale.min.js,tmhDynamicLocale.min.js.map}'] - }, 'bootstrap-social': { files: ['bootstrap-social.css'] }, 'font-awesome': { files: ['css/font-awesome.min.css', 'fonts/*'] }, - 'jquery': { - files: ['jquery.min.js', 'jquery.min.map'] - }, + "jquery": { + keepExpandedHierarchy: false, + files: ['dist/jquery.min.js', 'dist/jquery.min.map'] + }, 'jquery-ui': { keepExpandedHierarchy: false, files: ['ui/minified/jquery-ui.min.js']