Merge Disable caret positioning on resetPattern #30

firstopinion · 56be36bf0ddb487b947ea10299091c2a9b5694e5 · jaridmargolin committed Mar 3, 2014 · Mar 3, 2014 · 56be36b
2 parents 04c64dd + c42d4a5
commit 56be36bf0ddb487b947ea10299091c2a9b5694e5
Unified Split

Showing with 38 additions and 30 deletions.

+4 −9 Makefile

+1 −0 lib/formatter.js

+1 −1 lib/formatter.min.js

+1 −0 lib/jquery.formatter.js

+1 −1 lib/jquery.formatter.min.js

+9 −9 package.json

+11 −10 src/formatter.js

+10 −0 test/formatter.js
diff --git a/Makefile b/Makefile
@@ -1,11 +1,6 @@
-MOCHA_OPTS= --check-leaks
-REPORTER = spec
-
 test:
-	@NODE_ENV=test ./node_modules/.bin/mocha \
-		--reporter $(REPORTER) \
-		$(MOCHA_OPTS) && \
-	grunt uglify concat && \
-	grunt jshint
+	@NODE_ENV=test grunt uglify concat && \
+	grunt jshint && \
+	./node_modules/.bin/mocha --reporter spec --check-leaks
 
-.PHONY: test
+.PHONY: test
diff --git a/lib/formatter.js b/lib/formatter.js
@@ -105,6 +105,7 @@ Formatter.addInptType = function (chr, reg) {
 //
 Formatter.prototype.resetPattern = function (str) {
   // Update opts to hold new pattern
+  str = str || this.opts.pattern;
   this.opts.pattern = str;
 
   // Get current state
diff --git a/lib/formatter.min.js b/lib/formatter.min.js
diff --git a/lib/jquery.formatter.js b/lib/jquery.formatter.js
@@ -101,6 +101,7 @@ Formatter.addInptType = function (chr, reg) {
 //
 Formatter.prototype.resetPattern = function (str) {
   // Update opts to hold new pattern
+  str = str || this.opts.pattern;
   this.opts.pattern = str;
 
   // Get current state