Skip to content

Commit ecfb1e6

Browse files
committed
fixes
1 parent c468f63 commit ecfb1e6

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

dist/angular-filemanager.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/entities/item.js

+3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
};
4343

4444
Item.prototype.deferredHandler = function(data, deferred, defaultMsg) {
45+
if (!data || typeof data !== 'object') {
46+
this.error = 'Bridge response error, please check the docs';
47+
}
4548
if (data.result && data.result.error) {
4649
this.error = data.result.error;
4750
}

src/js/services/filenavigator.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
};
1515

1616
FileNavigator.prototype.deferredHandler = function(data, deferred, defaultMsg) {
17-
if (typeof data !== 'object') {
18-
this.error = 'Bridge response error, please check the docs.';
17+
if (!data || typeof data !== 'object') {
18+
this.error = 'Bridge response error, please check the docs';
1919
}
2020
if (!this.error && data.result && data.result.error) {
2121
this.error = data.result.error;

src/js/services/fileuploader.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,26 @@
33
angular.module('FileManagerApp').service('fileUploader', ['$http', '$q', 'fileManagerConfig', function ($http, $q, fileManagerConfig) {
44

55
function deferredHandler(data, deferred, errorMessage) {
6+
if (!data || typeof data !== 'object') {
7+
return deferred.reject('Bridge response error, please check the docs');
8+
}
69
if (data.result && data.result.error) {
7-
return deferred.reject(data)
10+
return deferred.reject(data);
811
}
912
if (data.error) {
10-
return deferred.reject(data)
13+
return deferred.reject(data);
1114
}
1215
if (errorMessage) {
13-
return deferred.reject(errorMessage)
16+
return deferred.reject(errorMessage);
1417
}
1518
deferred.resolve(data);
1619
}
1720

1821
this.requesting = false;
1922
this.upload = function(fileList, path) {
20-
2123
if (! window.FormData) {
2224
throw new Error('Unsupported browser version');
2325
}
24-
2526
var self = this;
2627
var form = new window.FormData();
2728
var deferred = $q.defer();

0 commit comments

Comments
 (0)