autonumeric-rails 1.9.27 → 1.9.33

data/lib/autonumeric/rails/version.rb

@@ -1,5 +1,5 @@
 module Autonumeric
   module Rails
-    VERSION = '1.9.27'
+    VERSION = '1.9.33'
   end
 end

data/spec/autonumeric-rails_spec.rb

@@ -6,8 +6,10 @@ describe 'Autonumeric-rails', type: :feature, js: true do
 
   let(:params) { {aSign: 'USD ', mDec: 1}.to_json }
 
-  before { visit "/#{url}#{record_id}" }
-  before { wait_for_jquery }
+  before {
+    visit "/#{url}#{record_id}"
+    wait_for_jquery
+  }
 
   context 'Through form helper' do
     let(:url) { 'static_fields' }

data/spec/dummy/app/views/forms/javascript_fields.html.erb

@@ -5,12 +5,7 @@
 
 <script>
     jQuery(function() {
-        var new_field;
-        new_field = $('<input>').attr('id', 'record_field1').attr('name', 'record[field1]');
-        new_field.attr('data-autonumeric', 'true').data('autonumeric', 'true');
-        <% if @record.field1 %>
-        new_field.val('<%= @record.field1.to_s %>');
-        <% end %>
+        var new_field = '<input id="record_field1" name="record[field1]" data-autonumeric="true" value="<%= @record.field1.to_s %>">';
         $('form').prepend(new_field);
 
         $(document).trigger('refresh_autonumeric');

data/spec/spec_helper.rb

@@ -21,6 +21,10 @@ require 'headless'
 Capybara.ignore_hidden_elements = false
 
 RSpec.configure do |config|
+  # Focus
+  config.run_all_when_everything_filtered = true
+  config.filter_run focus: true
+
   # Use fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 

data/vendor/assets/javascripts/{autoNumeric-1.9.27.js → autoNumeric-1.9.33.js}

@@ -2,7 +2,7 @@
  * autoNumeric.js
  * @author: Bob Knothe
  * @author: Sokolov Yura
- * @version: 1.9.27 - 2014-12-07 GMT 5:30 PM
+ * @version: 1.9.33 - 2015-02-15 GMT 11:00 PM
  *
  * Created by Robert J. Knothe on 2010-10-25. Please report any bugs to https://github.com/BobKnothe/autoNumeric
  * Created by Sokolov Yura on 2010-11-07
@@ -36,7 +36,7 @@
   "use strict";
   /*jslint browser: true*/
   /*global jQuery: false*/
-  /* Cross browser routine for getting selected range/cursor position
+  /*Cross browser routine for getting selected range/cursor position
    */
   function getElementSelection(that) {
     var position = {};
@@ -104,7 +104,6 @@
    */
   function autoCode($this, settings) {
     runCallbacks($this, settings);
-    settings.oEvent = null;
     settings.tagList = ['b', 'caption', 'cite', 'code', 'dd', 'del', 'div', 'dfn', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ins', 'kdb', 'label', 'li', 'output', 'p', 'q', 's', 'sample', 'span', 'strong', 'td', 'th', 'u', 'var'];
     var vmax = settings.vMax.toString().split('.'),
         vmin = (!settings.vMin && settings.vMin !== 0) ? [] : settings.vMin.toString().split('.');
@@ -185,36 +184,17 @@
   /**
    * places or removes brackets on negative values
    */
-  function negativeBracket(s, nBracket, oEvent) { /** oEvent = settings.oEvent */
-  nBracket = nBracket.split(',');
-    if (oEvent === 'set' || oEvent === 'focusout') {
+  function negativeBracket(s, nBracket, hasFocus) {
+    nBracket = nBracket.split(',');
+    if (hasFocus === false  && s.charAt(0) === '-') {
       s = s.replace('-', '');
       s = nBracket[0] + s + nBracket[1];
-    } else if ((oEvent === 'get' || oEvent === 'focusin' || oEvent === 'pageLoad') && s.charAt(0) === nBracket[0]) {
+    } else if (hasFocus === true && s.charAt(0) === nBracket[0]) {
       s = s.replace(nBracket[0], '-');
       s = s.replace(nBracket[1], '');
     }
     return s;
   }
-  /**
-   * truncate decimal part of a number
-   */
-  function truncateDecimal(s, aDec, mDec) {
-    if (aDec && mDec) {
-      var parts = s.split(aDec);
-      /** truncate decimal part to satisfying length
-       * cause we would round it anyway */
-      if (parts[1] && parts[1].length > mDec) {
-        if (mDec > 0) {
-          parts[1] = parts[1].substring(0, mDec);
-          s = parts.join(aDec);
-        } else {
-          s = parts[0];
-        }
-      }
-    }
-    return s;
-  }
   /**
    * prepare number string to be converted to real number
    */
@@ -273,21 +253,6 @@
     }
     return s;
   }
-  /**
-   * checking that number satisfy format conditions
-   * and lays between settings.vMin and settings.vMax
-   * and the string length does not exceed the digits in settings.vMin and settings.vMax
-   */
-  function autoCheck(s, settings) {
-    s = autoStrip(s, settings);
-    s = truncateDecimal(s, settings.aDec, settings.mDec);
-    s = fixNumber(s, settings.aDec, settings.aNeg);
-    var value = +s;
-    if (settings.oEvent === 'set' && (value < settings.vMin || value > settings.vMax)) {
-      $.error("The value (" + value + ") from the 'set' method falls outside of the vMin / vMax range");
-    }
-    return value >= settings.vMin && value <= settings.vMax;
-  }
   /**
    * private function to check for empty value
    */
@@ -324,17 +289,17 @@
     var ivSplit = iv.split(settings.aDec);
     if (settings.altDec && ivSplit.length === 1) {
       ivSplit = iv.split(settings.altDec);
-    } /** assigns the whole number to the a varibale (s) */
+    } /** assigns the whole number to the a variable (s) */
     var s = ivSplit[0];
     if (settings.aSep) {
-      while (digitalGroup.test(s)) { /** re-inserts the thousand sepparator via a regualer expression */
+      while (digitalGroup.test(s)) { /** re-inserts the thousand separator via a regular expression */
       s = s.replace(digitalGroup, '$1' + settings.aSep + '$2');
       }
     }
     if (settings.mDec !== 0 && ivSplit.length > 1) {
       if (ivSplit[1].length > settings.mDec) {
         ivSplit[1] = ivSplit[1].substring(0, settings.mDec);
-      } /** joins the whole number with the deciaml value */
+      } /** joins the whole number with the decimal value */
       iv = s + settings.aDec + ivSplit[1];
     } else { /** if whole numbers only */
     iv = s;
@@ -347,8 +312,9 @@
         iv = settings.aNeg + iv;
       }
     }
-    if (settings.oEvent === 'set' && testNeg < 0 && settings.nBracket !== null) { /** removes the negative sign and places brackets */
-    iv = negativeBracket(iv, settings.nBracket, settings.oEvent);
+    if (settings.setEvent && testNeg < 0 && settings.nBracket !== null) { /** removes the negative sign and places brackets */
+    iv = negativeBracket(iv, settings.nBracket, settings.hasFocus);
+      settings.setEvent = false;
     }
     return iv;
   }
@@ -389,9 +355,11 @@
     if ((+iv > 0 && settings.lZero !== 'keep') || (iv.length > 0 && settings.lZero === 'allow')) { /** trims leading zero's if needed */
     iv = iv.replace(/^0*(\d)/, '$1');
     }
-    var dPos = iv.lastIndexOf('.'), /** virtual decimal position */
-    vdPos = (dPos === -1) ? iv.length - 1 : dPos, /** checks decimal places to determine if rounding is required */
-    cDec = (iv.length - 1) - vdPos; /** check if no rounding is required */
+    var dPos = iv.lastIndexOf('.'),
+        /** virtual decimal position */
+        vdPos = (dPos === -1) ? iv.length - 1 : dPos,
+        /** checks decimal places to determine if rounding is required */
+        cDec = (iv.length - 1) - vdPos; /** check if no rounding is required */
     if (cDec <= settings.mDec) {
       ivRounded = iv; /** check if we need to pad with zeros */
       if (cDec < rDec) {
@@ -469,6 +437,40 @@
     ivRounded = truncateZeros(ivArray.join('')); /** return rounded value */
     return (+ivRounded === 0) ? ivRounded : nSign + ivRounded;
   }
+  /**
+   * truncate decimal part of a number
+   */
+  function truncateDecimal(s, settings, paste) {
+    var aDec = settings.aDec,
+        mDec = settings.mDec;
+    s = (paste === 'paste') ? autoRound(s, settings) : s;
+    if (aDec && mDec) {
+      var parts = s.split(aDec);
+      /** truncate decimal part to satisfying length
+       * cause we would round it anyway */
+      if (parts[1] && parts[1].length > mDec) {
+        if (mDec > 0) {
+          parts[1] = parts[1].substring(0, mDec);
+          s = parts.join(aDec);
+        } else {
+          s = parts[0];
+        }
+      }
+    }
+    return s;
+  }
+  /**
+   * checking that number satisfy format conditions
+   * and lays between settings.vMin and settings.vMax
+   * and the string length does not exceed the digits in settings.vMin and settings.vMax
+   */
+  function autoCheck(s, settings) {
+    s = autoStrip(s, settings);
+    s = truncateDecimal(s, settings);
+    s = fixNumber(s, settings.aDec, settings.aNeg);
+    var value = +s;
+    return value >= settings.vMin && value <= settings.vMax;
+  }
   /**
    * Holder object for field properties
    */
@@ -552,13 +554,13 @@
     /**
      * set part of number to value keeping position of cursor
      */
-    setValueParts: function (left, right) {
+    setValueParts: function (left, right, paste) {
       var settingsClone = this.settingsClone,
           parts = this.normalizeParts(left, right),
           new_value = parts.join(''),
           position = parts[0].length;
       if (autoCheck(new_value, settingsClone)) {
-        new_value = truncateDecimal(new_value, settingsClone.aDec, settingsClone.mDec);
+        new_value = truncateDecimal(new_value, settingsClone, paste);
         if (position > new_value.length) {
           position = new_value.length;
         }
@@ -615,7 +617,7 @@
             oldParts = this.valuePartsBeforePaste;
         delete this.valuePartsBeforePaste; /** try to strip pasted value first */
         parts[0] = parts[0].substr(0, oldParts[0].length) + autoStrip(parts[0].substr(oldParts[0].length), this.settingsClone);
-        if (!this.setValueParts(parts[0], parts[1])) {
+        if (!this.setValueParts(parts[0], parts[1], 'paste')) {
           this.value = oldParts.join('');
           this.setPosition(oldParts[0].length, false);
         }
@@ -829,7 +831,6 @@
     }
     return $(obj);
   }
-
   function getHolder($that, settings, update) {
     var data = $that.data('autoNumeric');
     if (!data) {
@@ -847,10 +848,11 @@
     init: function (options) {
       return this.each(function () {
         var $this = $(this),
-            settings = $this.data('autoNumeric'), /** attempt to grab 'autoNumeric' settings, if they don't exist returns "undefined". */
+            settings = $this.data('autoNumeric'),
+            /** attempt to grab 'autoNumeric' settings, if they don't exist returns "undefined". */
             tagData = $this.data(); /** attempt to grab HTML5 data, if they don't exist we'll get "undefined".*/
         if (typeof settings !== 'object') { /** If we couldn't grab settings, create them from defaults and passed options. */
-        settings = $.extend({}, $.fn.autoNumeric.defaults, tagData, options); /** Merge defaults, tagData and options */
+        settings = $.extend({}, $.fn.autoNumeric.defaults, tagData, options, {setEvent: false, hasFocus: false}); /** Merge defaults, tagData and options */
           if (settings.aDec === settings.aSep) {
             $.error("autoNumeric will not function properly when the decimal character aDec: '" + settings.aDec + "' and thousand separator aSep: '" + settings.aSep + "' are the same character");
             return this;
@@ -865,7 +867,7 @@
           $.error("The <" + $this.prop('tagName').toLowerCase() + "> is not supported by autoNumeric()");
           return this;
         }
-        if (settings.runOnce === false && settings.aForm) {/** routine to format default value on page load */
+        if (settings.runOnce === false && settings.aForm) { /** routine to format default value on page load */
           if ($this.is('input[type=text], input[type=hidden], input[type=tel], input:not([type])')) {
             var setValue = true;
             if ($this[0].value === '' && settings.wEmpty === 'empty') {
@@ -876,7 +878,7 @@
               $this[0].value = settings.aSign;
               setValue = false;
             }
-            if (setValue && $this[0].value.indexOf(settings.aSep) === -1) {
+            if (setValue && $this[0].value === $this.prop('defaultValue')) {
               $this.autoNumeric('set', $this.val());
             }
           }
@@ -902,7 +904,6 @@
                             holder.inVal = $this.val();
                         }*/
           holder.init(e);
-          holder.settings.oEvent = 'keydown';
           if (holder.skipAllways(e)) {
             holder.processed = true;
             return true;
@@ -920,7 +921,6 @@
             var holder = getHolder($this),
                 processed = holder.processed;
             holder.init(e);
-            holder.settings.oEvent = 'keypress';
             if (holder.skipAllways(e)) {
               return true;
             }
@@ -938,7 +938,6 @@
           $this.on('keyup.autoNumeric', function (e) {
             var holder = getHolder($this);
             holder.init(e);
-            holder.settings.oEvent = 'keyup';
             var skip = holder.skipAllways(e);
             holder.kdCode = 0;
             delete holder.valuePartsBeforePaste;
@@ -961,10 +960,10 @@
           });
           $this.on('focusin.autoNumeric', function () {
             var holder = getHolder($this);
-            holder.settingsClone.oEvent = 'focusin';
+            holder.settingsClone.hasFocus = true;
             if (holder.settingsClone.nBracket !== null) {
               var checkVal = $this.val();
-              $this.val(negativeBracket(checkVal, holder.settingsClone.nBracket, holder.settingsClone.oEvent));
+              $this.val(negativeBracket(checkVal, holder.settingsClone.nBracket, holder.settingsClone.hasFocus));
             }
             holder.inVal = $this.val();
             var onempty = checkEmpty(holder.inVal, holder.settingsClone, true);
@@ -982,7 +981,7 @@
                 settingsClone = holder.settingsClone,
                 value = $this.val(),
                 origValue = value;
-            holder.settingsClone.oEvent = 'focusout';
+            holder.settingsClone.hasFocus = false;
             var strip_zero = ''; /** added to control leading zero */
             if (settingsClone.lZero === 'allow') { /** added to control leading zero */
             settingsClone.allowLeading = false;
@@ -1002,16 +1001,13 @@
             if (groupedValue === null) {
               groupedValue = autoGroup(value, settingsClone);
             }
-            if (groupedValue !== origValue) {
-              $this.val(groupedValue);
-            }
-            if (groupedValue !== holder.inVal) {
+            if (groupedValue !== holder.inVal || groupedValue !== origValue) {
               $this.change();
+              $this.val(groupedValue);
               delete holder.inVal;
             }
             if (settingsClone.nBracket !== null && $this.autoNumeric('get') < 0) {
-              holder.settingsClone.oEvent = 'focusout';
-              $this.val(negativeBracket($this.val(), settingsClone.nBracket, settingsClone.oEvent));
+              $this.val(negativeBracket($this.val(), settingsClone.nBracket, settingsClone.hasFocus));
             }
           });
         }
@@ -1064,7 +1060,7 @@
         }
         /** routine to handle page re-load from back button */
         if (testValue !== $this.attr('value') && $this.prop('tagName').toLowerCase() === 'input' && settings.runOnce === false) {
-          value = (settings.nBracket !== null) ? negativeBracket($this.val(), settings.nBracket, 'pageLoad') : value;
+          value = (settings.nBracket !== null) ? negativeBracket($this.val(), settings.nBracket, settings.hasFocus) : value;
           value = autoStrip(value, settings);
         }
         /** allows locale decimal separator to be a comma */
@@ -1076,7 +1072,7 @@
           return '';
         }
         value = checkValue(value, settings);
-        settings.oEvent = 'set';
+        settings.setEvent = true;
         value.toString();
         if (value !== '') {
           value = autoRound(value, settings);
@@ -1104,7 +1100,7 @@
         $.error("You must initialize autoNumeric('init', {options}) prior to calling the 'get' method");
         return this;
       }
-      settings.oEvent = 'get';
+      settings.setEvent = false;
       var getValue = '';
       /** determine the element type then use .eq(0) selector to grab the value of the first element in selector */
       if ($this.is('input[type=text], input[type=hidden], input[type=tel], input:not([type])')) { /**added hidden type */
@@ -1119,7 +1115,7 @@
         return '';
       }
       if (settings.nBracket !== null && getValue !== '') {
-        getValue = negativeBracket(getValue, settings.nBracket, settings.oEvent);
+        getValue = negativeBracket(getValue, settings.nBracket, true);
       }
       if (settings.runOnce || settings.aForm === false) {
         getValue = autoStrip(getValue, settings);
@@ -1141,11 +1137,20 @@
           str = $this.serialize(),
           parts = str.split('&'),
           formIndex = $('form').index($this),
+          inputIndex = [],
           i = 0;
       for (i; i < parts.length; i += 1) {
         var miniParts = parts[i].split('='),
             $field = $('form:eq(' + formIndex + ') input[name="' + decodeURIComponent(miniParts[0]) + '"]'),
             settings = $field.data('autoNumeric');
+        if ($field.length > 1) {
+          if (inputIndex[decodeURIComponent(miniParts[0])] === undefined) {
+            inputIndex[decodeURIComponent(miniParts[0])] = 0;
+          } else {
+            inputIndex[decodeURIComponent(miniParts[0])]++;
+          }
+          $field = $field.eq(inputIndex[decodeURIComponent(miniParts[0])]);
+        }
         if (typeof settings === 'object') {
           if (miniParts[1] !== null) {
             miniParts[1] = $field.autoNumeric('get');
@@ -1164,11 +1169,20 @@
       var isAutoNumeric = false,
           $this = autoGet($(this)),
           formFields = $this.serializeArray(),
-          formIndex = $('form').index($this);
+          formIndex = $('form').index($this),
+          inputIndex = [];
       /*jslint unparam: true*/
       $.each(formFields, function (i, field) {
         var $field = $('form:eq(' + formIndex + ') input[name="' + decodeURIComponent(field.name) + '"]'),
             settings = $field.data('autoNumeric');
+        if ($field.length > 1) {
+          if (inputIndex[decodeURIComponent(field.name)] === undefined) {
+            inputIndex[decodeURIComponent(field.name)] = 0;
+          } else {
+            inputIndex[decodeURIComponent(field.name)]++;
+          }
+          $field = $field.eq(inputIndex[decodeURIComponent(field.name)]);
+        }
         if (typeof settings === 'object') {
           if (field.value !== '') {
             field.value = $field.autoNumeric('get').toString();
@@ -1197,8 +1211,7 @@
     }
     $.error('Method "' + method + '" is not supported by autoNumeric()');
   };
-
-  /* Make defaults public */
+  /** Make defaults public */
   $.fn.autoNumeric.defaults = {
     /** allowed numeric values
      * please do not modify
@@ -1295,7 +1308,6 @@
      */
     aForm: true,
     /** future use */
-    onSomeEvent: function () { }
+    onSomeEvent: function () {}
   };
-
-}(jQuery));
+}(jQuery));

data/vendor/assets/javascripts/autonumeric.js

@@ -1,2 +1,2 @@
-//= require autoNumeric-1.9.27.js
+//= require autoNumeric-1.9.33.js
 //= require autonumeric_ujs.js

data/vendor/assets/javascripts/autonumeric_ujs.js

@@ -1,7 +1,7 @@
 /**
  * autonumeric_ujs.js
  * @author: randoum
- * @version: 1.9.27 - 2014-12-22
+ * @version: 1.9.33 - 2015-03-04
  *
  * Created by Randoum on 2013-08-15. Please report any bugs to https://github.com/randoum/autonumeric-rails
  *

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autonumeric-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.27
+  version: 1.9.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -254,7 +254,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
 - spec/support/wait_for_jquery.rb
-- vendor/assets/javascripts/autoNumeric-1.9.27.js
+- vendor/assets/javascripts/autoNumeric-1.9.33.js
 - vendor/assets/javascripts/autonumeric.js
 - vendor/assets/javascripts/autonumeric_ujs.js
 homepage: https://github.com/randoum/autonumeric-rails