sweet-alert-confirm 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea4f5c077671637ba0c4834240d4a6bbb692939a
-  data.tar.gz: eecc5b36bf90b5eb522339722c4f04c15b2e7505
+SHA256:
+  metadata.gz: f2768fd6fa7aaa91e3b6f301689f4836fad4852d0e0976f61c0b90b67c81feec
+  data.tar.gz: 6421d1d9299f17209b3e8f18850cee1e88918ceea862b39a6f2e1b9a5907e559
 SHA512:
-  metadata.gz: f276753badf6959713cc8737e45c462411ec8685417339644e16923d0c3096ab57750279e66f8a9243a92d7f06d9995f3059a8b3f2fda0093f03c68c3b6eee2f
-  data.tar.gz: af003c3f71308c49a7f1a4e78033e54bd9dea6be5b79fbb6112ab4d1304e6c0202bb2b3ce6689afae2801bd14e5ca582c09866aa0293137e6c69dc0588213dbd
+  metadata.gz: d274d6c92c6a78c0a79e2c835d2b3ed79334f6bfeeee7738a84fe8e3f87ee5f8d7c9f5b78caacb5d34e7c4f9ddde7ab20c5d7882a39205f5126ed17574a19389
+  data.tar.gz: bf0db9f18ae12ca21cc56a996eb15716a6e2d7d388208b14d0eed08688294e18efbeba2b9be4159315ac5bdc3daf72721bfc3d5e2175213a9c33b2e108b09285

data/.travis.yml

@@ -11,7 +11,7 @@ env:
  
 rvm:
  - 1.9.3
- - 2.0.0
+ - 2.2.1
  - jruby-19mode
 
 

data/Gemfile

@@ -27,11 +27,16 @@ rails = case rails_version
 gem "rails", rails
 gem "turbolinks"
 
+source 'https://rails-assets.org' do
+    gem 'rails-assets-sweetalert'
+end
+
 group :development, :test do
   gem "jquery-rails"
+  gem "test-unit"
   gem 'sass-rails'
   gem "sweet-alert"
   gem "capybara"
-  gem "poltergeist", git: 'https://github.com/teampoltergeist/poltergeist.git'
+  gem "poltergeist"
   gem "rake"
 end

data/README.md

@@ -19,31 +19,19 @@ Rails >= 3.1
 
 ## Usage
 
