diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-07 19:57:23 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-07 19:57:23 +0000 |
| commit | 3848856a5704da1846860acedabbefa5739fdba2 (patch) | |
| tree | eebd60691cb3842838b9752ebaf9f5693fe5ba2e | |
| parent | 3f1bc3370ba5245742fd0546b33b43ef631aa325 (diff) | |
| parent | ba98f5809ccc01506d52d5b5a83d591c6697a8c3 (diff) | |
| download | gitlab-ce-3848856a5704da1846860acedabbefa5739fdba2.tar.gz | |
Merge branch 'fix-droplab-rendering' into 'master'
Fix droplab rendering template when data-dynamic selector is unavailable
Closes gitlab-ee#1655
See merge request !9012
| -rw-r--r-- | app/assets/javascripts/droplab/droplab_ajax.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/droplab/droplab_ajax.js b/app/assets/javascripts/droplab/droplab_ajax.js index c290e1a8355..5cdf11c6a2c 100644 --- a/app/assets/javascripts/droplab/droplab_ajax.js +++ b/app/assets/javascripts/droplab/droplab_ajax.js @@ -78,8 +78,8 @@ require('../window')(function(w){ }, destroy: function() { - if (this.listTemplate) { - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); + var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); + if (this.listTemplate && dynamicList) { dynamicList.outerHTML = this.listTemplate; } } |