Merge remote-tracking branch 'origin/master' into 3.0

scottjehl · Sep 30, 2015 · e81924b · e81924b
2 parents 4fb7c82 + 87597fc
commit e81924b
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 16 deletions.
diff --git a/dist/picturefill.js b/dist/picturefill.js
@@ -1,4 +1,4 @@
-/*! Picturefill - v3.0.0 - 2015-09-30
+/*! Picturefill - v3.0.1 - 2015-09-30
  * http://scottjehl.github.io/picturefill
  * Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT
  */
@@ -71,7 +71,7 @@
 	}
 })(window);
 
-/*! Picturefill - v3.0.0-beta
+/*! Picturefill - v3.0.1
  * http://scottjehl.github.io/picturefill
  * Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt;
  *  License: MIT
@@ -1173,7 +1173,6 @@
 			bestCandidate,
 			curSrc,
 			curCan,
-			isSameSet,
 			candidateSrc,
 			abortCurSrc;
 
@@ -1196,7 +1195,7 @@
 
 				// if current candidate is "best", "better" or "okay",
 				// set it to bestCandidate
-				if ( curCan && isSameSet && curCan.res >= dpr ) {
+				if ( curCan.res >= dpr ) {
 					bestCandidate = curCan;
 				}
 			}

diff --git a/dist/picturefill.min.js b/dist/picturefill.min.js
diff --git a/dist/plugins/intrinsic-dimension/pf.intrinsic.min.js b/dist/plugins/intrinsic-dimension/pf.intrinsic.min.js
diff --git a/dist/plugins/mutation/pf.mutation.min.js b/dist/plugins/mutation/pf.mutation.min.js
diff --git a/dist/plugins/oldie/pf.oldie.min.js b/dist/plugins/oldie/pf.oldie.min.js
diff --git a/dist/plugins/print/pf.print.min.js b/dist/plugins/print/pf.print.min.js
diff --git a/dist/plugins/typesupport/pf.type.min.js b/dist/plugins/typesupport/pf.type.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "picturefill",
   "description": "A responsive image polyfill.",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "homepage": "https://scottjehl.github.io/picturefill/",
   "bugs": "https://github.com/scottjehl/picturefill/issues",
   "license": "MIT",

diff --git a/picturefill.json b/picturefill.json
@@ -2,7 +2,7 @@
 	"name": "Picturefill",
 	"title": "Picturefill",
 	"description": "A polyfill for responsive images (http://picture.responsiveimages.org/) that you can use today.",
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"homepage": "http://scottjehl.github.io/picturefill",
 	"author": {
 		"name": "https://github.com/scottjehl/picturefill/blob/master/Authors.txt",

diff --git a/src/picturefill.js b/src/picturefill.js
@@ -1,4 +1,4 @@
-/*! Picturefill - v3.0.0-beta
+/*! Picturefill - v3.0.1
  * http://scottjehl.github.io/picturefill
  * Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt;
  *  License: MIT
@@ -1100,7 +1100,6 @@
 			bestCandidate,
 			curSrc,
 			curCan,
-			isSameSet,
 			candidateSrc,
 			abortCurSrc;
 
@@ -1123,7 +1122,7 @@
 
 				// if current candidate is "best", "better" or "okay",
 				// set it to bestCandidate
-				if ( curCan && isSameSet && curCan.res >= dpr ) {
+				if ( curCan.res >= dpr ) {
 					bestCandidate = curCan;
 				}
 			}