Merge pull request #14 from igorakaamigo/doing-with-a-modal

A polite jQuery.fn.modal() call added

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - A development chapter improved at README.md
 
 ### Fixed
+- A polite jQuery.fn.modal() call added
 - A yes button click did not work correctly 
 - A close button click did nothing 
 - A repo link fixed at README.md 

lib/maac.coffee

@@ -9,6 +9,10 @@ Rails.delegate document, 'a[data-confirm]', 'confirm', (event) ->
   showAModal(this, 'Yes', 'No', 'Close', 'Confirm')
   false
 
+safeBsModal = (arg) ->
+  if @jQuery and @jQuery.fn.modal
+    @jQuery('.modal').modal(arg)
+
 showAModal = (link, defaultYes, defaultNo, defaultClose, defaultTitle) ->
   modal = document.createElement('div')
   modal.className = 'modal'
@@ -46,6 +50,7 @@ showAModal = (link, defaultYes, defaultNo, defaultClose, defaultTitle) ->
 
   close = ->
     Rails.stopEverything(event)
+    safeBsModal('hide')
     modal.remove()
 
   Rails.delegate modal, '.close,.btn-primary', 'click', close
@@ -56,3 +61,4 @@ showAModal = (link, defaultYes, defaultNo, defaultClose, defaultTitle) ->
     Rails.fire link, 'click'
 
   document.body.appendChild(modal)
+  safeBsModal()

spec/features/maac_features_spec.rb

@@ -102,6 +102,8 @@
           expect(page).to have_css("#{footer_selector} > button.btn.btn-primary[type=button]", count: 1, text: text_for_no)
         end
       end
+
+      it 'should call a $(".modal").modal()'
     end
 
     context 'clicking on a link with a data-confirm attribute and customizations', js: true do
@@ -139,6 +141,8 @@
           expect(page).to have_css("#{footer_selector} > button.btn.btn-primary[type=button]", count: 1, text: text_for_no)
         end
       end
+
+      it 'should call a $(".modal").modal()'
     end
 
     context 'while modal is shown', js: true do
@@ -154,6 +158,8 @@
         it 'should not have a target page text' do
           expect(page).not_to have_text(target_page_text)
         end
+
+        it 'should call a $(".modal").modal("hide")'
       end
 
       context 'after pressing a No button' do
@@ -166,6 +172,8 @@
         it 'should not have a target page text' do
           expect(page).not_to have_text(target_page_text)
         end
+
+        it 'should call a $(".modal").modal("hide")'
       end
 
       context 'after pressing a Yes button' do
@@ -174,6 +182,8 @@
         it 'should have a target page text' do
           expect(page).to have_text(target_page_text)
         end
+
+        it 'should call a $(".modal").modal("hide")'
       end
     end
   end

vendor/assets/javascripts/maac.js

@@ -1,19 +1,25 @@
 
 /*!
-Modal As A Confirm (MAAC) v0.1.0-alpha (2018-01-26T01:07:26+03:00)
+Modal As A Confirm (MAAC) v0.1.0-alpha (2018-01-26T02:02:08+03:00)
 https://github.com/igorakaamigo/maac
 Released under the MIT license:
 https://github.com/igorakaamigo/maac/blob/master/MIT-LICENSE
  */
 
 (function() {
-  var showAModal;
+  var safeBsModal, showAModal;
 
   Rails.delegate(document, 'a[data-confirm]', 'confirm', function(event) {
     showAModal(this, 'Yes', 'No', 'Close', 'Confirm');
     return false;
   });
 
+  safeBsModal = function(arg) {
+    if (this.jQuery && this.jQuery.fn.modal) {
+      return this.jQuery('.modal').modal(arg);
+    }
+  };
+
   showAModal = function(link, defaultYes, defaultNo, defaultClose, defaultTitle) {
     var close, dialogClose, dialogNo, dialogTitle, dialogYes, modal;
     modal = document.createElement('div');
@@ -32,6 +38,7 @@ https://github.com/igorakaamigo/maac/blob/master/MIT-LICENSE
     modal.querySelector('.modal-header > h5').innerText = dialogTitle;
     close = function() {
       Rails.stopEverything(event);
+      safeBsModal('hide');
       return modal.remove();
     };
     Rails.delegate(modal, '.close,.btn-primary', 'click', close);
@@ -40,7 +47,8 @@ https://github.com/igorakaamigo/maac/blob/master/MIT-LICENSE
       link.removeAttribute('data-confirm');
       return Rails.fire(link, 'click');
     });
-    return document.body.appendChild(modal);
+    document.body.appendChild(modal);
+    return safeBsModal();
   };
 
 }).call(this);