Skip to content

Commit 04ad0a3

Browse files
committed
Merge pull request Stuk#5 from dduponchel/release_v0.0.2
Release v0.0.2
2 parents ad68cb7 + f50bf92 commit 04ad0a3

9 files changed

+14
-13
lines changed

CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# v0.0.2 2014-05-19
2+
- Drop the code for xhr on `file://` and fix an issue with `file://` to `http://` requests, see [#3](https://github.com/Stuk/jszip-utils/pull/3).
3+
14
# v0.0.1 2014-04-27
25
- First release.
36

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jszip-utils",
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"homepage": "https://github.com/Stuk/jszip-utils",
55
"authors": [
66
"Stuart Knightley <[email protected]>",

component.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "jszip-utils",
33
"repo": "Stuk/jszip-utils",
44
"description": "A collection of cross-browser utilities to go along with JSZip.",
5-
"version": "0.0.1",
5+
"version": "0.0.2",
66
"keywords": [
77
"JSZip",
88
"ajax",

dist/jszip-utils-ie.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
44
<http://stuk.github.io/jszip-utils>
55
6-
(c) 2014 Stuart Knightley <stuart [at] stuartk.com>
6+
(c) 2014 Stuart Knightley, David Duponchel
77
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
88
99
*/

dist/jszip-utils-ie.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jszip-utils.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
44
<http://stuk.github.io/jszip-utils>
55
6-
(c) 2014 Stuart Knightley <stuart [at] stuartk.com>
6+
(c) 2014 Stuart Knightley, David Duponchel
77
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
88
99
*/
@@ -33,8 +33,6 @@ function createActiveXHR() {
3333
} catch( e ) {}
3434
}
3535

36-
var isLocal = window.location.protocol === "file:";
37-
3836
// Create the request object
3937
var createXHR = window.ActiveXObject ?
4038
/* Microsoft failed to properly
@@ -44,7 +42,7 @@ var createXHR = window.ActiveXObject ?
4442
* we need a fallback.
4543
*/
4644
function() {
47-
return !isLocal && createStandardXHR() || createActiveXHR();
45+
return createStandardXHR() || createActiveXHR();
4846
} :
4947
// For all other browsers, use the standard XMLHttpRequest object
5048
createStandardXHR;
@@ -86,7 +84,7 @@ JSZipUtils.getBinaryContent = function(path, callback) {
8684
var file, err;
8785
// use `xhr` and not `this`... thanks IE
8886
if (xhr.readyState === 4) {
89-
if (xhr.status === 200 || isLocal) {
87+
if (xhr.status === 200 || xhr.status === 0) {
9088
file = null;
9189
err = null;
9290
try {

dist/jszip-utils.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

documentation/_layouts/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</ul>
4242
<ul class="nav navbar-nav navbar-right">
4343
<li>
44-
<a href="https://github.com/Stuk/jszip-utils">current version : <strong>v0.0.1</strong></a>
44+
<a href="https://github.com/Stuk/jszip-utils">current version : <strong>v0.0.2</strong></a>
4545
</li>
4646
</ul>
4747
</div>

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jszip-utils",
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"author": "Stuart Knightley <[email protected]>",
55
"description": "A collection of cross-browser utilities to go along with JSZip.",
66
"scripts": {

0 commit comments

Comments
 (0)