From ad1dc1445f71c88dfa48bfb4b609f8be791ed096 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Sat, 5 Mar 2016 05:05:03 -0500 Subject: [PATCH] feature(load) put: rm prefix, apiURL --- lib/client/directory.js | 5 ++++- lib/client/dom.js | 11 +++++++---- lib/client/load.js | 6 +----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/client/directory.js b/lib/client/directory.js index d189a640..a34080fb 100644 --- a/lib/client/directory.js +++ b/lib/client/directory.js @@ -1,4 +1,5 @@ /* global CloudCmd */ +/* global CloudFunc */ /* global DOM */ (function() { @@ -54,7 +55,9 @@ uploader = window.philip(entries, function(type, name, data, i, n, callback) { var upload, - full = path + name; + prefixURL = CloudCmd.PREFIX_URL, + FS = CloudFunc.FS, + full = prefixURL + FS + path + name; switch(type) { case 'file': diff --git a/lib/client/dom.js b/lib/client/dom.js index e08cc6bd..dd9b62f7 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -406,13 +406,16 @@ var CloudCmd, Util, DOM, CloudFunc; load = function(file, callback) { var uploader, - Images = DOM.Images, - name = file.name, - path = dir + name; + Images = DOM.Images, + name = file.name, + path = dir + name, + prefixURL = CloudCmd.PREFIX_URL, + FS = CloudFunc.FS, + api = prefixURL + FS; ++i; - uploader = DOM.load.put(path, file); + uploader = DOM.load.put(api + path, file); uploader.on('progress', function(count) { var max = step(n), value = (i - 1) * max + percent(count, 100, max); diff --git a/lib/client/load.js b/lib/client/load.js index 3d6d3d1b..03e2d07a 100644 --- a/lib/client/load.js +++ b/lib/client/load.js @@ -219,16 +219,12 @@ load.put = function(url, body) { var emitter = Emitify(), - prefix = CloudCmd.PREFIX, - apiURL = CloudFunc.apiURL, - - api = prefix + apiURL + '/fs', xhr = new XMLHttpRequest(); url = encodeURI(url); url = url.replace('#', '%23'); - xhr.open('put', api + url, true); + xhr.open('put', url, true); xhr.upload.onprogress = function(event) { var percent, count;