diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json index 2c4b4d8d86..d6682b0435 100644 --- a/src/Umbraco.Web.UI.Client/bower.json +++ b/src/Umbraco.Web.UI.Client/bower.json @@ -1,31 +1,34 @@ { - "name": "Umbraco", - "version": "7", - "homepage": "https://github.com/umbraco/Umbraco-CMS", - "authors": [ - "Shannon " - ], - "description": "Umbraco CMS", - "license": "MIT", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "typeahead.js": "~0.10.5", - "underscore": "~1.7.0", - "rgrove-lazyload": "*", - "jquery": "2.0.3", - "jquery-file-upload": "~9.4.0", - "jquery-ui": "1.10.3", - "angular-dynamic-locale": "~0.1.27", - "bootstrap-tabdrop": "~1.0.0" + "name": "Umbraco", + "version": "7", + "homepage": "https://github.com/umbraco/Umbraco-CMS", + "authors": [ + "Shannon " + ], + "description": "Umbraco CMS", + "license": "MIT", + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "typeahead.js": "~0.10.5", + "underscore": "~1.7.0", + "rgrove-lazyload": "*", + "jquery": "2.0.3", + "jquery-file-upload": "~9.4.0", + "jquery-ui": "1.10.3", + "angular-dynamic-locale": "~0.1.27", + "bootstrap-tabdrop": "~1.0.0" }, "exportsOverride": { + "bootstrap-tabdrop": { + "": "build/js/bootstrap-tabdrop.min.js" + }, "rgrove-lazyload": { "": "lazyload.js" }, @@ -39,7 +42,7 @@ "": "tmhDynamicLocale.min.{js,js.map}" }, "jquery": { - "": "jquery.min.{js,map}" + "": "jquery.min.{js,map}" }, "jquery-file-upload": { "": "**/jquery.{fileupload,fileupload-process,fileupload-angular,fileupload-image}.js" @@ -54,9 +57,9 @@ "blueimp-tmpl": { "ignore": "*.ignore" }, - + "blueimp-canvas-to-blob": { "ignore": "*.ignore" } - } + } } diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js index 03b6c6ccbf..a5961f126c 100644 --- a/src/Umbraco.Web.UI.Client/gruntFile.js +++ b/src/Umbraco.Web.UI.Client/gruntFile.js @@ -418,10 +418,7 @@ module.exports = function (grunt) { //this is the same as 'byComponent', however we will not allow // folders with '.' in them since the grunt copy task does not like that var componentWithoutPeriod = component.replace(".", "-"); - return path.join(componentWithoutPeriod, type); - }, - 'bootstrap-tabdrop': { - keepExpandedHierarchy: false + return path.join(componentWithoutPeriod, type); } } } diff --git a/src/Umbraco.Web.UI.Client/src/loader.js b/src/Umbraco.Web.UI.Client/src/loader.js index 9cbb8f233d..179de16de8 100644 --- a/src/Umbraco.Web.UI.Client/src/loader.js +++ b/src/Umbraco.Web.UI.Client/src/loader.js @@ -21,7 +21,7 @@ LazyLoad.js( 'lib/jquery-file-upload/jquery.fileupload-angular.js', 'lib/bootstrap/js/bootstrap.2.3.2.min.js', - 'lib/bootstrap-tabdrop/bootstrap-tabdrop.js', + 'lib/bootstrap-tabdrop/bootstrap-tabdrop.min.js', 'lib/umbraco/Extensions.js', 'lib/umbraco/NamespaceManager.js', diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js index 51e19b388a..3ae74ba08b 100644 --- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js +++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js @@ -20,7 +20,7 @@ 'lib/jquery-file-upload/jquery.fileupload-angular.js', 'lib/bootstrap/js/bootstrap.2.3.2.min.js', - 'lib/bootstrap-tabdrop/bootstrap-tabdrop.js', + 'lib/bootstrap-tabdrop/bootstrap-tabdrop.min.js', 'lib/umbraco/Extensions.js', 'lib/umbraco/NamespaceManager.js',