Merge pull request webpack#1170 from gaearon/patch-1

sokra · sokra · commit 99bd9b969f4c · 2015-06-15T17:32:01.000+02:00
Make hotDownloadManifest return a promise
diff --git a/lib/JsonpMainTemplate.runtime.js b/lib/JsonpMainTemplate.runtime.js
@@ -18,39 +18,41 @@ module.exports = function() {
 		head.appendChild(script);
 	}
 
-	function hotDownloadManifest(callback) { // eslint-disable-line no-unused-vars
-		if(typeof XMLHttpRequest === "undefined")
-			return callback(new Error("No browser support"));
-		try {
-			var request = new XMLHttpRequest();
-			var requestPath = $require$.p + $hotMainFilename$;
-			request.open("GET", requestPath, true);
-			request.timeout = 10000;
-			request.send(null);
-		} catch(err) {
-			return callback(err);
-		}
-		request.onreadystatechange = function() {
-			if(request.readyState !== 4) return;
-			if(request.status === 0) {
-				// timeout
-				callback(new Error("Manifest request to " + requestPath + " timed out."));
-			} else if(request.status === 404) {
-				// no update available
-				callback();
-			} else if(request.status !== 200 && request.status !== 304) {
-				// other failure
-				callback(new Error("Manifest request to " + requestPath + " failed."));
-			} else {
-				// success
-				try {
-					var update = JSON.parse(request.responseText);
-				} catch(e) {
-					callback(e);
-					return;
-				}
-				callback(null, update);
+	function hotDownloadManifest() { // eslint-disable-line no-unused-vars
+		return new Promise(function(resolve, reject) {
+			if(typeof XMLHttpRequest === "undefined")
+				return reject(new Error("No browser support"));
+			try {
+				var request = new XMLHttpRequest();
+				var requestPath = $require$.p + $hotMainFilename$;
+				request.open("GET", requestPath, true);
+				request.timeout = 10000;
+				request.send(null);
+			} catch(err) {
+				return reject(err);
 			}
-		};
+			request.onreadystatechange = function() {
+				if(request.readyState !== 4) return;
+				if(request.status === 0) {
+					// timeout
+					reject(new Error("Manifest request to " + requestPath + " timed out."));
+				} else if(request.status === 404) {
+					// no update available
+					resolve();
+				} else if(request.status !== 200 && request.status !== 304) {
+					// other failure
+					reject(new Error("Manifest request to " + requestPath + " failed."));
+				} else {
+					// success
+					try {
+						var update = JSON.parse(request.responseText);
+					} catch(e) {
+						reject(e);
+						return;
+					}
+					resolve(update);
+				}
+			};
+		});
 	}
 };
