Merge remote-tracking branch 'origin/ios_scrollbug-544' into 3.0

dist/picturefill.js

@@ -1,12 +1,6 @@
-/*! Picturefill - v3.0.0-beta1 - 2015-07-27
- * http://scottjehl.github.io/picturefill
- * Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT
- */
-/*! Gecko-Picture - v1.0
- * https://github.com/scottjehl/picturefill/tree/3.0/src/plugins/gecko-picture
- * Firefox's early picture implementation (prior to FF41) is static and does
- * not react to viewport changes. This tiny module fixes this.
- */
+/*! Picturefill - v3.0.0-beta1 - 2015-07-24
+* http://scottjehl.github.io/picturefill
+* Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT */
 (function(window) {
 	/*jshint eqnull:true */
 	var ua = navigator.userAgent;
@@ -71,13 +65,13 @@
 	}
 })(window);
 
-/*! Picturefill - v3.0.0-beta
- * http://scottjehl.github.io/picturefill
- * Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt;
+/*! Picturefill - Responsive Images that work today.
+ *  Author: Scott Jehl, Filament Group, 2012 ( new proposal implemented by Shawn Jansepar )
  *  License: MIT
+ *  Spec: http://picture.responsiveimages.org/
  */
-
 (function( window, document, undefined ) {
+	/* global parseSizes */
 	// Enable strict mode
 	"use strict";
 
@@ -198,7 +192,7 @@
 			return string;
 		};
 
-		var buildStr = memoize(function(css) {
+		var buidlStr = memoize(function(css) {
 
 			return "return " + replace((css || "").toLowerCase(),
 				// interpret `and`
@@ -232,7 +226,7 @@
 				} else {
 					/*jshint evil:true */
 					try{
-						cssCache[css] = new Function("e", buildStr(css))(units);
+						cssCache[css] = new Function("e", buidlStr(css))(units);
 					} catch(e) {}
 					/*jshint evil:false */
 				}
@@ -746,6 +740,9 @@
 		} // (Close of big while loop.)
 	}
 
+	/* jshint ignore:start */
+	// jscs:disable
+
 	/*
 	 * Sizes Parser
 	 *
@@ -828,9 +825,9 @@
 
 			// (Loop forwards from the beginning of the string.)
 			while (true) {
-				chrctr = str.charAt(pos);
+				chrctr = str[pos];
 
-				if (chrctr === "") { // ( End of string reached.)
+				if (chrctr === undefined) { // ( End of string reached.)
 					pushComponent();
 					pushComponentArray();
 					return listArray;
@@ -848,7 +845,7 @@
 					// (If previous character in loop was also a space, or if
 					// at the beginning of the string, do not add space char to
 					// component.)
-					if ( (str.charAt(pos - 1) && isSpace( str.charAt(pos - 1) ) ) || !component ) {
+					if ((str[pos - 1] && isSpace(str[pos - 1])) || (!component)) {
 						pos += 1;
 						continue;
 					} else if (parenDepth === 0) {
@@ -864,11 +861,11 @@
 				} else if (chrctr === ")") {
 					parenDepth -= 1;
 				} else if (chrctr === ",") {
-					pushComponent();
+					pushComponent()
 					pushComponentArray();
 					pos += 1;
 					continue;
-				} else if ( (chrctr === "/") && (str.charAt(pos + 1) === "*") ) {
+				} else if ((chrctr === "/") && (str[pos + 1] === "*")) {
 					inComment = true;
 					pos += 2;
 					continue;
@@ -952,6 +949,8 @@
 		// size value, return 100vw.
 		return "100vw";
 	}
+	// jscs: enable
+	/* jshint ignore:end */
 
 	// namespace
 	pf.ns = ("pf" + new Date().getTime()).substr(0, 9);
@@ -1441,14 +1440,19 @@
 					}
 				};
 			};
-
+			var lastClientWidth = docElem.clientHeight;
 			var onResize = function() {
-				isVwDirty = true;
-				pf.fillImgs();
+				isVwDirty = Math.max(window.innerWidth || 0, docElem.clientWidth) !== units.width || docElem.clientHeight !== lastClientWidth;
+				lastClientWidth = docElem.clientHeight;
+				if ( isVwDirty ) {
+					pf.fillImgs();
+				}
 			};
 
 			on( window, "resize", debounce(onResize, 99 ) );
 			on( document, "readystatechange", run );
+
+			types[ "image/webp" ] = detectTypeSupport("image/webp", "data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA==" );
 		})();
 	}
 
@@ -1491,9 +1495,4 @@
 		define( "picturefill", function() { return picturefill; } );
 	}
 
-	// IE8 evals this sync, so it must be the last thing we do
-	if ( !window.HTMLPictureElement ) {
-		types[ "image/webp" ] = detectTypeSupport("image/webp", "data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA==" );
-	}
-
 } )( window, document );

src/picturefill.js

@@ -1368,10 +1368,13 @@
 					}
 				};
 			};
-
+			var lastClientWidth = docElem.clientHeight;
 			var onResize = function() {
-				isVwDirty = true;
-				pf.fillImgs();
+				isVwDirty = Math.max(window.innerWidth || 0, docElem.clientWidth) !== units.width || docElem.clientHeight !== lastClientWidth;
+				lastClientWidth = docElem.clientHeight;
+				if ( isVwDirty ) {
+					pf.fillImgs();
+				}
 			};
 
 			on( window, "resize", debounce(onResize, 99 ) );

tests/tests-functional.js

@@ -317,7 +317,6 @@
 						//IE8/IE9 needs a clear remove here
 						$wimage.removeAttr('width');
 						$wimage.removeAttr('height');
-						debugger;
 
 						runViewportTests($wimage, viewports);
 					};