sweetalert-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 29099706ea483f328ad89906fac7364d09b576d5
-  data.tar.gz: 06964be4dc925c33d905ad55fedc0513570dc60e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjAyNTkyZDI4MDNiYmI5NzcyMDVhYjBhNzJjNzVkYmFkMWQxNzU5MA==
+  data.tar.gz: !binary |-
+    YmUyZWQ5YmIyYjljOTk0OWMyMDAxZTEyOWZkNTU2ZDE0Mjk1M2JiMw==
 SHA512:
-  metadata.gz: 3cf2ca6f2f03560e287cc3ac4b089935e66f7565e7a2d86f0a64c274ec9747f7ddbaf42ef2024275e8ab336d102e13425989b947236f8794da70bf82821f1b79
-  data.tar.gz: c94b3d12fdc866823566a6f4fb11637b7f97850036b23bfe68463164cf5398f1ad11782af9a4b2d6f08b8db813e5255a575108e7c30416f3a42354668a4ae3e1
+  metadata.gz: !binary |-
+    NDNiMTRjNGU2YTlmOTBmZTdiNjFlMzdhNWMzZmExNmUyNzgxZGZiOWY2MmI1
+    MDUwNjFkYWZkMTNhM2RiZmJiNjg0M2FlMWQ3MmQ1NTFkYWMxMTEwZmRiZTM0
+    ZmM5NjUwNzY1Zjk1YzdhYzYyM2I4MTRmYjlkZTQ1MmJhNWMxNjQ=
+  data.tar.gz: !binary |-
+    MTc1ZTIxMDdjNjM5NDdiOGNmOWQwNmYxYmMxOWE0YzAzN2FkM2IxZmUxZTVj
+    YzM5MjY2MGE0NWRhMjBhYzRkZjI3NjUwN2E4YjI1YWY2NzE2NjU5ZTE1ZGFi
+    ZjUzZTZlZDZiMGNjYTliYTkxZTcyYzc0NTA3MjI0ZDgwOWI3NjA=

data/lib/sweetalert-rails/version.rb

@@ -1,3 +1,3 @@
 module SweetAlert
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/vendor/assets/javascripts/sweet-alert.js

@@ -5,7 +5,22 @@
 
   var modalClass   = '.sweet-alert',
       overlayClass = '.sweet-overlay',
-      alertTypes   = ['error', 'warning', 'info', 'success'];
+      alertTypes   = ['error', 'warning', 'info', 'success'],
+      defaultParams = {
+        title: '',
+        text: '',
+        type: null,
+        allowOutsideClick: false,
+        showCancelButton: false,
+        closeOnConfirm: true,
+        closeOnCancel: true,
+        confirmButtonText: 'OK',
+        confirmButtonColor: '#AEDEF4',
+        cancelButtonText: 'Cancel',
+        imageUrl: null,
+        imageSize: null,
+        timer: null
+      };
 
 
   /*
@@ -86,19 +101,21 @@
       return ('-' + parseInt(height / 2 + padding) + 'px');
     },
     fadeIn = function(elem, interval) {
-      interval = interval || 16;
-      elem.style.opacity = 0;
-      elem.style.display = 'block';
-      var last = +new Date();
-      var tick = function() {
-        elem.style.opacity = +elem.style.opacity + (new Date() - last) / 100;
-        last = +new Date();
-
-        if (+elem.style.opacity < 1) {
-          setTimeout(tick, interval);
-        }
-      };
-      tick();
+      if(+elem.style.opacity < 1) {
+        interval = interval || 16;
+        elem.style.opacity = 0;
+        elem.style.display = 'block';
+        var last = +new Date();
+        var tick = function() {
+          elem.style.opacity = +elem.style.opacity + (new Date() - last) / 100;
+          last = +new Date();
+
+          if (+elem.style.opacity < 1) {
+            setTimeout(tick, interval);
+          }
+        };
+        tick();
+      }
     },
     fadeOut = function(elem, interval) {
       interval = interval || 16;
@@ -131,11 +148,11 @@
         // Fallback
         var evt = document.createEvent('MouseEvents');
         evt.initEvent('click', false, false);
-        node.dispatchEvent(evt);  
+        node.dispatchEvent(evt);
       } else if( document.createEventObject ) {
-        node.fireEvent('onclick') ;  
+        node.fireEvent('onclick') ;
       } else if (typeof node.onclick === 'function' ) {
-        node.onclick();  
+        node.onclick();
       }
     },
     stopEventPropagation = function(e) {
@@ -158,7 +175,7 @@
    * Add modal + overlay to DOM
    */
 
