Merge branch 'devel' of github.com:arangodb/arangodb into devel

CHANGELOG

@@ -3,6 +3,10 @@ devel
 
 * fixed issue #2450
 
+* fixed issue #2448
+
+* fixed issue #2442
+
 * added 'x-content-type-options: nosniff' to avoid MSIE bug
 
 * set default value for `--ssl.protocol` from TLSv1 to TLSv1.2.

js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js

@@ -608,13 +608,14 @@
         this.waitForInit(this.documents.bind(this), colid, pageid);
         return;
       }
-      if (!this.documentsView) {
-        this.documentsView = new window.DocumentsView({
-          collection: new window.ArangoDocuments(),
-          documentStore: this.arangoDocumentStore,
-          collectionsStore: this.arangoCollectionsStore
-        });
+      if (this.documentsView) {
+        this.documentsView.removeView();
       }
+      this.documentsView = new window.DocumentsView({
+        collection: new window.ArangoDocuments(),
+        documentStore: this.arangoDocumentStore,
+        collectionsStore: this.arangoCollectionsStore
+      });
       this.documentsView.setCollectionId(colid, pageid);
       this.documentsView.render();
     },

js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js

@@ -30,6 +30,14 @@
       next: null
     },
 
+    removeView: function () {
+      this.$el.empty().off(); /* off to unbind the events */
+      this.stopListening();
+      this.unbind();
+      delete this.el;
+      return this;
+    },
+
     editButtons: ['#deleteSelected', '#moveSelected'],
 
     initialize: function (options) {