sweet-alert-confirm 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32e9ada7f2a5dde5e4b65cc1b3e2dcfe50f2e528
-  data.tar.gz: eb855c29b0a13b04e434d53f4130c4c7c4b9b2e0
+  metadata.gz: 79d4562caf3b1e3cecbf4c9d92fe3384d416c318
+  data.tar.gz: 049049199569fe95b9594d134b4d6841e2795c89
 SHA512:
-  metadata.gz: 6e46869d170b981debe6426a8e1ea21d2760032e20c2aa4b9e034b14bb80ce890e27aeecbed91e453721188dd499df25aacb236719847771024119c563ffd4ee
-  data.tar.gz: c453374d66b91d4f3f491a8e9112c9557b8a0bbceef0ae6b093792c39144c5a759513967a8872227ffafc08a0df7b580be86afe9ab248eb8dc698b0d624a9e26
+  metadata.gz: 5c65648175a8152da2da0dacf0e08d1386a8926f13e7d2f90398025db361919065cc095f2698990fa51874e8234928f9d2a19ab818a46ccb26c3ef13b6f4cc68
+  data.tar.gz: e6fc7263994d927fdd0b26b7f6f34a9b2face824aa12643f4bab822ba62c64801c7d22d39cc48a06d932ce3db48cb914a2b70eb4d05bb68dd9f65719c4e38e54

data/README.md

@@ -40,7 +40,7 @@ You can pass options in `data:`
 	      :'confirm-button-text' => 'Im ready',
 	      :'cancel-button-text' => 'No way',
 	      :'confirm-button-color' => '#66CD00',
-	      type: 'info',
+	      :'sweet-alert-type' => 'info',
 	      text: 'This is a subtitle',
 	      :'image-url' => '/pic.png'
 
@@ -49,4 +49,11 @@ You can pass options in `data:`
 
 ![Custom confirm](https://cloud.githubusercontent.com/assets/5833678/4653700/14389916-54b0-11e4-9850-14ee970e9345.png)
 
+## Contribute
+
+Fork the repo & pull request you fix/feature
+
+append `RAILS_VERSION=4.1.2` or whichever you target before your `bundle` command ex: `RAILS_VERSION=4.1.2 bundle install`
+
+please add/modify test examples on fix or features
 

data/lib/assets/javascripts/sweet-alert-confirm.js

@@ -16,7 +16,7 @@
       var optionKeys = [
                           'confirm',
                           'text',
-                          'type',
+                          'sweetAlertType',
                           'showCancelButton',
                           'confirmButtonColor',
                           'cancelButtonColor',
@@ -32,6 +32,10 @@
       $.each($linkToVerify.data(), function(key, val){
         if ($.inArray(key, optionKeys) >= 0) {
           swalOptions[key] = val
+          if (key == 'sweetAlertType') {
+            swalOptions['type'] = val;
+          }
+
         }
       })
 
@@ -57,7 +61,16 @@
           if (r === false) {
             return false;
           } else {
-            window.location.href = $linkToVerify.attr('href');
+            if($linkToVerify.is('input')){
+              var name = $linkToVerify.attr('name'),
+              data = name ? {name: name, value:$linkToVerify.val()} : null;
+              $linkToVerify.closest('form').data('ujs:submit-button', data);
+              $linkToVerify.closest('form').submit();
+            }
+            else {
+              window.location.href = $linkToVerify.attr('href');
+            }
+              
           }
         }
       });
@@ -66,9 +79,11 @@
     //});
     //return this;
   }
-  $(document).ready(function(){
-    //$("a[data-sweet-alert-confirm]").sweetAlertConfirm();
-    $('a[data-sweet-alert-confirm]').on('click', sweetAlertConfirm)
+  
+  $(document).on('ready page:change ajaxComplete', function() {
+    $('[data-sweet-alert-confirm]').on('click', sweetAlertConfirm)
+    //To avoid "Uncaught TypeError: Cannot read property 'querySelector' of null" on turbolinks
+    window.sweetAlertInitialize();
   });
 
 })( jQuery );

data/lib/sweet-alert-confirm/version.rb

@@ -1,3 +1,3 @@
 module SweetAlertConfirm
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/sweet-alert-confirm/view_helpers.rb

@@ -2,13 +2,26 @@ module SweetAlertConfirm
   module ViewHelpers
     def link_to(*args, &block)
       html_options = args[block_given? ? 1 : 2] || {}
-      if (html_options[:confirm] || (html_options[:data] && html_options[:data][:confirm]) &&
-                                                           !html_options[:remote])
 
+      if options_has_confirm?(html_options)
         html_options['data-sweet-alert-confirm'] = html_options.delete(:confirm) ||
                     html_options[:data].delete(:confirm)
       end
       super *args, &block
     end
