Skip to content
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

Refactor how the database is read in ViewHistory #4705

Merged
merged 2 commits into from
Apr 29, 2014
Merged

Refactor how the database is read in ViewHistory #4705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bb19fa
Catch error when the creation of localStorage polyfill fails in the g…
Snuffleupagus Apr 29, 2014
ec50aa4
Refactor how the database is read in ViewHistory
Snuffleupagus Apr 29, 2014
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
25 changes: 16 additions & 9 deletions web/compatibility.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,13 +547,20 @@ if (typeof PDFJS === 'undefined') {
return;
}
} catch (e) { }
window.localStorage = {
data: Object.create(null),
getItem: function (key) {
return this.data[key];
},
setItem: function (key, value) {
this.data[key] = value;
}
};
// When the generic viewer is used in Firefox the following code will fail
// when the preference 'network.cookie.lifetimePolicy' is set to 1,
// see Mozilla bug 365772.
try {
window.localStorage = {
data: Object.create(null),
getItem: function (key) {
return this.data[key];
},
setItem: function (key, value) {
this.data[key] = value;
}
};
} catch (e) {
console.log('Unable to create polyfill for localStorage');
}
})();
67 changes: 29 additions & 38 deletions web/view_history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,40 +31,12 @@
var ViewHistory = (function ViewHistoryClosure() {
function ViewHistory(fingerprint) {
this.fingerprint = fingerprint;
var initializedPromiseResolve;
this.isInitializedPromiseResolved = false;
this.initializedPromise = new Promise(function (resolve) {
initializedPromiseResolve = resolve;
});

var resolvePromise = (function ViewHistoryResolvePromise(db) {
this.initializedPromise =
this._readFromStorage().then(function (databaseStr) {
this.isInitializedPromiseResolved = true;
this.initialize(db || '{}');
initializedPromiseResolve();
}).bind(this);

//#if B2G
// asyncStorage.getItem('database', resolvePromise);
//#endif

//#if FIREFOX || MOZCENTRAL
// var sessionHistory;
// try {
// // Workaround for security error when the preference
// // network.cookie.lifetimePolicy is set to 1, see Mozilla Bug 365772.
// sessionHistory = sessionStorage.getItem('pdfjsHistory');
// } catch (ex) {}
// resolvePromise(sessionHistory);
//#endif

//#if !(FIREFOX || MOZCENTRAL || B2G)
resolvePromise(localStorage.getItem('database'));
//#endif
}

ViewHistory.prototype = {
initialize: function ViewHistory_initialize(database) {
database = JSON.parse(database);
var database = JSON.parse(databaseStr || '{}');
if (!('files' in database)) {
database.files = [];
}
Expand All @@ -84,25 +56,44 @@ var ViewHistory = (function ViewHistoryClosure() {
}
this.file = database.files[index];
this.database = database;
},
}.bind(this));
}

ViewHistory.prototype = {
_writeToStorage: function ViewHistory_writeToStorage() {
var databaseStr = JSON.stringify(this.database);
return new Promise(function (resolve) {
var databaseStr = JSON.stringify(this.database);

//#if B2G
// asyncStorage.setItem('database', databaseStr);
// asyncStorage.setItem('database', databaseStr, resolve);
//#endif

//#if FIREFOX || MOZCENTRAL
// try {
// // See comment in try-catch block above.
// sessionStorage.setItem('pdfjsHistory', databaseStr);
// } catch (ex) {}
// resolve();
//#endif

//#if !(FIREFOX || MOZCENTRAL || B2G)
localStorage.setItem('database', databaseStr);
resolve();
//#endif
}.bind(this));
},

_readFromStorage: function ViewHistory_readFromStorage() {
return new Promise(function (resolve) {
//#if B2G
// asyncStorage.getItem('database', resolve);
//#endif

//#if FIREFOX || MOZCENTRAL
// resolve(sessionStorage.getItem('pdfjsHistory'));
//#endif

//#if !(FIREFOX || MOZCENTRAL || B2G)
localStorage.setItem('database', databaseStr);
resolve(localStorage.getItem('database'));
//#endif
});
},

set: function ViewHistory_set(name, val) {
Expand Down