External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-16 00:17:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-564 fixed a bug with CodeMirror editor and post dialog removal/cleanup.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-02-18 10:30:44 -05:00
parent 9b8dcfb9dd
commit 633a9f6d61
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/controllers/Inventories.js
View File

@@ -238,7 +238,7 @@ function InventoriesAdd($scope, $rootScope, $compile, $location, $log, $routePar
generator.reset(); generator.reset();
LoadBreadCrumbs(); LoadBreadCrumbs();
$scope.inventoryParseType = 'yaml'; $scope.inventoryParseType = 'yaml';
ParseTypeChange({ scope: $scope, variable: 'inventory_variables', parse_variable: 'inventoryParseType', ParseTypeChange({ scope: $scope, variable: 'inventory_variables', parse_variable: 'inventoryParseType',
field_id: 'inventory_inventory_variables' }); field_id: 'inventory_inventory_variables' });

1
awx/ui/static/js/helpers/Parse.js
View File

@@ -32,6 +32,7 @@ angular.module('ParseHelper', ['Utilities', 'AngularCodeMirrorModule'])
//hide the textarea and show a fresh CodeMirror with the current mode (json or yaml) //hide the textarea and show a fresh CodeMirror with the current mode (json or yaml)
codeMirror = AngularCodeMirror(); codeMirror = AngularCodeMirror();
codeMirror.addModes($AnsibleConfig.variable_edit_modes); codeMirror.addModes($AnsibleConfig.variable_edit_modes);
console.log('here');
codeMirror.showTextArea({ scope: scope, model: fld, element: field_id, mode: scope[pfld], onReady: onReady, onChange: onChange }); codeMirror.showTextArea({ scope: scope, model: fld, element: field_id, mode: scope[pfld], onReady: onReady, onChange: onChange });
} }

4
awx/ui/static/lib/ansible/Utilities.js
View File

@@ -19,6 +19,10 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
.factory('ClearScope', [ .factory('ClearScope', [
function () { function () {
return function () { return function () {
$('#form-modal .modal-body').empty();
$('#form-modal2 .modal-body').empty();
$('.tooltip').each(function () { $('.tooltip').each(function () {
$(this).remove(); $(this).remove();
}); });