guardsjs-rails 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b33cce3f56194a6419e692170971eb0448bce21
-  data.tar.gz: ccf8b58789a570d35d4a1596cd34b501170c9be8
+  metadata.gz: dc2348983238ae6b8ea63aed9f0a0fb57ffe6c69
+  data.tar.gz: 2c7fc38a40a9f2bda81572b05184ad13b2e3954d
 SHA512:
-  metadata.gz: fde636ab4a6ad69fbd9572b82a65077da58394f990c20f47c0b0b1443b36d3481e7241ccea05668850f0214414dd5b74b808692c64cf968fabec56ec31cc54a3
-  data.tar.gz: 08d9197bd98ed7bf24ede0ffab1af03ec4f14716e203ba630b061c3a58ca10e0932cc73cff4cc1be85c66c9848d8b7f5a78655ca5d5a386e6bd6dd73a102a913
+  metadata.gz: 42f99bc0262db77bc545fe39d57c065d18c510702ee2d092b6365554d44b9335c811a22902eef8f88ba4371c71248af0315ac3be9985b7693b78e687cd682cd6
+  data.tar.gz: 3a34db039739705c71b727bd2a40eef5bc2c120bd28279512abde936769afd6e2f571af8ec7b6ed414492831e4864de1acb676b53e573f3703846b927c357f45

data/app/assets/javascripts/guards.js

@@ -1,5 +1,5 @@
 /*!
- * Guards JavaScript jQuery Plugin v1.4.1
+ * Guards JavaScript jQuery Plugin v1.4.2
  * https://github.com/on-site/guards.js
  *
  * Copyright 2010-2014, On-Site.com, http://www.on-site.com/
@@ -8,7 +8,7 @@
  * Includes code for email and phone number validation from the jQuery
  * Validation plugin.  http://docs.jquery.com/Plugins/Validation
  *
- * Date: Wed Nov 12 21:12:25 2014 -0800
+ * Date: Fri Nov 14 01:44:15 2014 -0800
  */
 
 /**
@@ -48,7 +48,7 @@
         return $.guards.add(selector);
     };
 
-    $.guard.version = "1.4.1";
+    $.guard.version = "1.4.2";
 
     $.Guards = function() {
         var self = this;
@@ -745,7 +745,7 @@
      *   This version of guards.js library as a string, like <code>"1.0.0"</code>.
      * </p>
      */
-    $.Guards.prototype.version = "1.4.1";
+    $.Guards.prototype.version = "1.4.2";
 
     $.Guards.prototype.parentContext = function(element) {
         var $element = $(element);
@@ -2619,7 +2619,9 @@
         }
 
         if (!result) {
-            this.triggerError($elements);
+            var check = new NotUsedExternally();
+            this.triggerError($elements, check);
+            result = !!check.defaultPrevented;
         }
 
         return result;
@@ -2688,19 +2690,26 @@
      */
     $.Guard.prototype.triggerError = function() {
         var elements;
+        var check = null;
 
         if (arguments.length === 0) {
             elements = this._selector;
+        } else if (arguments.length === 1 && arguments[0].constructor === NotUsedExternally) {
+            elements = this._selector;
+            check = arguments[0];
         } else if (arguments.length === 1) {
             elements = arguments[0];
+        } else if (arguments.length === 2 && arguments[1].constructor === NotUsedExternally) {
+            elements = arguments[0];
+            check = arguments[1];
         } else {
             throw new Error("Expected 0 or 1 argument to triggerError, got " + arguments.length);
         }
 
         if (this.isGrouped()) {
-            $(elements).addSingleError(this);
+            $(elements).addSingleError(this, check || new NotUsedExternally());
         } else {
-            $(elements).addError(this);
+            $(elements).addError(this, check || new NotUsedExternally());
         }
 
         return this;
@@ -2787,6 +2796,14 @@
         }
     };
 
+    /**
+     * Simple object that can be type checked so it is guaranteed to
+     * not be used externally, and can pass information back to
+     * callers.
+     */
+    function NotUsedExternally() {
+    }
+
     /**
      * Find any applicable fields for this selected item.  Applicable
      * fields are any inputs, textareas or selects.
@@ -2867,6 +2884,10 @@
         var guardFormErrorPrevented = guard.sendEvent("guardFormError", this, true).isDefaultPrevented();
 
         if (guardErrorPrevented || guardFormErrorPrevented) {
+            if (arguments.length === 2 && arguments[1].constructor === NotUsedExternally) {
+                arguments[1].defaultPrevented = true;
+            }
+
             return this;
         }
 
@@ -2897,6 +2918,7 @@
      * target.
      */
     $.fn.addError = function(guard) {
+        var check = arguments[1] || new NotUsedExternally();
         var radiosAdded = {};
 
         return this.each(function() {
@@ -2912,9 +2934,9 @@
                 radiosAdded[name] = true;
                 var context = guard._guards.parentContext($this);
                 var radios = $("input[name='" + name + "']:radio", context);
-                radios.addSingleError(guard);
+                radios.addSingleError(guard, check);
             } else {
-                $this.addSingleError(guard);
+                $this.addSingleError(guard, check);
             }
         });
     };

data/lib/guardsjs-rails/version.rb

@@ -1,5 +1,5 @@
 module GuardsJS
   module Rails
-    VERSION = "1.4.1"
+    VERSION = "1.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guardsjs-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties