Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Guido Schwab 2014-02-21 11:14:28 +01:00
parent 2aa3f49bb1 35c00ce592
commit 07d3ec2cde
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/apps/system/aardvark/frontend/js/views/collectionsView.js
View File

@ -188,7 +188,6 @@
}, },
resetSearch: function () { resetSearch: function () {
console.log("resetSearch");
if (this.searchTimeout) { if (this.searchTimeout) {
clearTimeout(this.searchTimeout); clearTimeout(this.searchTimeout);
this.searchTimeout = null; this.searchTimeout = null;
@ -200,7 +199,6 @@
restrictToSearchPhraseKey: function (e) { restrictToSearchPhraseKey: function (e) {
this.currentSearchString = this.currentSearchString =
console.log("restrictToSearchPhraseKey");
// key pressed in search box // key pressed in search box
var self = this; var self = this;

2
js/common/modules/org/arangodb/statistics.js
View File

@ -43,6 +43,8 @@ var internal = require("internal");
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
exports.historian = function (param) { exports.historian = function (param) {
"use strict";
try { try {
var result = {}; var result = {};