-  function initialize() {
+  window.sweetAlertInitialize = function() {
     var sweetHTML = '<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <div class="icon custom"></div> <h2>Title</h2><p>Text</p><button class="cancel" tabIndex="2">Cancel</button><button class="confirm" tabIndex="1">OK</button></div>',
         sweetWrap = document.createElement('div');
 
@@ -169,41 +186,25 @@
 
     // For development use only!
     /*jQuery.ajax({
-        url: '../lib/sweet-alert.html', // Change path depending on file location
-        dataType: 'html'
-      })
-      .done(function(html) {
-        jQuery('body').append(html);
-      });*/
+      url: '../lib/sweet-alert.html', // Change path depending on file location
+      dataType: 'html'
+    })
+    .done(function(html) {
+      jQuery('body').append(html);
+    });*/
   }
 
-
-
   /*
    * Global sweetAlert function
    */
 
   window.sweetAlert = window.swal = function() {
-
-    // Default parameters
-    var params = {
-      title: '',
-      text: '',
-      type: null,
-      allowOutsideClick: false,
-      showCancelButton: false,
-      confirmButtonText: 'OK',
-      confirmButtonColor: '#AEDEF4',
-      cancelButtonText: 'Cancel',
-      imageUrl: null,
-      imageSize: null
-    };
-
     if (arguments[0] === undefined) {
       window.console.error('sweetAlert expects at least 1 attribute!');
       return false;
     }
 
+    var params = extend({}, defaultParams);
 
     switch (typeof arguments[0]) {
 
@@ -221,19 +222,21 @@
         }
 
         params.title              = arguments[0].title;
-        params.text               = arguments[0].text || params.text;
-        params.type               = arguments[0].type || params.type;
-        params.allowOutsideClick  = arguments[0].allowOutsideClick || params.allowOutsideClick;
-        params.showCancelButton   = arguments[0].showCancelButton || params.showCancelButton;
+        params.text               = arguments[0].text || defaultParams.text;
+        params.type               = arguments[0].type || defaultParams.type;
+        params.allowOutsideClick  = arguments[0].allowOutsideClick || defaultParams.allowOutsideClick;
+        params.showCancelButton   = arguments[0].showCancelButton !== undefined ? arguments[0].showCancelButton : defaultParams.showCancelButton;
+        params.closeOnConfirm     = arguments[0].closeOnConfirm !== undefined ? arguments[0].closeOnConfirm : defaultParams.closeOnConfirm;
+        params.closeOnCancel      = arguments[0].closeOnCancel !== undefined ? arguments[0].closeOnCancel : defaultParams.closeOnCancel;
+        params.timer              = arguments[0].timer || defaultParams.timer;
 
         // Show "Confirm" instead of "OK" if cancel button is visible
-        params.confirmButtonText  = (params.showCancelButton) ? 'Confirm' : params.confirmButtonText;
-
-        params.confirmButtonText  = arguments[0].confirmButtonText || params.confirmButtonText;
-        params.confirmButtonColor = arguments[0].confirmButtonColor || params.confirmButtonColor;
-        params.cancelButtonText   = arguments[0].cancelButtonText || params.cancelButtonText;
-        params.imageUrl           = arguments[0].imageUrl || params.imageUrl;
-        params.imageSize          = arguments[0].imageSize || params.imageSize;
+        params.confirmButtonText  = (defaultParams.showCancelButton) ? 'Confirm' : defaultParams.confirmButtonText;
+        params.confirmButtonText  = arguments[0].confirmButtonText || defaultParams.confirmButtonText;
+        params.confirmButtonColor = arguments[0].confirmButtonColor || defaultParams.confirmButtonColor;
+        params.cancelButtonText   = arguments[0].cancelButtonText || defaultParams.cancelButtonText;
+        params.imageUrl           = arguments[0].imageUrl || defaultParams.imageUrl;
+        params.imageSize          = arguments[0].imageSize || defaultParams.imageSize;
         params.doneFunction       = arguments[1] || null;
 
         break;
@@ -244,8 +247,6 @@
 
     }
 
-    //console.log(params.confirmButtonColor);
-
     setParameters(params);
     fixVerticalPosition();
     openModal();
@@ -294,10 +295,30 @@
           }
           break;
         case ("click"):
