libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #3883 from ssilvert/ace-warning

Browse source 
KEYCLOAK-4463: JS warnings caused by ui-ace while manipulating with
This commit is contained in:
Stan Silvert 2017-02-22 07:33:57 -05:00 committed by GitHub
commit 0d7b4bab11
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
themes/src/main/resources/theme/base/admin/resources/js/app.js
View file

@ -2468,6 +2468,10 @@ module.controller('RoleSelectorModalCtrl', function($scope, realm, config, confi
module.controller('ProviderConfigCtrl', function ($modal, $scope, ComponentUtils) { module.controller('ProviderConfigCtrl', function ($modal, $scope, ComponentUtils) {
$scope.fileNames = {}; $scope.fileNames = {};
// KEYCLOAK-4463
$scope.initEditor = function(editor){
editor.$blockScrolling = Infinity; // suppress warning message
};
$scope.openRoleSelector = function (configName, config) { $scope.openRoleSelector = function (configName, config) {
$modal.open({ $modal.open({

1
themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
View file

@ -1551,6 +1551,7 @@ module.controller('ResourceServerPolicyJSDetailCtrl', function($scope, $route, $
onInit : function() { onInit : function() {
$scope.initEditor = function(editor){ $scope.initEditor = function(editor){
editor.$blockScrolling = Infinity;
var session = editor.getSession(); var session = editor.getSession();
session.setMode('ace/mode/javascript'); session.setMode('ace/mode/javascript');

2
themes/src/main/resources/theme/base/admin/resources/templates/kc-component-config.html
View file

@ -46,7 +46,7 @@
</div> </div>
<div class="col-md-6" data-ng-if="option.type == 'Script'"> <div class="col-md-6" data-ng-if="option.type == 'Script'">
<div ng-model="config[option.name]" placeholder="Enter your script..." ui-ace="{ useWrapMode: true, showGutter: true, theme:'github', mode: 'javascript'}"> <div ng-model="config[option.name]" placeholder="Enter your script..." ui-ace="{ onLoad : initEditor, useWrapMode: true, showGutter: true, theme:'github', mode: 'javascript'}">
{{config[option.name]}} {{config[option.name]}}
</div> </div>
</div> </div>

2
themes/src/main/resources/theme/base/admin/resources/templates/kc-provider-config.html
View file

@ -33,7 +33,7 @@
</div> </div>
<div class="col-md-6" data-ng-show="option.type == 'Script'"> <div class="col-md-6" data-ng-show="option.type == 'Script'">
<div ng-model="config[option.name]" placeholder="Enter your script..." ui-ace="{ useWrapMode: true, showGutter: true, theme:'github', mode: 'javascript'}"> <div ng-model="config[option.name]" placeholder="Enter your script..." ui-ace="{ onLoad : initEditor, useWrapMode: true, showGutter: true, theme:'github', mode: 'javascript'}">
{{config[option.name]}} {{config[option.name]}}
</div> </div>
</div> </div>