aboutsummaryrefslogtreecommitdiff
path: root/src/library.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-08-08 15:03:41 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-08-08 15:03:41 -0700
commit634bac9e1ed719c5779d3116a3797b3aef4b2012 (patch)
treeea6e3e39584431f09992e5637a750cd05f75b782 /src/library.js
parentfef6f254c305db507904d1068af4f9e25ce5769a (diff)
parent47c1d35c944c8ef954aa3d8de9686e35c2858a24 (diff)
Merge pull request #1470 from inolen/preload_path_fixes
file preload path fixes
Diffstat (limited to 'src/library.js')
-rw-r--r--src/library.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/library.js b/src/library.js
index a6a38cfe..591d4350 100644
--- a/src/library.js
+++ b/src/library.js
@@ -874,7 +874,9 @@ LibraryManager.library = {
// result of an XHR that you did manually.
createPreloadedFile: function(parent, name, url, canRead, canWrite, onload, onerror, dontCreateFile) {
Browser.init();
- var fullname = FS.joinPath([parent, name], true);
+ // TODO we should allow people to just pass in a complete filename instead
+ // of parent and name being that we just join them anyways
+ var fullname = PATH.resolve(PATH.join(parent, name));
function processData(byteArray) {
function finish(byteArray) {
if (!dontCreateFile) {