-          if (targetedConfirm && doneFunctionExists && modalIsVisible) {
-            params.doneFunction();
+          if (targetedConfirm && doneFunctionExists && modalIsVisible) { // Clicked "confirm"
+
+            params.doneFunction(true);
+
+            if (params.closeOnConfirm) {
+              closeModal();
+            }
+          } else if (doneFunctionExists && modalIsVisible) { // Clicked "cancel"
+
+            // Check if callback function expects a parameter (to track cancel actions)
+            var functionAsStr          = String(params.doneFunction).replace(/\s/g, '');
+            var functionHandlesCancel  = functionAsStr.substring(0, 9) === "function(" && functionAsStr.substring(9, 10) !== ")";
+
+            if (functionHandlesCancel) {
+              params.doneFunction(false);
+            }
+
+            if (params.closeOnCancel) {
+              closeModal();
+            }
+          } else {
+            closeModal();
           }
-          closeModal();
+
           break;
       }
     };
@@ -435,11 +456,25 @@
         if (lastFocusedButton !== undefined) {
           lastFocusedButton.focus();
           lastFocusedButton = undefined;
-        }        
+        }
       }, 0);
     };
   };
 
+  /**
+   * Set default params for each popup
+   * @param {Object} userParams
+   */
+  window.swal.setDefaults = function(userParams) {
+    if (!userParams) {
+      throw new Error('userParams is required');
+    }
+    if (typeof userParams !== 'object') {
+      throw new Error('userParams has to be a object');
+    }
+
+    extend(defaultParams, userParams);
+  };
 
   /*
    * Set type, text and actions on modal
@@ -556,13 +591,16 @@
     // Done-function
     var hasDoneFunction = (params.doneFunction) ? true : false;
     modal.setAttribute('data-has-done-function', hasDoneFunction);
+
+    // Close timer
+    modal.setAttribute('data-timer', params.timer);
   }
 
 
   /*
    * Set hover, active and focus-states for buttons (source: http://www.sitepoint.com/javascript-generate-lighter-darker-color)
    */
-   
+
   function colorLuminance(hex, lum) {
     // Validate hex string
     hex = String(hex).replace(/[^0-9a-f]/gi, '');
@@ -582,6 +620,16 @@
     return rgb;
   }
 
+  function extend(a, b){
+    for (var key in b) {
+      if (b.hasOwnProperty(key)) {
+        a[key] = b[key];
+      }
+    }
+
+    return a;
+  }
+
   function hexToRgb(hex) {
     var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
     return result ? parseInt(result[1], 16) + ', ' + parseInt(result[2], 16) + ', ' + parseInt(result[3], 16) : null;
@@ -613,6 +661,13 @@
     setTimeout(function() {
       addClass(modal, 'visible');
     }, 500);
+
+    var timer = modal.getAttribute('data-timer');
+    if (timer !== "null") {
+      setTimeout(function() {
+        closeModal();
+      }, timer);
+    }
   }
 
   function closeModal() {
@@ -668,19 +723,19 @@
    */
 
   (function () {
-	  if (document.readyState === "complete" || document.readyState === "interactive") {
-		  initialize();
+	  if (document.readyState === "complete" || document.readyState === "interactive" && document.body) {
+		  sweetAlertInitialize();
 	  } else {
 		  if (document.addEventListener) {
 			  document.addEventListener('DOMContentLoaded', function factorial() {
 				  document.removeEventListener('DOMContentLoaded', arguments.callee, false);
-				  initialize();
+				  sweetAlertInitialize();
 			  }, false);
 		  } else if (document.attachEvent) {
 			  document.attachEvent('onreadystatechange', function() {
 				  if (document.readyState === 'complete') {
 					  document.detachEvent('onreadystatechange', arguments.callee);
-					  initialize();
+					  sweetAlertInitialize();
 				  }
 			  });
 		  }

data/vendor/assets/stylesheets/sweet-alert.css

@@ -72,6 +72,8 @@
         background-color: #b6b6b6; }
       .sweet-alert button.cancel:focus {
         box-shadow: rgba(197, 205, 211, 0.8) 0px 0px 2px, rgba(0, 0, 0, 0.0470588) 0px 0px 0px 1px inset !important; }
+    .sweet-alert button::-moz-focus-inner {
+      border: 0; }
   .sweet-alert[data-has-cancel-button=false] button {
     box-shadow: none !important; }
   .sweet-alert .icon {
@@ -153,6 +155,7 @@
         width: 60px;
         height: 120px;
         background: white;
+        -webkit-transform: rotate(45deg);
         transform: rotate(45deg); }
       .sweet-alert .icon.success::before {
         border-radius: 120px 0 0 120px;

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sweetalert-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rustam Sharshenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 description: This gem provides SweerAlert for your Rails application.
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -52,12 +52,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []