Merge branch 'filtered-search-hidden-dont-render' into 'master'

Only render the list if it is visible

See merge request !8710

1 files changed, 11 insertions, 3 deletions

diff --git a/app/assets/javascripts/droplab/droplab_ajax.js b/app/assets/javascripts/droplab/droplab_ajax.js
index f20610b3811..f7fed0987a2 100644
--- a/app/assets/javascripts/droplab/droplab_ajax.js
+++ b/app/assets/javascripts/droplab/droplab_ajax.js
@@ -29,6 +29,7 @@ require('../window')(function(w){
     init: function init(hook) {
       var self = this;
       var config = hook.config.droplabAjax;
+      this.hook = hook;
 
       if (!config || !config.endpoint || !config.method) {
         return;
@@ -52,19 +53,26 @@ require('../window')(function(w){
       this._loadUrlData(config.endpoint)
         .then(function(d) {
           if (config.loadingTemplate) {
-            var dataLoadingTemplate = hook.list.list.querySelector('[data-loading-template]');
+            var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]');
 
             if (dataLoadingTemplate) {
               dataLoadingTemplate.outerHTML = self.listTemplate;
             }
           }
-          hook.list[config.method].call(hook.list, d);
+
+          if (!self.hook.list.hidden) {
+            self.hook.list[config.method].call(self.hook.list, d);
+          }
         }).catch(function(e) {
           throw new droplabAjaxException(e.message || e);
         });
     },
 
     destroy: function() {
+      if (this.listTemplate) {
+        var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');
+        dynamicList.outerHTML = this.listTemplate;
+      }
     }
   };
 });
@@ -76,4 +84,4 @@ module.exports = function(callback) {
 };
 
 },{}]},{},[1])(1)
-});
\ No newline at end of file
+});