Merge pull request #2896 from lukasolson/issues/2887

Update angular-ui-ace
elastic · Feb 5, 2015 · daf83c1 · daf83c1
2 parents 61b576e + ee4b51e
commit daf83c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -26,7 +26,7 @@
     "angular-elastic": "~2.3.3",
     "angular-mocks": "~1.2.14",
     "angular-route": "~1.2.14",
-    "angular-ui-ace": "bower",
+    "angular-ui-ace": "~0.2.3",
     "angular-ui-select": "~0.9.3",
     "async": "~0.2.10",
     "bluebird": "~2.1.3",

diff --git a/src/kibana/plugins/settings/sections/objects/_view.js b/src/kibana/plugins/settings/sections/objects/_view.js
@@ -45,7 +45,7 @@ define(function (require) {
 
           if (_.isString(field.value)) {
             try {
-              field.value = angular.toJson(JSON.parse(field.value), null, '  ');
+              field.value = angular.toJson(JSON.parse(field.value), true);
               field.type = 'json';
             } catch (err) {
               field.value = field.value;
@@ -54,7 +54,7 @@ define(function (require) {
             field.type = 'number';
           } else if (_.isArray(field.value)) {
             field.type = 'array';
-            field.value = angular.toJson(field.value, null, ' ');
+            field.value = angular.toJson(field.value, true);
           } else if (_.isPlainObject(field.value)) {
             // do something recursive
             return _.reduce(field.value, _.partialRight(createField, parents), memo);