From 8ac3c9b3d73c7e383b875996e07c0168d782395c Mon Sep 17 00:00:00 2001
From: Simko <sebastian.simko@wirecard.lan>
Date: Tue, 11 Oct 2016 11:11:26 +0200
Subject: [PATCH] add basic auth and update uglify

---
 dist/jszip-utils-ie.js     |  2 +-
 dist/jszip-utils-ie.min.js |  6 +++--
 dist/jszip-utils.js        | 10 ++++++---
 dist/jszip-utils.min.js    | 45 ++++++++++++++++++++++++++++++++++++--
 lib/index.js               |  6 ++++-
 lib/license_header.js      |  2 +-
 package.json               |  4 ++--
 7 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/dist/jszip-utils-ie.js b/dist/jszip-utils-ie.js
index 43dbc09..8ecb85a 100644
--- a/dist/jszip-utils-ie.js
+++ b/dist/jszip-utils-ie.js
@@ -1,4 +1,4 @@
-/*!
+/*
 
 JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
 <http://stuk.github.io/jszip-utils>
diff --git a/dist/jszip-utils-ie.min.js b/dist/jszip-utils-ie.min.js
index 3cdbbf8..e90eb05 100644
--- a/dist/jszip-utils-ie.min.js
+++ b/dist/jszip-utils-ie.min.js
@@ -1,4 +1,4 @@
-/*!
+/*
 
 JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
 <http://stuk.github.io/jszip-utils>
@@ -7,4 +7,6 @@ JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
 Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
 
 */
-!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(){var a="undefined"!=typeof self?self:"undefined"!=typeof window?window:{},b="<!-- IEBinaryToArray_ByteStr -->\r\n<script type='text/vbscript'>\r\nFunction IEBinaryToArray_ByteStr(Binary)\r\n   IEBinaryToArray_ByteStr = CStr(Binary)\r\nEnd Function\r\nFunction IEBinaryToArray_ByteStr_Last(Binary)\r\n   Dim lastIndex\r\n   lastIndex = LenB(Binary)\r\n   if lastIndex mod 2 Then\r\n       IEBinaryToArray_ByteStr_Last = Chr( AscB( MidB( Binary, lastIndex, 1 ) ) )\r\n   Else\r\n       IEBinaryToArray_ByteStr_Last = \"\"\r\n   End If\r\nEnd Function\r\n</script>\r\n";document.write(b),a.JSZipUtils._getBinaryFromXHR=function(a){for(var b=a.responseBody,c={},d=0;256>d;d++)for(var e=0;256>e;e++)c[String.fromCharCode(d+(e<<8))]=String.fromCharCode(d)+String.fromCharCode(e);var f=IEBinaryToArray_ByteStr(b),g=IEBinaryToArray_ByteStr_Last(b);return f.replace(/[\s\S]/g,function(a){return c[a]})+g}},{}]},{},[1]);
\ No newline at end of file
+!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){var d="undefined"!=typeof self?self:"undefined"!=typeof window?window:{},e="<!-- IEBinaryToArray_ByteStr -->\r\n<script type='text/vbscript'>\r\nFunction IEBinaryToArray_ByteStr(Binary)\r\n   IEBinaryToArray_ByteStr = CStr(Binary)\r\nEnd Function\r\nFunction IEBinaryToArray_ByteStr_Last(Binary)\r\n   Dim lastIndex\r\n   lastIndex = LenB(Binary)\r\n   if lastIndex mod 2 Then\r\n       IEBinaryToArray_ByteStr_Last = Chr( AscB( MidB( Binary, lastIndex, 1 ) ) )\r\n   Else\r\n       IEBinaryToArray_ByteStr_Last = \"\"\r\n   End If\r\nEnd Function\r\n</script>\r\n";
+// inject VBScript
+document.write(e),d.JSZipUtils._getBinaryFromXHR=function(a){for(var b=a.responseBody,c={},d=0;d<256;d++)for(var e=0;e<256;e++)c[String.fromCharCode(d+(e<<8))]=String.fromCharCode(d)+String.fromCharCode(e);var f=IEBinaryToArray_ByteStr(b),g=IEBinaryToArray_ByteStr_Last(b);return f.replace(/[\s\S]/g,function(a){return c[a]})+g}},{}]},{},[1]);
\ No newline at end of file
diff --git a/dist/jszip-utils.js b/dist/jszip-utils.js
index 948471a..41227cc 100644
--- a/dist/jszip-utils.js
+++ b/dist/jszip-utils.js
@@ -1,4 +1,4 @@
-/*!
+/*
 
 JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
 <http://stuk.github.io/jszip-utils>
@@ -34,7 +34,7 @@ function createActiveXHR() {
 }
 
 // Create the request object
-var createXHR = window.ActiveXObject ?
+var createXHR = (typeof window !== "undefined" && window.ActiveXObject) ?
     /* Microsoft failed to properly
      * implement the XMLHttpRequest in IE7 (can't request local files),
      * so we use the ActiveXObject when it is available
@@ -49,7 +49,7 @@ var createXHR = window.ActiveXObject ?
 
 
 
-JSZipUtils.getBinaryContent = function(path, callback) {
+JSZipUtils.getBinaryContent = function(path, callback, auth) {
     /*
      * Here is the tricky part : getting the data.
      * In firefox/chrome/opera/... setting the mimeType to 'text/plain; charset=x-user-defined'
@@ -70,6 +70,10 @@ JSZipUtils.getBinaryContent = function(path, callback) {
 
         xhr.open('GET', path, true);
 
+        if (auth) {
+            xhr.setRequestHeader("Authorization", "Basic " + auth);
+        }
+
         // recent browsers
         if ("responseType" in xhr) {
             xhr.responseType = "arraybuffer";
diff --git a/dist/jszip-utils.min.js b/dist/jszip-utils.min.js
index 223cedb..f80a885 100644
--- a/dist/jszip-utils.min.js
+++ b/dist/jszip-utils.min.js
@@ -1,4 +1,4 @@
-/*!
+/*
 
 JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
 <http://stuk.github.io/jszip-utils>
@@ -7,4 +7,45 @@ JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
 Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
 
 */
