Merge branch 'hotfix/1.0.7'

CHANGELOG

@@ -1,3 +1,6 @@
+= 1.0.7
+  * Better fix for pixel ratio being 1
+
 = 1.0.6
   * Performance improvement, early bail if pixel ratio is 1 (#13)
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "hidpi-canvas",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "homepage": "https://github.com/jondavidjohn/hidpi-canvas-polyfill",
   "authors": [
     "Jonathan Johnson <[email protected]>"

dist/hidpi-canvas.js

@@ -1,5 +1,5 @@
 /**
- * HiDPI Canvas Polyfill (1.0.6)
+ * HiDPI Canvas Polyfill (1.0.7)
  *
  * Author: Jonathan D. Johnson (http://jondavidjohn.com)
  * Homepage: https://github.com/jondavidjohn/hidpi-canvas-polyfill
@@ -8,9 +8,7 @@
 */
 (function(prototype) {
 
-	var func, value,
-
-		getPixelRatio = function(context) {
+	var pixelRatio = (function(context) {
 			var backingStore = context.backingStorePixelRatio ||
 						context.webkitBackingStorePixelRatio ||
 						context.mozBackingStorePixelRatio ||
@@ -19,7 +17,7 @@
 						context.backingStorePixelRatio || 1;
 
 			return (window.devicePixelRatio || 1) / backingStore;
-		},
+		})(prototype),
 
 		forEach = function(obj, func) {
 			for (var p in obj) {
@@ -47,23 +45,22 @@
 			'createLinearGradient': 'all'
 		};
 
+	if (pixelRatio === 1) return;
+
 	forEach(ratioArgs, function(value, key) {
 		prototype[key] = (function(_super) {
 			return function() {
 				var i, len,
-					ratio = getPixelRatio(this),
 					args = Array.prototype.slice.call(arguments);
 
-				if (ratio === 1) return _super.apply(this, args);
-
 				if (value === 'all') {
 					args = args.map(function(a) {
-						return a * ratio;
+						return a * pixelRatio;
 					});
 				}
 				else if (Array.isArray(value)) {
 					for (i = 0, len = value.length; i < len; i++) {
-						args[value[i]] *= ratio;
+						args[value[i]] *= pixelRatio;
 					}
 				}
 
@@ -76,18 +73,15 @@
 	//
 	prototype.fillText = (function(_super) {
 		return function() {
-			var ratio = getPixelRatio(this),
-				args = Array.prototype.slice.call(arguments);
-
-			if (ratio === 1) return _super.apply(this, args);
+			var args = Array.prototype.slice.call(arguments);
 
-			args[1] *= ratio; // x
-			args[2] *= ratio; // y
+			args[1] *= pixelRatio; // x
+			args[2] *= pixelRatio; // y
 
 			this.font = this.font.replace(
 				/(\d+)(px|em|rem|pt)/g,
 				function(w, m, u) {
-					return (m * ratio) + u;
+					return (m * pixelRatio) + u;
 				}
 			);
 
@@ -96,26 +90,23 @@
 			this.font = this.font.replace(
 				/(\d+)(px|em|rem|pt)/g,
 				function(w, m, u) {
-					return (m / ratio) + u;
+					return (m / pixelRatio) + u;
 				}
 			);
 		};
 	})(prototype.fillText);
 
 	prototype.strokeText = (function(_super) {
 		return function() {
-			var ratio = getPixelRatio(this),
-				args = Array.prototype.slice.call(arguments);
-
-			if (ratio === 1) return _super.apply(this, args);
+			var args = Array.prototype.slice.call(arguments);
 
-			args[1] *= ratio; // x
-			args[2] *= ratio; // y
+			args[1] *= pixelRatio; // x
+			args[2] *= pixelRatio; // y
 
 			this.font = this.font.replace(
 				/(\d+)(px|em|rem|pt)/g,
 				function(w, m, u) {
-					return (m * ratio) + u;
+					return (m * pixelRatio) + u;
 				}
 			);
 
@@ -124,7 +115,7 @@
 			this.font = this.font.replace(
 				/(\d+)(px|em|rem|pt)/g,
 				function(w, m, u) {
-					return (m / ratio) + u;
+					return (m / pixelRatio) + u;
 				}
 			);
 		};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "hidpi-canvas",
   "description": "A JavaScript drop-in module to polyfill consistent and automatic HiDPI Canvas support.",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "Apache 2.0",
   "homepage": "https://github.com/jondavidjohn/hidpi-canvas-polyfill",
   "bugs": "https://github.com/jondavidjohn/hidpi-canvas-polyfill/issues",

src/CanvasRenderingContext2D.js

@@ -1,8 +1,6 @@
 (function(prototype) {
 
-	var func, value,
-
-		getPixelRatio = function(context) {
+	var pixelRatio = (function(context) {
 			var backingStore = context.backingStorePixelRatio ||
 						context.webkitBackingStorePixelRatio ||
 						context.mozBackingStorePixelRatio ||
@@ -11,7 +9,7 @@
 						context.backingStorePixelRatio || 1;
 
 			return (window.devicePixelRatio || 1) / backingStore;
-		},
+		})(prototype),
 
 		forEach = function(obj, func) {
 			for (var p in obj) {
@@ -39,23 +37,22 @@
 			'createLinearGradient': 'all'
 		};
 
+	if (pixelRatio === 1) return;
+
 	forEach(ratioArgs, function(value, key) {
 		prototype[key] = (function(_super) {
 			return function() {
 				var i, len,
-					ratio = getPixelRatio(this),
 					args = Array.prototype.slice.call(arguments);
 
-				if (ratio === 1) return _super.apply(this, args);
-
 				if (value === 'all') {
 					args = args.map(function(a) {
-						return a * ratio;
+						return a * pixelRatio;
 					});
 				}
 				else if (Array.isArray(value)) {
 					for (i = 0, len = value.length; i < len; i++) {
-						args[value[i]] *= ratio;
+						args[value[i]] *= pixelRatio;
 					}
 				}
 
@@ -68,18 +65,15 @@
 	//
 	prototype.fillText = (function(_super) {
 		return function() {
-			var ratio = getPixelRatio(this),
-				args = Array.prototype.slice.call(arguments);
-
-			if (ratio === 1) return _super.apply(this, args);
+			var args = Array.prototype.slice.call(arguments);
 
-			args[1] *= ratio; // x
-			args[2] *= ratio; // y
+			args[1] *= pixelRatio; // x
+			args[2] *= pixelRatio; // y
 
 			this.font = this.font.replace(
 				/(\d+)(px|em|rem|pt)/g,
 				function(w, m, u) {
-					return (m * ratio) + u;
+					return (m * pixelRatio) + u;
 				}
 			);
 
@@ -88,26 +82,23 @@
 			this.font = this.font.replace(
 				/(\d+)(px|em|rem|pt)/g,
 				function(w, m, u) {
-					return (m / ratio) + u;
+					return (m / pixelRatio) + u;
 				}
 			);
 		};
 	})(prototype.fillText);
 
 	prototype.strokeText = (function(_super) {
 		return function() {
-			var ratio = getPixelRatio(this),
-				args = Array.prototype.slice.call(arguments);
-
-			if (ratio === 1) return _super.apply(this, args);
+			var args = Array.prototype.slice.call(arguments);
 
-			args[1] *= ratio; // x
-			args[2] *= ratio; // y
+			args[1] *= pixelRatio; // x
+			args[2] *= pixelRatio; // y
 
 			this.font = this.font.replace(
 				/(\d+)(px|em|rem|pt)/g,
 				function(w, m, u) {
-					return (m * ratio) + u;
+					return (m * pixelRatio) + u;
 				}
 			);
 
@@ -116,7 +107,7 @@
 			this.font = this.font.replace(
 				/(\d+)(px|em|rem|pt)/g,
 				function(w, m, u) {
-					return (m / ratio) + u;
+					return (m / pixelRatio) + u;
 				}
 			);
 		};