From 068c4a0b168818eb17ccf04a8cfe3fb876f38fe2 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 25 Nov 2015 11:22:12 +0100 Subject: [PATCH] Fixes PR for U4-7362 Add message to login screen if Caps Lock is on --- src/Umbraco.Web.UI.Client/bower.json | 2 +- src/Umbraco.Web.UI.Client/gruntFile.js | 5 ++++- src/Umbraco.Web.UI.Client/src/loader.dev.js | 4 ++-- src/Umbraco.Web/UI/JavaScript/JsInitialize.js | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json index 097ea1da66..6d5a5949cd 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", "tinymce": "~4.1.10", "codemirror": "~5.3.0", - "ngCapsLock": "~1.0.2" + "ng-caps-lock": "~1.0.2" } } diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js index 8699f4a6f1..b184dee673 100644 --- a/src/Umbraco.Web.UI.Client/gruntFile.js +++ b/src/Umbraco.Web.UI.Client/gruntFile.js @@ -459,7 +459,10 @@ module.exports = function (grunt) { }, 'angular-dynamic-locale': { files: ['tmhDynamicLocale.min.js', 'tmhDynamicLocale.min.js.map'] - }, + }, + 'ng-caps-lock': { + files: ['ng-caps-lock.min.js'] + }, 'codemirror': { files: [ 'lib/codemirror.js', diff --git a/src/Umbraco.Web.UI.Client/src/loader.dev.js b/src/Umbraco.Web.UI.Client/src/loader.dev.js index 87319d751f..ff0fe23ecc 100644 --- a/src/Umbraco.Web.UI.Client/src/loader.dev.js +++ b/src/Umbraco.Web.UI.Client/src/loader.dev.js @@ -10,9 +10,9 @@ LazyLoad.js( 'lib/angular/1.1.5/angular-mobile.js', 'lib/angular/1.1.5/angular-sanitize.min.js', - 'lib/angular/ng-caps-lock.js', + 'lib/ng-caps-lock/ng-caps-lock.min.js', - 'lib/ngCapsLock/angular-ui-sortable.js', + 'lib/angular/angular-ui-sortable.js', 'lib/angular-dynamic-locale/tmhDynamicLocale.min.js', diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js index cec31154d8..b0edc302ab 100644 --- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js +++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js @@ -9,6 +9,8 @@ 'lib/angular/1.1.5/angular-mobile.js', 'lib/angular/1.1.5/angular-sanitize.min.js', + 'lib/ng-caps-lock/ng-caps-lock.min.js', + 'lib/angular/angular-ui-sortable.js', 'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',