-!function(a){"object"==typeof exports?module.exports=a():"function"==typeof define&&define.amd?define(a):"undefined"!=typeof window?window.JSZipUtils=a():"undefined"!=typeof global?global.JSZipUtils=a():"undefined"!=typeof self&&(self.JSZipUtils=a())}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b){"use strict";function c(){try{return new window.XMLHttpRequest}catch(a){}}function d(){try{return new window.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}}var e={};e._getBinaryFromXHR=function(a){return a.response||a.responseText};var f=window.ActiveXObject?function(){return c()||d()}:c;e.getBinaryContent=function(a,b){try{var c=f();c.open("GET",a,!0),"responseType"in c&&(c.responseType="arraybuffer"),c.overrideMimeType&&c.overrideMimeType("text/plain; charset=x-user-defined"),c.onreadystatechange=function(){var d,f;if(4===c.readyState)if(200===c.status||0===c.status){d=null,f=null;try{d=e._getBinaryFromXHR(c)}catch(g){f=new Error(g)}b(f,d)}else b(new Error("Ajax error for "+a+" : "+this.status+" "+this.statusText),null)},c.send()}catch(d){b(new Error(d),null)}},b.exports=e},{}]},{},[1])(1)});
\ No newline at end of file
+!function(a){"object"==typeof exports?module.exports=a():"function"==typeof define&&define.amd?define(a):"undefined"!=typeof window?window.JSZipUtils=a():"undefined"!=typeof global?global.JSZipUtils=a():"undefined"!=typeof self&&(self.JSZipUtils=a())}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";
+// taken from jQuery
+function d(){try{return new window.XMLHttpRequest}catch(a){}}function e(){try{return new window.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}}var f={};
+// just use the responseText with xhr1, response with xhr2.
+// The transformation doesn't throw away high-order byte (with responseText)
+// because JSZip handles that case. If not used with JSZip, you may need to
+// do it, see https://developer.mozilla.org/En/Using_XMLHttpRequest#Handling_binary_data
+f._getBinaryFromXHR=function(a){
+// for xhr.responseText, the 0xFF mask is applied by JSZip
+return a.response||a.responseText};
+// Create the request object
+var g="undefined"!=typeof window&&window.ActiveXObject?/* Microsoft failed to properly
+     * implement the XMLHttpRequest in IE7 (can't request local files),
+     * so we use the ActiveXObject when it is available
+     * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+     * we need a fallback.
+     */
+function(){return d()||e()}:
+// For all other browsers, use the standard XMLHttpRequest object
+d;f.getBinaryContent=function(a,b,c){/*
+     * Here is the tricky part : getting the data.
+     * In firefox/chrome/opera/... setting the mimeType to 'text/plain; charset=x-user-defined'
+     * is enough, the result is in the standard xhr.responseText.
+     * cf https://developer.mozilla.org/En/XMLHttpRequest/Using_XMLHttpRequest#Receiving_binary_data_in_older_browsers
+     * In IE <= 9, we must use (the IE only) attribute responseBody
+     * (for binary data, its content is different from responseText).
+     * In IE 10, the 'charset=x-user-defined' trick doesn't work, only the
+     * responseType will work :
+     * http://msdn.microsoft.com/en-us/library/ie/hh673569%28v=vs.85%29.aspx#Binary_Object_upload_and_download
+     *
+     * I'd like to use jQuery to avoid this XHR madness, but it doesn't support
+     * the responseType attribute : http://bugs.jquery.com/ticket/11461
+     */
+try{var d=g();d.open("GET",a,!0),c&&d.setRequestHeader("Authorization","Basic "+c),
+// recent browsers
+"responseType"in d&&(d.responseType="arraybuffer"),
+// older browser
+d.overrideMimeType&&d.overrideMimeType("text/plain; charset=x-user-defined"),d.onreadystatechange=function(c){var e,g;
+// use `xhr` and not `this`... thanks IE
+if(4===d.readyState)if(200===d.status||0===d.status){e=null,g=null;try{e=f._getBinaryFromXHR(d)}catch(h){g=new Error(h)}b(g,e)}else b(new Error("Ajax error for "+a+" : "+this.status+" "+this.statusText),null)},d.send()}catch(e){b(new Error(e),null)}},
+// export
+b.exports=f},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/lib/index.js b/lib/index.js
index 42594f7..4eab794 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -39,7 +39,7 @@ var createXHR = (typeof window !== "undefined" && window.ActiveXObject) ?
 
 
 
