From 9196c3192235a24710e2edbda7ed2483a9d904f3 Mon Sep 17 00:00:00 2001 From: Nathan Grebowiec Date: Fri, 20 Feb 2015 16:11:02 -0600 Subject: [PATCH 1/4] add ; to end of assignment Not needed, but style choice and shuts jshint up --- src/filesystem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filesystem.js b/src/filesystem.js index 6336ab6..b34882f 100644 --- a/src/filesystem.js +++ b/src/filesystem.js @@ -12,7 +12,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) { requestQuota: function(type, bytes, successFn, errorFn) { errorFn(new Error("Not implemented")); } - } + }; //wrap resolve/reject in an empty $timeout so it happens within the Angular call stack //easier than .apply() since no scope is needed and doesn't error if already within an apply From c69dec029b3621fe2824ebafa4362d9ade7e52fc Mon Sep 17 00:00:00 2001 From: Nathan Grebowiec Date: Fri, 20 Feb 2015 16:29:32 -0600 Subject: [PATCH 2/4] move to navigator.webkitPersistentStorage window.webkitStorageInfo is deprecated --- src/filesystem.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/filesystem.js b/src/filesystem.js index b34882f..ab9114a 100644 --- a/src/filesystem.js +++ b/src/filesystem.js @@ -8,7 +8,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) { window.resolveLocalFileSystemURL = window.resolveLocalFileSystemURL || window.webkitResolveLocalFileSystemURL; window.requestFileSystem = window.webkitRequestFileSystem || window.requestFileSystem; - window.webkitStorageInfo = window.webkitStorageInfo || { + navigator.webkitPersistentStorage = navigator.webkitPersistentStorage || { requestQuota: function(type, bytes, successFn, errorFn) { errorFn(new Error("Not implemented")); } @@ -35,7 +35,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) { }); }; - window.webkitStorageInfo.requestQuota(window.PERSISTENT, DEFAULT_QUOTA_MB*1024*1024, function(grantedBytes) { + navigator.webkitPersistentStorage.requestQuota(DEFAULT_QUOTA_MB*1024*1024, function(grantedBytes) { if(window.cordova) { document.addEventListener('deviceready', function() { requestFsFn(grantedBytes); }, false); } else { @@ -52,7 +52,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) { getCurrentUsage: function() { var def = $q.defer(); - webkitStorageInfo.queryUsageAndQuota(window.PERSISTENT, function(used, quota) { + navigator.webkitPersistentStorage.queryUsageAndQuota(function(used, quota) { safeResolve(def, {'used': used, 'quota': quota}); }, function(e) { safeReject(def, {text: "Error getting quota information", obj: e}); @@ -63,7 +63,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) { requestQuota: function(newQuotaMB) { var def = $q.defer(); - window.webkitStorageInfo.requestQuota(window.PERSISTENT, newQuotaMB*1024*1024, function(grantedBytes) { + navigator.webkitPersistentStorage.requestQuota(newQuotaMB*1024*1024, function(grantedBytes) { safeResolve(def, grantedBytes); }, function(e) { safeReject(def, {text: "Error requesting quota increase", obj: e}); From 32b8a27f6003decd8c0a544c9aa9c9408356561c Mon Sep 17 00:00:00 2001 From: Nathan Grebowiec Date: Fri, 20 Feb 2015 16:40:41 -0600 Subject: [PATCH 3/4] include filename in error return the filename with the error of it not loading/opening the file --- src/filesystem.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/filesystem.js b/src/filesystem.js index ab9114a..2c680f7 100644 --- a/src/filesystem.js +++ b/src/filesystem.js @@ -245,7 +245,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) { fileEntry.file(function(file) { safeResolve(def, file); }, function(e) { - safeReject(def, {text: "Error getting file object", obj: e}); + safeReject(def, {text: "Error getting file object", obj: e, fileName: fileName}); }); }, function(err) { def.reject(err); @@ -260,7 +260,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) { fs.root.getFile(fileName, {}, function(fileEntry) { safeResolve(def, fileEntry); }, function(e) { - safeReject(def, {text: "Error getting file", obj: e}); + safeReject(def, {text: "Error getting file", obj: e, fileName: fileName}); }); }, function(err) { def.reject(err); From 345818d34ab120c8ad58271f79a6d1bf5ae735a8 Mon Sep 17 00:00:00 2001 From: Nathan Grebowiec Date: Fri, 20 Feb 2015 19:56:33 -0600 Subject: [PATCH 4/4] update function signature remove type since it isn't needed any longer --- src/filesystem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filesystem.js b/src/filesystem.js index 2c680f7..39df9f5 100644 --- a/src/filesystem.js +++ b/src/filesystem.js @@ -9,7 +9,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) { window.requestFileSystem = window.webkitRequestFileSystem || window.requestFileSystem; navigator.webkitPersistentStorage = navigator.webkitPersistentStorage || { - requestQuota: function(type, bytes, successFn, errorFn) { + requestQuota: function(bytes, successFn, errorFn) { errorFn(new Error("Not implemented")); } };