diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json index 2991149c7e..f397c7f7ca 100644 --- a/src/Umbraco.Web.UI.Client/bower.json +++ b/src/Umbraco.Web.UI.Client/bower.json @@ -34,60 +34,47 @@ "font-awesome": "~4.2", "angular-moment": "^1.0.1" }, - "install": { - "path": "lib-bower", - "ignore": [ "font-awesome", "angular", "bootstrap", "codemirror" ], - "sources": { "moment": "bower_components/moment/min/moment-with-locales.js", - "underscore": [ "bower_components/underscore/underscore-min.js", "bower_components/underscore/underscore-min.map" ], - "jquery": [ "bower_components/jquery/dist/jquery.min.js", "bower_components/jquery/dist/jquery.min.map" ], - "angular-dynamic-locale": [ "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js", "bower_components/angular-dynamic-locale/tmhDynamicLocale.min.js.map" ], - "angular-local-storage": [ "bower_components/angular-local-storage/dist/angular-local-storage.min.js", "bower_components/angular-local-storage/dist/angular-local-storage.min.js.map" ], - "angular-moment": [ "bower_components/angular-moment/angular-moment.min.js" ], - "tinymce": [ "bower_components/tinymce/tinymce.min.js" ], - "typeahead.js": "bower_components/typeahead.js/dist/typeahead.bundle.min.js", - - "rgrove-lazyload":"bower_components/rgrove-lazyload/lazyload.js", - - "ng-file-upload":"bower_components/ng-file-upload/ng-file-upload.min.js", - - "jquery-ui":"bower_components/jquery-ui/jquery-ui.min.js", - - "jquery-migrate":"bower_components/jquery-migrate/jquery-migrate.min.js", - + "rgrove-lazyload": "bower_components/rgrove-lazyload/lazyload.js", + "ng-file-upload": "bower_components/ng-file-upload/ng-file-upload.min.js", + "jquery-ui": "bower_components/jquery-ui/jquery-ui.min.js", + "jquery-migrate": "bower_components/jquery-migrate/jquery-migrate.min.js", "clipboard": "bower_components/clipboard/dist/clipboard.min.js" } + }, + "resolutions": { + "moment": ">=2.19.3 <3.0.0" } } diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js index b3a58034f7..5d1fa33a63 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js @@ -33,8 +33,6 @@ vm.unlockUser = unlockUser; vm.clearAvatar = clearAvatar; vm.save = save; - //a list of methods invoked with promises during the save operation, each must have a key - vm.extendedSaveMethods = {}; vm.toggleChangePassword = toggleChangePassword;