Merge pull request #425 from mailru/with-credentials-options

Add uploadCredentials option
mailru · Jun 7, 2019 · e89888f · e89888f
2 parents 1b3af7a + 3caa249
commit e89888f
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -385,6 +385,20 @@ var xhr = FileAPI.upload({
 
 ---
 
+<a name="options.uploadCredentials"></a>
+### uploadCredentials`:Boolean`
+Pass credentials to upload request, HTML5 only.
+
+```js
+var xhr = FileAPI.upload({
+	url: '...',
+	uploadCredentials: false,
+	files: { .. },
+});
+```
+
+---
+
 <a name="options.headers"></a>
 ### headers`:Object`
 Additional request headers, HTML5 only.

diff --git a/README.ru.md b/README.ru.md
@@ -366,6 +366,7 @@ var xhr = FileAPI.upload({
 ```
 
 ---
+
 <a name="options.uploadMethod"></a>
 ### uploadMethod`:String`
 Метод запроса, только HTML5.
@@ -380,6 +381,20 @@ var xhr = FileAPI.upload({
 
 ---
 
+<a name="options.uploadCredentials"></a>
+### uploadCredentials`:Boolean`
+Передавать ли куки в запросе, только HTML5.
+
+```js
+var xhr = FileAPI.upload({
+	url: '...',
+	uploadCredentials: false,
+	files: { ... },
+});
+```
+
+---
+
 <a name="options.headers"></a>
 ### headers`:Object`
 Дополнительные заголовки запроса, только HTML5.

diff --git a/dist/FileAPI.html5.js b/dist/FileAPI.html5.js
@@ -1,4 +1,4 @@
-/*! FileAPI 2.1.0 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.1.1 - BSD | git://github.com/mailru/FileAPI.git
  * FileAPI — a set of  javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.
  */
 
@@ -287,7 +287,7 @@
 		 * FileAPI (core object)
 		 */
 		api = {
-			version: '2.1.0',
+			version: '2.1.1',
 
 			cors: false,
 			html5: true,
@@ -3001,7 +3001,9 @@
 
 				xhr.open(options.uploadMethod || 'POST', url, true);
 
-				if( api.withCredentials ){
+				if (typeof options.uploadCredentials === 'boolean') {
+					xhr.withCredentials = options.uploadCredentials ? 'true' : null;
+				} else if( api.withCredentials ){
 					xhr.withCredentials = "true";
 				}
 

diff --git a/dist/FileAPI.html5.min.js b/dist/FileAPI.html5.min.js
diff --git a/dist/FileAPI.js b/dist/FileAPI.js
@@ -1,4 +1,4 @@
-/*! FileAPI 2.1.0 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.1.1 - BSD | git://github.com/mailru/FileAPI.git
  * FileAPI — a set of  javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.
  */
 
@@ -287,7 +287,7 @@
 		 * FileAPI (core object)
 		 */
 		api = {
-			version: '2.1.0',
+			version: '2.1.1',
 
 			cors: false,
 			html5: true,
@@ -3001,7 +3001,9 @@
 
 				xhr.open(options.uploadMethod || 'POST', url, true);
 
-				if( api.withCredentials ){
+				if (typeof options.uploadCredentials === 'boolean') {
+					xhr.withCredentials = options.uploadCredentials ? 'true' : null;
+				} else if( api.withCredentials ){
 					xhr.withCredentials = "true";
 				}
 

diff --git a/dist/FileAPI.min.js b/dist/FileAPI.min.js
diff --git a/lib/FileAPI.XHR.js b/lib/FileAPI.XHR.js
@@ -200,7 +200,9 @@
 
 				xhr.open(options.uploadMethod || 'POST', url, true);
 
-				if( api.withCredentials ){
+				if (typeof options.uploadCredentials === 'boolean') {
+					xhr.withCredentials = options.uploadCredentials ? 'true' : null;
+				} else if( api.withCredentials ){
 					xhr.withCredentials = "true";
 				}
 

diff --git a/lib/FileAPI.core.js b/lib/FileAPI.core.js
@@ -193,7 +193,7 @@
 		 * FileAPI (core object)
 		 */
 		api = {
-			version: '2.1.0',
+			version: '2.1.1',
 
 			cors: false,
 			html5: true,

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fileapi",
   "exportName": "FileAPI",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "devDependencies": {
     "connect-busboy": "~0.0.2",
     "eventemitter2": "~0.4.13",