1
0
Fork 0

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Michael Hackstein 2016-09-22 16:31:02 +02:00
commit d6a3b818a2
3 changed files with 14 additions and 3 deletions

View File

@ -12,13 +12,12 @@ devel
* `[1] ANY == 1` will return `true`
* `[1, 2] ANY == 1` will return `true`
* `[2, 2] ANY == 1` will return `false`
* `NONE` now always returns `true` when the left-hand operand is an empty array.
The behavior for non-empty arrays does not change:
* `[] NONE == 1` will return `true`
* `[1] NONE == 1` will return `false`
* `[1, 2] ALL == 1` will return `false`
* `[2, 2] ALL == 1` will return `true`
* `[1, 2] NONE == 1` will return `false`
* `[2, 2] NONE == 1` will return `true`
* added experimental AQL functions `JSON_STRINGIFY` and `JSON_PARSE`

View File

@ -49,6 +49,7 @@
},
render: function () {
var self = this;
this.$el.html(this.template.render({}));
// this.initValues()
@ -61,6 +62,12 @@
this.initDone = true;
}
this.initGraphs();
// directly rerender coord, db, data
var callback = function (data) {
self.rerenderValues(data);
};
this.getCoordStatHistory(callback);
},
waitForCoordinators: function () {

View File

@ -63,6 +63,11 @@
// show offline overlay
$('#offlinePlaceholder').show();
// remove error messages
$.noty.clearQueue();
$.noty.closeAll();
this.reconnectAnimation(0);
}
} else {