add currentSrc support detection (fixes #478) (for 2.3 branch)

scottjehl · Apr 7, 2015 · 42fe060 · 42fe060
1 parent 5a4b512
commit 42fe060
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/dist/picturefill.js b/dist/picturefill.js
@@ -1,4 +1,4 @@
-/*! Picturefill - v2.3.0 - 2015-03-23
+/*! Picturefill - v2.3.0 - 2015-04-07
 * http://scottjehl.github.io/picturefill
 * Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT */
 /*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas, David Knight. Dual MIT/BSD license */
@@ -92,6 +92,7 @@ window.matchMedia || (window.matchMedia = function() {
 	(function() {
 		pf.srcsetSupported = "srcset" in image;
 		pf.sizesSupported = "sizes" in image;
+		pf.curSrcSupported = "currentSrc" in image;
 	})();
 
 	// just a string trim workaround
@@ -504,7 +505,9 @@ window.matchMedia || (window.matchMedia = function() {
 					picImg.src = bestCandidate.url;
 					// currentSrc attribute and property to match
 					// http://picture.responsiveimages.org/#the-img-element
-					picImg.currentSrc = picImg.src;
+					if ( !pf.curSrcSupported ) {
+						picImg.currentSrc = picImg.src;
+					}
 
 					pf.backfaceVisibilityFix( picImg );
 				}
@@ -707,17 +710,13 @@ window.matchMedia || (window.matchMedia = function() {
 			}
 		}, 250 );
 
+		var resizeTimer;
+		var handleResize = function() {
+	        picturefill({ reevaluate: true });
+	    };
 		function checkResize() {
-			var resizeThrottle;
-
-			if ( !w._picturefillWorking ) {
-				w._picturefillWorking = true;
-				w.clearTimeout( resizeThrottle );
-				resizeThrottle = w.setTimeout( function() {
-					picturefill({ reevaluate: true });
-					w._picturefillWorking = false;
-				}, 60 );
-			}
+		    clearTimeout(resizeTimer);
+		    resizeTimer = setTimeout( handleResize, 60 );
 		}
 
 		if ( w.addEventListener ) {

diff --git a/dist/picturefill.min.js b/dist/picturefill.min.js
diff --git a/src/picturefill.js b/src/picturefill.js
@@ -43,6 +43,7 @@
 	(function() {
 		pf.srcsetSupported = "srcset" in image;
 		pf.sizesSupported = "sizes" in image;
+		pf.curSrcSupported = "currentSrc" in image;
 	})();
 
 	// just a string trim workaround
@@ -455,7 +456,9 @@
 					picImg.src = bestCandidate.url;
 					// currentSrc attribute and property to match
 					// http://picture.responsiveimages.org/#the-img-element
-					picImg.currentSrc = picImg.src;
+					if ( !pf.curSrcSupported ) {
+						picImg.currentSrc = picImg.src;
+					}
 
 					pf.backfaceVisibilityFix( picImg );
 				}

diff --git a/tests/tests.js b/tests/tests.js
@@ -461,15 +461,19 @@
 		pf.applyBestCandidate( candidates, image );
 
 		deepEqual(image.src, candidates[2].url, "uses the url from the best px fit" );
-		deepEqual(image.currentSrc, candidates[2].url, "uses the url from the best px fit" );
+		if ( !pf.curSrcSupported ) {
+			deepEqual(image.currentSrc, candidates[2].url, "uses the url from the best px fit" );
+		}
 
 		image.src = "data:300";
 		image.currentSrc = "data:300";
 
 		pf.applyBestCandidate( candidates, image );
 
 		deepEqual(image.src, "data:300", "src left alone when matched" );
-		deepEqual(image.currentSrc, "data:300", "currentSrc left alone when matched" );
+		if ( !pf.curSrcSupported ) {
+			deepEqual(image.currentSrc, "data:300", "currentSrc left alone when matched" );
+		}
 	});
 
 	test( "removeVideoShim", function() {
@@ -612,7 +616,7 @@
 
 		picturefill( { elements: [ img ] } );
 
-		assert.equal( img.currentSrc || img.src, "data:img" );
+		assert.equal( img.src || img.currentSrc, "data:img" );
 	});
 
 })( window, jQuery );