Code patch for PR-88 and PR-86

nosir · Aug 28, 2016 · 3963ad1 · 3963ad1
1 parent 0c274f9
commit 3963ad1
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "form",
     "input"
   ],
-  "version": "0.6.14",
+  "version": "0.7.0",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -92,7 +92,7 @@ Cleave.prototype = {
         // external google closure lib
         try {
             pps.phoneFormatter = new Cleave.PhoneFormatter(
-                new window.Cleave.AsYouTypeFormatter(pps.phoneRegionCode),
+                new pps.root.Cleave.AsYouTypeFormatter(pps.phoneRegionCode),
                 pps.delimiter
             );
         } catch (ex) {
@@ -484,6 +484,8 @@ var DefaultProperties = {
         target.blocks = opts.blocks || [];
         target.blocksLength = target.blocks.length;
 
+        target.root = (typeof global === "object" && global) ? global : window;
+
         target.maxLength = 0;
 
         target.backspace = false;

diff --git a/dist/cleave-angular.min.js b/dist/cleave-angular.min.js
diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -177,7 +177,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        // Cleave.AsYouTypeFormatter should be provided by
 	        // external google closure lib
 	        try {
-	            pps.phoneFormatter = new PhoneFormatter(new window.Cleave.AsYouTypeFormatter(pps.phoneRegionCode), pps.delimiter);
+	            pps.phoneFormatter = new PhoneFormatter(new pps.root.Cleave.AsYouTypeFormatter(pps.phoneRegionCode), pps.delimiter);
 	        } catch (ex) {
 	            throw new Error('Please include phone-type-formatter.{country}.js lib');
 	        }
@@ -342,7 +342,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	});
 
-	module.exports = window.Cleave = Cleave;
+	module.exports = Cleave;
 
 /***/ },
 /* 1 */
@@ -854,7 +854,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 8 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/* WEBPACK VAR INJECTION */(function(module) {'use strict';
+	/* WEBPACK VAR INJECTION */(function(global, module) {'use strict';
 
 	/**
 	 * Props Assignment
@@ -912,6 +912,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	        target.blocks = opts.blocks || [];
 	        target.blocksLength = target.blocks.length;
 
+	        target.root = (typeof global === 'undefined' ? 'undefined' : _typeof(global)) === "object" && global ? global : window;
+
 	        target.maxLength = 0;
 
 	        target.backspace = false;
@@ -924,7 +926,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	if (( false ? 'undefined' : _typeof(module)) === 'object' && _typeof(module.exports) === 'object') {
 	    module.exports = exports = DefaultProperties;
 	}
-	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(3)(module)))
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }()), __webpack_require__(3)(module)))
 
 /***/ }
 /******/ ])

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -92,7 +92,7 @@ Cleave.prototype = {
         // external google closure lib
         try {
             pps.phoneFormatter = new Cleave.PhoneFormatter(
-                new window.Cleave.AsYouTypeFormatter(pps.phoneRegionCode),
+                new pps.root.Cleave.AsYouTypeFormatter(pps.phoneRegionCode),
                 pps.delimiter
             );
         } catch (ex) {
@@ -484,6 +484,8 @@ var DefaultProperties = {
         target.blocks = opts.blocks || [];
         target.blocksLength = target.blocks.length;
 
+        target.root = (typeof global === "object" && global) ? global : window;
+
         target.maxLength = 0;
 
         target.backspace = false;

diff --git a/dist/cleave.min.js b/dist/cleave.min.js
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "form",
     "input"
   ],
-  "version": "0.6.14",
+  "version": "0.7.0",
   "author": {
     "name": "Max Huang",
     "url": "http://github.com/nosir",

diff --git a/src/Cleave.js b/src/Cleave.js
@@ -90,7 +90,7 @@ Cleave.prototype = {
         // external google closure lib
         try {
             pps.phoneFormatter = new Cleave.PhoneFormatter(
-                new window.Cleave.AsYouTypeFormatter(pps.phoneRegionCode),
+                new pps.root.Cleave.AsYouTypeFormatter(pps.phoneRegionCode),
                 pps.delimiter
             );
         } catch (ex) {

diff --git a/src/Cleave.react.js b/src/Cleave.react.js
@@ -115,7 +115,7 @@ var Cleave = React.createClass({
         // external google closure lib
         try {
             pps.phoneFormatter = new PhoneFormatter(
-                new Cleave.AsYouTypeFormatter(pps.phoneRegionCode),
+                new pps.root.Cleave.AsYouTypeFormatter(pps.phoneRegionCode),
                 pps.delimiter
             );
         } catch (ex) {

diff --git a/src/common/DefaultProperties.js b/src/common/DefaultProperties.js
@@ -58,6 +58,8 @@ var DefaultProperties = {
         target.blocks = opts.blocks || [];
         target.blocksLength = target.blocks.length;
 
+        target.root = (typeof global === "object" && global) ? global : window;
+
         target.maxLength = 0;
 
         target.backspace = false;