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

redirect bugfix, optimizations

This commit is contained in:
Heiko Kernbach 2014-02-11 19:32:00 +01:00
parent ef86071517
commit e128c0aca4
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/apps/system/aardvark/frontend/js/views/collectionView.js
View File

@ -26,7 +26,7 @@
return this; return this;
}, },
events: { events: {
"click #save-modified-collection" : "saveModifiedCollection", "click #save-modified-collection" : "saveModifiedCollection(true)",
"hidden #change-collection" : "hidden", "hidden #change-collection" : "hidden",
"click #delete-modified-collection" : "deleteCollection", "click #delete-modified-collection" : "deleteCollection",
"click #load-modified-collection" : "loadCollection", "click #load-modified-collection" : "loadCollection",
@ -38,7 +38,7 @@
}, },
listenKey: function(e) { listenKey: function(e) {
if (e.keyCode === 13) { if (e.keyCode === 13) {
this.saveModifiedCollection(); this.saveModifiedCollection(true);
} }
}, },
hidden: function () { hidden: function () {
@ -99,7 +99,12 @@
$('#change-collection-size').val(calculatedSize); $('#change-collection-size').val(calculatedSize);
$('#change-collection').modal('show'); $('#change-collection').modal('show');
}, },
saveModifiedCollection: function() { saveModifiedCollection: function(run) {
if (run !== true) {
return 0;
}
var newname = $('#change-collection-name').val(); var newname = $('#change-collection-name').val();
if (newname === '') { if (newname === '') {
arangoHelper.arangoError('No collection name entered!'); arangoHelper.arangoError('No collection name entered!');

8
js/apps/system/aardvark/frontend/js/views/documentView.js
View File

@ -314,19 +314,14 @@
this.makeEditable(); this.makeEditable();
$(document).bind('keydown', function(e) { $(document).bind('keydown', function(e) {
if (e.ctrlKey && e.keyCode === 65) { if (e.ctrlKey && e.keyCode === 65 || e.ctrlKey && e.keyCode === 78) {
if ($('#addNewRowEntry')) { if ($('#addNewRowEntry')) {
$('#addNewRowEntry').click(); $('#addNewRowEntry').click();
self.jumpToPageBottom();
} }
} }
}); });
}, },
checkFieldValue: function () {
},
jumpToPageBottom: function () { jumpToPageBottom: function () {
$('html, body').scrollTop($(document).height() - $(window).height()); $('html, body').scrollTop($(document).height() - $(window).height());
}, },
@ -361,6 +356,7 @@
} }
}); });
self.jumpToPageBottom();
arangoHelper.fixTooltips(".icon_arangodb", "left"); arangoHelper.fixTooltips(".icon_arangodb", "left");
}, },