Merge branch 'fix/demos' of https://github.com/samsonasik/zf2 into hotfix/2699

weierophinney · weierophinney · commit 86fd740ebf4f · 2012-10-08T12:30:58.000-05:00
diff --git a/demos/Zend/ProgressBar/Upload.php b/demos/Zend/ProgressBar/Upload.php
@@ -116,7 +116,7 @@ function makeRequest(url)
                 if (httpRequest.overrideMimeType) {
                     httpRequest.overrideMimeType('text/xml');
                 }
-            } elseif (window.ActiveXObject) {
+            } else if (window.ActiveXObject) {
                 try {
                     httpRequest = new ActiveXObject("Msxml2.XMLHTTP");
                 } catch (e) {

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ function makeRequest(url)`
`116`	`116`	`if (httpRequest.overrideMimeType) {`
`117`	`117`	`httpRequest.overrideMimeType('text/xml');`
`118`	`118`	`}`
`119`		`- } elseif (window.ActiveXObject) {`
	`119`	`+ } else if (window.ActiveXObject) {`
`120`	`120`	`try {`
`121`	`121`	`httpRequest = new ActiveXObject("Msxml2.XMLHTTP");`
`122`	`122`	`} catch (e) {`