add numberHelper function to maintain $.fn.fmatter.integer parameters.

openpsa · Dec 31, 2014 · 10b1cd7 · 10b1cd7
1 parent 38aba44
commit 10b1cd7
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/external/jquery.fmatter.js b/external/jquery.fmatter.js
@@ -159,20 +159,23 @@
 		}
 		return $.fn.fmatter.defaultFormat(cellval,opts);
 	};
-	$.fn.fmatter.integer = function (cellval, opts, op, action) {
-		op = (action === undefined) ? op || $.extend({}, opts.integer) : $.extend({}, opts.integer);
+	$.fn.fmatter.numberHelper = function(cellval, opts, op){
+		op = op || $.extend({}, opts.integer);
 		if (opts.colModel !== undefined && opts.colModel.formatoptions !== undefined) {
-		    op = $.extend({}, op, opts.colModel.formatoptions);
+			op = $.extend({}, op, opts.colModel.formatoptions);
 		}
 		return ($.fmatter.isEmpty(cellval)) ? op.defaultValue : $.fmatter.util.NumberFormat(cellval, op);
 	};
+	$.fn.fmatter.integer = function (cellval, opts) {
+		return $.fn.fmatter.numberHelper(cellval, opts);
+	};
 	$.fn.fmatter.number = function (cellval, opts) {
 		var op = $.extend({}, opts.number);
-		return $.fn.fmatter.integer(cellval, opts, op);
+		return $.fn.fmatter.numberHelper(cellval, opts, op);
 	};
 	$.fn.fmatter.currency = function (cellval, opts) {
 		var op = $.extend({}, opts.currency);
-		return $.fn.fmatter.integer(cellval, opts, op);
+		return $.fn.fmatter.numberHelper(cellval, opts, op);
 	};
 	$.fn.fmatter.date = function (cellval, opts, rwd, act) {
 		var op = $.extend({},opts.date);