-Using ```gem 'rails-assets-sweetalert'```
-
-application.js:
-
-```javascript
-//= require sweetalert
-//= require sweet-alert-confirm
+Add it to your Gemfile:
+```ruby
+gem 'sweet-alert'
+gem 'sweet-alert-confirm'
 ```
-application.css:
 
-```css
-/*
- *= require sweetalert
- */
-```
-
-Using ```gem 'sweet-alert'```
-
-application.js:
+Add the following to application.js:
 
 ```javascript
 //= require sweet-alert
 //= require sweet-alert-confirm
 ```
-application.css:
+Add the following to application.css:
 
 ```css
 /*
@@ -57,7 +45,7 @@ application.css:
 You can pass options in `data:`
 ```Ruby
  data: {
-  confirm: 'Are you ready?'
+  :'sweet-alert-confirm: 'Are you ready?'
   :'confirm-button-text' => 'Im ready',
   :'cancel-button-text' => 'No way',
   :'confirm-button-color' => '#66CD00',
@@ -81,6 +69,12 @@ var sweetAlertConfirmConfig = {
 };
 ```
 
+### Before Callback
+
+A callback that will be runned before alert is shown. Returning `false` will display the alert and `true` will _not_ display it.
+
+`data-saBeforeFunction='myFunction'`
+
 ## Contribute
 
 Fork the repo & pull request you fix/feature

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

@@ -28,27 +28,16 @@ var sweetAlertConfirmConfig = sweetAlertConfirmConfig || {}; // Add default conf
                           'confirmButtonText',
                           'cancelButtonText',
                           'closeOnConfirm',
+                          'html',
                           'imageUrl',
                           'allowOutsideClick',
+                          'customClass',
                           'remote',
                           'method',
                           'function'
-                        ]
-
-      $.each($linkToVerify.data(), function(key, val){
-        if ($.inArray(key, optionKeys) >= 0) {
-          swalOptions[key] = val
-          if (key == 'sweetAlertType') {
-            swalOptions['type'] = val;
-          }
-
-        }
-      })
-
-      var nameFunction = swalOptions['function'];
-      message = $linkToVerify.attr('data-sweet-alert-confirm')
-      swalOptions['title'] = message
-      swal(swalOptions, function(r){
+                        ];
+      
+      function afterAlertCallback(r){
         if (nameFunction) {
           window[nameFunction]();
         }
@@ -79,18 +68,46 @@ var sweetAlertConfirmConfig = sweetAlertConfirmConfig || {}; // Add default conf
             else {
               window.location.href = $linkToVerify.attr('href');
             }
-
+      
           }
         }
+      }
+      
+      var beforeFunction = null;
+      
+      $.each($linkToVerify.data(), function(key, val){
+        if ($.inArray(key, optionKeys) >= 0) {
+          swalOptions[key] = val
+          if (key == 'sweetAlertType') {
+            swalOptions['type'] = val;
+          }
+        }
+        // Make a before callback to verify that swal should be shown
+        if(key == 'sabeforefunction') {
+          beforeFunction = val;
+        }
       });
+      
+      // Skip alert if false
+      if(beforeFunction != null) {
+        var beforeRes = window[beforeFunction]($linkToVerify);
+        if(beforeRes === true) {
+          return afterAlertCallback(true); // Skip alert
+        }
+      }
+      
+      var nameFunction = swalOptions['function'];
+      message = $linkToVerify.attr('data-sweet-alert-confirm')
+      swalOptions['title'] = message
+      swal(swalOptions, afterAlertCallback);
 
       return false;
   }
-  $(document).on('ready page:load ajaxComplete', function() {
+  $(document).on('ready turbolinks:load turbo:load page:update ajaxComplete', function() {
     $('[data-sweet-alert-confirm]').on('click', sweetAlertConfirm)
   });
 
-  $(document).on('ready page:load', function() {
+  $(document).on('ready turbolinks:load turbo:load page:load', function() {
     //To avoid "Uncaught TypeError: Cannot read property 'querySelector' of null" on turbolinks
     if (typeof window.sweetAlertInitialize === 'function') {
       window.sweetAlertInitialize();

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

@@ -1,3 +1,3 @@
 module SweetAlertConfirm
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -12,6 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require sweet-alert
+//= require sweetalert
 //= require sweet-alert-confirm
 // require_tree .

data/spec/dummy/app/assets/javascripts/application_turbolinks.js

@@ -13,6 +13,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
-//= require sweet-alert
+//= require sweetalert
 //= require sweet-alert-confirm
 // require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -10,7 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require sweet-alert
+ *= require sweetalert
  *= require_tree .
  *= require_self
  */

data/spec/dummy/app/assets/stylesheets/application.scss.css

@@ -10,7 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require sweet-alert.css
+ *= require sweetalert.css
  *=* require_tree .
  *=* require_self
  */

data/spec/dummy-rails3/app/assets/javascripts/application.js

@@ -12,5 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require sweet-alert
+//= require sweetalert
 //= require sweet-alert-confirm

data/spec/dummy-rails3/app/assets/javascripts/application_turbolinks.js

@@ -13,6 +13,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
-//= require sweet-alert
+//= require sweetalert
 //= require sweet-alert-confirm
 // require_tree .

data/spec/dummy-rails3/app/assets/stylesheets/application.css

@@ -10,7 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require sweet-alert
+ *= require sweetalert
  *= require_tree .
  *= require_self
  */

data/spec/dummy-rails3/app/assets/stylesheets/application.scss.css

@@ -10,7 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require sweet-alert.css
+ *= require sweetalert.css
  *=* require_tree .
  *=* require_self
  */

data/spec/features/sweet_alert_confirm_spec.rb

@@ -87,7 +87,7 @@ describe 'basic confirms', js: true, type: :feature do
       sleep 1
       expect(page).to have_css('.confirm', text: 'Im ready')
       expect(page).to have_css('.cancel', text: 'No way')
-      expect(page).to have_css('.icon.info')
+      expect(page).to have_css('.sa-info', visible: true)
       expect(page).to have_css('h2', text: 'Are you ready?')
       expect(page).to have_css('p', text: 'This is a subtitle')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweet-alert-confirm
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Moises Viloria
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -217,7 +217,7 @@ homepage: http://www.github.com/mois3x/sweet-alert-rails-confirm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -232,10 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A Rails confirm replacement with SweetAlert
 test_files: []
-has_rdoc: