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/arangodb/arangodb into devel

This commit is contained in:
Kaveh Vahedipour 2016-10-27 15:18:23 +02:00
parent 5c38455fbd e5abaffa6d
commit 32049dd2c5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js
View File

@ -454,7 +454,9 @@
}, },
arangoError: function (title, content, info) { arangoError: function (title, content, info) {
if (!$('#offlinePlaceholder').is(':visible')) {
window.App.notificationList.add({title: title, content: content, info: info, type: 'error'}); window.App.notificationList.add({title: title, content: content, info: info, type: 'error'});
}
}, },
arangoWarning: function (title, content, info) { arangoWarning: function (title, content, info) {

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/nodesView.js
View File

@ -108,8 +108,6 @@
if ($('#content').is(':empty')) { if ($('#content').is(':empty')) {
arangoHelper.renderEmpty('Please wait. Requesting cluster information...', 'fa fa-spin fa-circle-o-notch'); arangoHelper.renderEmpty('Please wait. Requesting cluster information...', 'fa fa-spin fa-circle-o-notch');
} else {
console.log('not empty');
} }
if (navi !== false) { if (navi !== false) {