Fixed unnecessary extra tab from opening on Firefox
Removed reference to target_view = view.open() to prevent the new tab from opening. Instead catching this case within the fs_error function with an else statement, so if no target_view: window.open() and pass the target of "_blank" to allow dataURL to open in new tab rather than steal the current window.
This commit is contained in:
+6
-6
@@ -1,7 +1,7 @@
|
|||||||
/* FileSaver.js
|
/* FileSaver.js
|
||||||
* A saveAs() FileSaver implementation.
|
* A saveAs() FileSaver implementation.
|
||||||
* 2013-01-23
|
* 2013-01-23
|
||||||
*
|
*
|
||||||
* By Eli Grey, http://eligrey.com
|
* By Eli Grey, http://eligrey.com
|
||||||
* License: X11/MIT
|
* License: X11/MIT
|
||||||
* See LICENSE.md
|
* See LICENSE.md
|
||||||
@@ -94,7 +94,9 @@ var saveAs = saveAs
|
|||||||
}
|
}
|
||||||
if (target_view) {
|
if (target_view) {
|
||||||
target_view.location.href = object_url;
|
target_view.location.href = object_url;
|
||||||
}
|
} else {
|
||||||
|
window.open(object_url, "_blank");
|
||||||
|
}
|
||||||
filesaver.readyState = filesaver.DONE;
|
filesaver.readyState = filesaver.DONE;
|
||||||
dispatch_all();
|
dispatch_all();
|
||||||
}
|
}
|
||||||
@@ -137,8 +139,6 @@ var saveAs = saveAs
|
|||||||
}
|
}
|
||||||
if (type === force_saveable_type || webkit_req_fs) {
|
if (type === force_saveable_type || webkit_req_fs) {
|
||||||
target_view = view;
|
target_view = view;
|
||||||
} else {
|
|
||||||
target_view = view.open();
|
|
||||||
}
|
}
|
||||||
if (!req_fs) {
|
if (!req_fs) {
|
||||||
fs_error();
|
fs_error();
|
||||||
@@ -201,7 +201,7 @@ var saveAs = saveAs
|
|||||||
FS_proto.readyState = FS_proto.INIT = 0;
|
FS_proto.readyState = FS_proto.INIT = 0;
|
||||||
FS_proto.WRITING = 1;
|
FS_proto.WRITING = 1;
|
||||||
FS_proto.DONE = 2;
|
FS_proto.DONE = 2;
|
||||||
|
|
||||||
FS_proto.error =
|
FS_proto.error =
|
||||||
FS_proto.onwritestart =
|
FS_proto.onwritestart =
|
||||||
FS_proto.onprogress =
|
FS_proto.onprogress =
|
||||||
@@ -210,7 +210,7 @@ var saveAs = saveAs
|
|||||||
FS_proto.onerror =
|
FS_proto.onerror =
|
||||||
FS_proto.onwriteend =
|
FS_proto.onwriteend =
|
||||||
null;
|
null;
|
||||||
|
|
||||||
view.addEventListener("unload", process_deletion_queue, false);
|
view.addEventListener("unload", process_deletion_queue, false);
|
||||||
return saveAs;
|
return saveAs;
|
||||||
}(self));
|
}(self));
|
||||||
|
|||||||
Reference in New Issue
Block a user