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

trim check aql, clear in&outputs

This commit is contained in:
Heiko Kernbach 2013-07-18 16:11:27 +02:00
parent 58b7a2ddf3
commit 6e2fd2989a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
html/admin/js/templates/queryView.ejs
View File

@ -7,7 +7,7 @@
<div id="queryDiv" class="form-actions"> <div id="queryDiv" class="form-actions">
<div id="outputLabel">Result</div> <div id="outputLabel">Result</div>
<div id="outputToolbar"> <div id="outputToolbar">
<i class="icon-trash queryTooltips" title="Clear" id="clearOutput"></i> <i class="icon-ban-circle queryTooltips" title="Clear" id="clearOutput"></i>
<i class="icon-plus queryTooltips" title="Unfold" id="bigOutput"></i> <i class="icon-plus queryTooltips" title="Unfold" id="bigOutput"></i>
<i class="icon-minus queryTooltips" title="Fold" id="smallOutput"></i> <i class="icon-minus queryTooltips" title="Fold" id="smallOutput"></i>
</div> </div>
@ -19,6 +19,7 @@
<select id="querySelect"/> <select id="querySelect"/>
<i class="icon-list-alt queryTooltips" title="Edit custom queries" id="editAQL"/> <i class="icon-list-alt queryTooltips" title="Edit custom queries" id="editAQL"/>
<i class="icon-star queryTooltips" title="Save current query" id="addAQL"/> <i class="icon-star queryTooltips" title="Save current query" id="addAQL"/>
<i class="icon-ban-circle queryTooltips" title="Clear" id="clearInput"></i>
<i class="icon-comment queryTooltips" title="Comment" id="commentText"/> <i class="icon-comment queryTooltips" title="Comment" id="commentText"/>
<i class="icon-arrow-right queryTooltips" title="Redo" id="redoText"/> <i class="icon-arrow-right queryTooltips" title="Redo" id="redoText"/>
<i class="icon-arrow-left queryTooltips" title="Undo" id="undoText"/> <i class="icon-arrow-left queryTooltips" title="Undo" id="undoText"/>

11
html/admin/js/views/queryView.js
View File

@ -20,6 +20,7 @@ var queryView = Backbone.View.extend({
'click #smallOutput' : 'smallOutput', 'click #smallOutput' : 'smallOutput',
'click #bigOutput' : 'bigOutput', 'click #bigOutput' : 'bigOutput',
'click #clearOutput' : 'clearOutput', 'click #clearOutput' : 'clearOutput',
'click #clearInput' : 'clearInput',
'click #addAQL' : 'addAQL', 'click #addAQL' : 'addAQL',
'click #editAQL' : 'editAQL', 'click #editAQL' : 'editAQL',
'click #save-new-query' : 'saveAQL', 'click #save-new-query' : 'saveAQL',
@ -42,6 +43,11 @@ var queryView = Backbone.View.extend({
editor2.setValue(''); editor2.setValue('');
}, },
clearInput: function() {
var editor = ace.edit("aqlEditor");
editor.setValue('');
},
smallOutput: function() { smallOutput: function() {
var editor2 = ace.edit("queryOutput"); var editor2 = ace.edit("queryOutput");
editor2.getSession().foldAll(); editor2.getSession().foldAll();
@ -186,6 +192,11 @@ var queryView = Backbone.View.extend({
} }
} }
if (queryName.trim() === '') {
arangoHelper.arangoNotification("Illegal query name");
return;
}
//check for already existing entry //check for already existing entry
var tempArray = []; var tempArray = [];
var quit = false; var quit = false;