fixes

joni2back · Sep 16, 2015 · ecfb1e6 · ecfb1e6
1 parent c468f63
commit ecfb1e6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/dist/angular-filemanager.min.js b/dist/angular-filemanager.min.js
diff --git a/src/js/entities/item.js b/src/js/entities/item.js
@@ -42,6 +42,9 @@
         };
 
         Item.prototype.deferredHandler = function(data, deferred, defaultMsg) {
+            if (!data || typeof data !== 'object') {
+                this.error = 'Bridge response error, please check the docs';
+            }
             if (data.result && data.result.error) {
                 this.error = data.result.error;
             }

diff --git a/src/js/services/filenavigator.js b/src/js/services/filenavigator.js
@@ -14,8 +14,8 @@
         };
 
         FileNavigator.prototype.deferredHandler = function(data, deferred, defaultMsg) {
-            if (typeof data !== 'object') {
-                this.error = 'Bridge response error, please check the docs.';
+            if (!data || typeof data !== 'object') {
+                this.error = 'Bridge response error, please check the docs';
             }
             if (!this.error && data.result && data.result.error) {
                 this.error = data.result.error;

diff --git a/src/js/services/fileuploader.js b/src/js/services/fileuploader.js
@@ -3,25 +3,26 @@
     angular.module('FileManagerApp').service('fileUploader', ['$http', '$q', 'fileManagerConfig', function ($http, $q, fileManagerConfig) {
 
         function deferredHandler(data, deferred, errorMessage) {
+            if (!data || typeof data !== 'object') {
+                return deferred.reject('Bridge response error, please check the docs');
+            }
             if (data.result && data.result.error) {
-                return deferred.reject(data)
+                return deferred.reject(data);
             }
             if (data.error) {
-                return deferred.reject(data)
+                return deferred.reject(data);
             }
             if (errorMessage) {
-                return deferred.reject(errorMessage)
+                return deferred.reject(errorMessage);
             }
             deferred.resolve(data);
         }
 
         this.requesting = false; 
         this.upload = function(fileList, path) {
-
             if (! window.FormData) {
                 throw new Error('Unsupported browser version');
             }
-
             var self = this;
             var form = new window.FormData();
             var deferred = $q.defer();