Skip to content

Commit 60af86e

Browse files
committed
improve es5 support
1 parent a689917 commit 60af86e

6 files changed

Lines changed: 30 additions & 39 deletions

File tree

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "predicsis_ml_sdk-javascript",
3-
"version": "0.7.0",
3+
"version": "0.7.1",
44
"authors": [
55
"Yllieth <sylvnimes@hotmail.com>",
66
"Dehau"
@@ -20,7 +20,7 @@
2020
"angular": "1.3.17",
2121
"restangular": "1.5.1",
2222
"rehttp": "~1.1.5",
23-
"swissknife": "~0.1.2"
23+
"swissknife": "~0.1.3"
2424
},
2525
"main": "dist/predicsis-jsSDK.js",
2626
"ignore": [

dist/predicsis-jsSDK.js

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3470,22 +3470,18 @@ angular
34703470
var offset = options.fileOffset || 0;
34713471
var done = false;
34723472
var index = 0;
3473-
var result = {};
3474-
result[Symbol.iterator] = function() {
3475-
return {
3476-
next: function() {
3477-
if (done) {
3478-
return { done: true };
3479-
}
3480-
var chunk = file.slice(offset, offset + CHUNK_SIZE);
3481-
done = chunk.size < CHUNK_SIZE;
3482-
offset += CHUNK_SIZE;
3483-
index++;
3484-
return { done: false, value: { chunk: chunk, index: index } };
3473+
return {
3474+
next: function() {
3475+
if (done) {
3476+
return { done: true };
34853477
}
3486-
};
3478+
var chunk = file.slice(offset, offset + CHUNK_SIZE);
3479+
done = chunk.size < CHUNK_SIZE;
3480+
offset += CHUNK_SIZE;
3481+
index++;
3482+
return { done: false, value: { chunk: chunk, index: index } };
3483+
}
34873484
};
3488-
return result;
34893485
}
34903486

34913487
function uploadChunk(chunk, index, id, path) {
@@ -3648,14 +3644,13 @@ angular
36483644
* <td><kbd>created_at</kbd></td>
36493645
* <td>A timestamp in ISO format like <kbd>2014-05-02T15:27:37.687Z</kbd></td>
36503646
* </tr>
3651-
* <tr>
3652-
* <td><kbd>cancelUpload</kbd></td>
3653-
* <td>A function which will stop the upload by aborting the request</td>
3654-
* </tr>
36553647
* </table>
36563648
*
3649+
* error event does not provide created_at and progression but provides an err attribute
3650+
* this event is fired with a cancel callback as a second argument
3651+
*
36573652
* About the <kbd>jsSDK.upload.starting</kbd> event. As it's fired before sending the
3658-
* "Get credential" request. So,
3653+
* upload creation request. So,
36593654
* - you may have a delay between <kbd>jsSDK.upload.starting</kbd> and the first <kbd>jsSDK.upload.progress</kbd> events.
36603655
* - the <kbd>path</kbd> parameter of the <kbd>uploadObject</kbd> object is not set
36613656
*
@@ -3691,7 +3686,7 @@ angular
36913686
});
36923687
uploadRes.catch(function(err) {
36933688
//delete concurrentUploads[uploadId];
3694-
$rootScope.$broadcast('jsSDK.upload.error', { fileName: file.name, id: uploadId, err: err }, function() {
3689+
$rootScope.$broadcast('jsSDK.upload.error', { fileName: file.name, id: uploadId, err: err, path: err.uploadPath }, function() {
36953690
self.processFile(file, { chunkSize: chunkSize, uploadId: uploadId, serverUploadId: err.uploadId, uploadPath: err.uploadPath, fileOffset: err.fileOffset });
36963691
});
36973692
});

dist/predicsis-jsSDK.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/predicsis-jsSDK.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/helper/uploadHelper.js

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,18 @@ angular
4141
var offset = options.fileOffset || 0;
4242
var done = false;
4343
var index = 0;
44-
var result = {};
45-
result[Symbol.iterator] = function() {
46-
return {
47-
next: function() {
48-
if (done) {
49-
return { done: true };
50-
}
51-
var chunk = file.slice(offset, offset + CHUNK_SIZE);
52-
done = chunk.size < CHUNK_SIZE;
53-
offset += CHUNK_SIZE;
54-
index++;
55-
return { done: false, value: { chunk: chunk, index: index } };
44+
return {
45+
next: function() {
46+
if (done) {
47+
return { done: true };
5648
}
57-
};
49+
var chunk = file.slice(offset, offset + CHUNK_SIZE);
50+
done = chunk.size < CHUNK_SIZE;
51+
offset += CHUNK_SIZE;
52+
index++;
53+
return { done: false, value: { chunk: chunk, index: index } };
54+
}
5855
};
59-
return result;
6056
}
6157

6258
function uploadChunk(chunk, index, id, path) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "predicsis_ml_sdk-javascript",
3-
"version": "0.7.0",
3+
"version": "0.7.1",
44
"description": "Javascript SDK for PredicSis ML API",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)