From 4f78312a98e37ab21be720c9a0511ab5ea1ce466 Mon Sep 17 00:00:00 2001 From: Stan Silvert Date: Tue, 21 Feb 2017 19:31:25 -0500 Subject: [PATCH] KEYCLOAK-4463: JS warnings caused by ui-ace while manipulating with mappers --- .../src/main/resources/theme/base/admin/resources/js/app.js | 4 ++++ .../theme/base/admin/resources/js/authz/authz-controller.js | 3 ++- .../base/admin/resources/templates/kc-component-config.html | 2 +- .../base/admin/resources/templates/kc-provider-config.html | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/themes/src/main/resources/theme/base/admin/resources/js/app.js b/themes/src/main/resources/theme/base/admin/resources/js/app.js index ac88d5ef20..ad0b5e9d5f 100755 --- a/themes/src/main/resources/theme/base/admin/resources/js/app.js +++ b/themes/src/main/resources/theme/base/admin/resources/js/app.js @@ -2468,6 +2468,10 @@ module.controller('RoleSelectorModalCtrl', function($scope, realm, config, confi module.controller('ProviderConfigCtrl', function ($modal, $scope, ComponentUtils) { $scope.fileNames = {}; + // KEYCLOAK-4463 + $scope.initEditor = function(editor){ + editor.$blockScrolling = Infinity; // suppress warning message + }; $scope.openRoleSelector = function (configName, config) { $modal.open({ diff --git a/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js b/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js index f6f7577851..009f24071d 100644 --- a/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js +++ b/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js @@ -1551,8 +1551,9 @@ module.controller('ResourceServerPolicyJSDetailCtrl', function($scope, $route, $ onInit : function() { $scope.initEditor = function(editor){ + editor.$blockScrolling = Infinity; var session = editor.getSession(); - + session.setMode('ace/mode/javascript'); }; }, diff --git a/themes/src/main/resources/theme/base/admin/resources/templates/kc-component-config.html b/themes/src/main/resources/theme/base/admin/resources/templates/kc-component-config.html index b3c84c6eee..c5172c0cc1 100755 --- a/themes/src/main/resources/theme/base/admin/resources/templates/kc-component-config.html +++ b/themes/src/main/resources/theme/base/admin/resources/templates/kc-component-config.html @@ -46,7 +46,7 @@
-
+
{{config[option.name]}}
diff --git a/themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html b/themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html index 131097bfd3..74e97a032a 100755 --- a/themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html +++ b/themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html @@ -33,7 +33,7 @@
-
+
{{config[option.name]}}