+
+    def submit_tag(value = "Save changes", options = {})
+      options['data-sweet-alert-confirm'] = options.delete(:confirm) || options[:data].delete(:confirm) if options_has_confirm?(options)
+      super value, options
+    end
+
+    protected
+    def options_has_confirm?(options)
+      if (options[:confirm] || (options[:data] && options[:data][:confirm]))
+        true
+      else
+        false
+      end
+    end
   end
 end

data/spec/dummy-rails3/app/views/confirms/index.html.erb

@@ -1,11 +1,15 @@
 <%= link_to 'Basic confirm', get_cow_path, id: 'basic-confirm', data: { text: 'nanana', confirm: 'Are you sure?' } %>
 <%= link_to 'Delete confirm', delete_cow_path,method: :delete, id: 'method-confirm', data: { text: 'nanana', confirm: 'Are you sure?' } %>
-<%= link_to 'Remote confirm', delete_cow_path,method: :delete, id: 'remote-confirm', data: { remote: 'true', text: 'nanana', confirm: 'Are you sure?' } %>
+<%= link_to 'Remote confirm', delete_cow_path,method: :delete, id: 'remote-confirm', data: { remote: 'true', 'sweet-alert-type' => 'info', text: 'nanana', confirm: 'Are you sure?' } %>
 <%= link_to 'Custom confirm', get_cow_path, id: 'custom-confirm', data: { 
                                                                                                      :'confirm-button-text' => 'Im ready', 
                                                                                                      :'cancel-button-text' => 'No way', 
                                                                                                      :'confirm-button-color' => '#66CD00',
-                                                                                                     type: 'info',
+                                                                                                     :'sweet-alert-type' => 'info',
                                                                                                      text: 'This is a subtitle',
                                                                                                      confirm: 'Are you ready?'
                                                                                                     } %>
+
+<%= form_tag(delete_cow_path, method: :delete) do %>
+  <%= submit_tag 'Submit to delete cow', id: 'submit-delete', data: {confirm: 'Are you sure?'} %>
+<% end %>

data/spec/dummy/app/views/confirms/index.html.erb

@@ -1,11 +1,15 @@
 <%= link_to 'Basic confirm', get_cow_path, id: 'basic-confirm', data: { text: 'nanana', confirm: 'Are you sure?' } %>
 <%= link_to 'Delete confirm', delete_cow_path,method: :delete, id: 'method-confirm', data: { text: 'nanana', confirm: 'Are you sure?' } %>
-<%= link_to 'Remote confirm', delete_cow_path,method: :delete, id: 'remote-confirm', data: { remote: 'true', text: 'nanana', confirm: 'Are you sure?' } %>
+<%= link_to 'Remote confirm', delete_cow_path,method: :delete, id: 'remote-confirm', data: { remote: 'true', 'sweet-alert-type' => 'warning', text: 'nanana', confirm: 'Are you sure?' } %>
 <%= link_to 'Custom confirm', get_cow_path, id: 'custom-confirm', data: { 
                                                                                                      :'confirm-button-text' => 'Im ready', 
                                                                                                      :'cancel-button-text' => 'No way', 
                                                                                                      :'confirm-button-color' => '#66CD00',
-                                                                                                     type: 'info',
+                                                                                                     :'sweet-alert-type' => 'info',
                                                                                                      text: 'This is a subtitle',
                                                                                                      confirm: 'Are you ready?'
                                                                                                     } %>
+
+<%= form_tag(delete_cow_path, method: :delete) do %>
+  <%= submit_tag 'Submit to delete cow', id: 'submit-delete', data: {confirm: 'Are you sure?'} %>
+<% end %>

data/spec/features/sweet_alert_confirm_spec.rb

@@ -105,5 +105,33 @@ describe 'basic confirms', js: true, type: :feature do
     end
   end
 
+  describe 'Submit confirm' do
+    before do
+      visit confirms_page_path
+      find("#submit-delete").trigger('click')
+    end
+    it 'show the alert when click the submit', :js => true do
+      sleep 1
+      expect(page).to have_content('Are you sure?')
+      expect(page).not_to have_content('You murdered a silly cow')
+    end
+
+    it 'does not submit the form when click on cancel' do
+      sleep 1
+      expect(page).to_not have_content('You murdered a silly cow')
+      click_button('Cancel')
+      sleep 1
+      expect(page).to_not have_content('You murdered a silly cow')
+    end
+
+    it 'submit the form after accept confirm' do
+      #click_on '.confirm'
+      expect(page).to_not have_content('You murdered a silly cow')
+      sleep 1
+      click_button('Ok')
+      expect(page).to have_content('You murdered a silly cow')
+    end
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweet-alert-confirm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Moises Viloria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails