Skip to content

add ; to end of assignment #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gweedo767 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

add ; to end of assignment #11

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9196c31
add ; to end of assignment
gweedo767 Feb 20, 2015
c69dec0
move to navigator.webkitPersistentStorage
gweedo767 Feb 20, 2015
32b8a27
include filename in error
gweedo767 Feb 20, 2015
345818d
update function signature
gweedo767 Feb 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/filesystem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) {
window.resolveLocalFileSystemURL = window.resolveLocalFileSystemURL || window.webkitResolveLocalFileSystemURL;

window.requestFileSystem = window.webkitRequestFileSystem || window.requestFileSystem;
window.webkitStorageInfo = window.webkitStorageInfo || {
requestQuota: function(type, bytes, successFn, errorFn) {
navigator.webkitPersistentStorage = navigator.webkitPersistentStorage || {
requestQuota: function(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
Expand All @@ -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 {
Expand All @@ -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});
Expand All @@ -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});
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down