Destroy multiImageSelectors before instantiating new ones

projectblacklight · Feb 7, 2017 · 5ba65b5 · 5ba65b5
1 parent 98d17ec
commit 5ba65b5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/app/assets/javascripts/spotlight/multi_image_selector.js b/app/assets/javascripts/spotlight/multi_image_selector.js
@@ -13,6 +13,8 @@
 
     function init(el) {
       panel = el;
+
+      destroyExistingImageSelector();
       if(image_versions && image_versions.length > 1) {
         addChangeLink();
         addThumbsList();
@@ -27,6 +29,12 @@
       addChangeLinkBehavior();
     }
 
+    function destroyExistingImageSelector() {
+      var pagination = $('[data-panel-image-pagination]', panel);
+      pagination.html('');
+      pagination.next('.' + thumbsListContainer.attr('class')).remove();
+    }
+
     function indexOf(thumb){
       if( (index = imageIds.indexOf(thumb)) > -1 ){
         return index + 1;

diff --git a/app/assets/javascripts/spotlight/search_typeahead.js b/app/assets/javascripts/spotlight/search_typeahead.js
@@ -82,6 +82,7 @@ function addImageSelector(input, panel, manifestUrl) {
 
       if(thumbs.length == 1) {
         cropper.setIiifFields(thumbs[0]);
+        panel.multiImageSelector(); // Clears out existing selector
       } else {
         panel.show();
         panel.multiImageSelector(thumbs, function(selectorImage) {

diff --git a/spec/features/autocomplete_typeahead_spec.rb b/spec/features/autocomplete_typeahead_spec.rb
@@ -51,6 +51,19 @@
 
         expect(page).to have_css('[data-panel-image-pagination]', text: /Image 2 of 2/, visible: true)
       end
+
+      it 'removes the multi-image selector when a non multi-image item is selected' do
+        visit spotlight.edit_exhibit_appearance_path(exhibit)
+        click_link 'Exhibit masthead'
+
+        fill_in_typeahead_field(with: 'xd327cm9378', type: 'featured-image')
+
+        expect(page).to have_css('[data-panel-image-pagination]', text: /Image 1 of 2/, visible: true)
+
+        fill_in_typeahead_field(with: 'gk446cj2442', type: 'featured-image')
+
+        expect(page).not_to have_css('[data-panel-image-pagination]', text: /Image 1 of 2/)
+      end
     end
 
     context 'for items that do not include a IIIF manifest' do