maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2896 from lukasolson/issues/2887

Browse source 
Update angular-ui-ace
This commit is contained in:
Spencer 2015-02-05 15:27:17 -07:00
parent 61b576e0bb ee4b51e273
commit daf83c1ba9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -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",

4
src/kibana/plugins/settings/sections/objects/_view.js
View file

@ -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);