From ba5d75affff955fb29026a3a93020a3f220577fd Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 13 Nov 2013 23:48:02 +0100 Subject: [PATCH] show/hide database selector based on number of databases --- js/apps/system/aardvark/frontend/js/routers/router.js | 4 ++++ .../system/aardvark/frontend/js/views/databaseView.js | 9 +-------- .../system/aardvark/frontend/js/views/navigationView.js | 4 ++++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/apps/system/aardvark/frontend/js/routers/router.js b/js/apps/system/aardvark/frontend/js/routers/router.js index 80e6412571..85bf18f33e 100644 --- a/js/apps/system/aardvark/frontend/js/routers/router.js +++ b/js/apps/system/aardvark/frontend/js/routers/router.js @@ -355,6 +355,10 @@ $(document).ready(function() { this.naviView.selectMenuItem('applications-menu'); }, + handleSelectDatabase: function () { + this.naviView.handleSelectDatabase(); + }, + handleResize: function () { var oldWidth = $('#content').width(); var containerWidth = $(window).width() - 70; diff --git a/js/apps/system/aardvark/frontend/js/views/databaseView.js b/js/apps/system/aardvark/frontend/js/views/databaseView.js index 6530857fad..e235668eb8 100644 --- a/js/apps/system/aardvark/frontend/js/views/databaseView.js +++ b/js/apps/system/aardvark/frontend/js/views/databaseView.js @@ -157,14 +157,7 @@ window.databaseView = Backbone.View.extend({ this.collection.fetch({ success: function() { self.render(); - var select = $("#dbSelectionList"); - select.empty(); - self.collection.toJSON().forEach(function(item) { - select.append($("") - .attr("value", item.name) - .text(item.name) - .attr("selected", item.name === this.currentDB)); - }); + window.App.handleSelectDatabase(); } }); } diff --git a/js/apps/system/aardvark/frontend/js/views/navigationView.js b/js/apps/system/aardvark/frontend/js/views/navigationView.js index 1e932ad4c5..2624a24b91 100644 --- a/js/apps/system/aardvark/frontend/js/views/navigationView.js +++ b/js/apps/system/aardvark/frontend/js/views/navigationView.js @@ -25,6 +25,10 @@ var navigationView = Backbone.View.extend({ $('.nav-collapse').css('margin-right', margin - 10); }, + handleSelectDatabase: function () { + this.dbSelectionView.render($("#selectDB")); + }, + handleSelectNavigation: function () { $("#arangoCollectionSelect").change(function() { var navigateTo = $(this).find("option:selected").val();