-JSZipUtils.getBinaryContent = function(path, callback) {
+JSZipUtils.getBinaryContent = function(path, callback, auth) {
     /*
      * Here is the tricky part : getting the data.
      * In firefox/chrome/opera/... setting the mimeType to 'text/plain; charset=x-user-defined'
@@ -60,6 +60,10 @@ JSZipUtils.getBinaryContent = function(path, callback) {
 
         xhr.open('GET', path, true);
 
+        if (auth) {
+            xhr.setRequestHeader("Authorization", "Basic " + auth);
+        }
+
         // recent browsers
         if ("responseType" in xhr) {
             xhr.responseType = "arraybuffer";
diff --git a/lib/license_header.js b/lib/license_header.js
index e3f0896..e0815d6 100644
--- a/lib/license_header.js
+++ b/lib/license_header.js
@@ -1,4 +1,4 @@
-/*!
+/*
 
 JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
 <http://stuk.github.io/jszip-utils>
diff --git a/package.json b/package.json
index 417927c..04d8e82 100644
--- a/package.json
+++ b/package.json
@@ -36,9 +36,9 @@
     "browserify": "~2.35.0",
     "grunt-browserify": "~1.3.0",
     "grunt-contrib-jshint": "~0.6.4",
-    "grunt-contrib-uglify": "~0.2.4"
+    "grunt-contrib-uglify": "~1.0.2"
   },
   "dependencies":{
   },
-  "license": "MIT or GPLv3"
+  "license": "(MIT OR GPL-3.0)"
 }