cinco/glitch-images
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

load localforage key from config instead of passing it as an argument

Browse Source
This commit is contained in:
Georg Fischer 2015-12-30 15:20:01 +01:00
parent 14ec6fbd1c
commit 39a4d99aad
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/models/settingsmodel.js
View File

@ -2,9 +2,9 @@
define( define(
[ 'config', 'util/browser', 'util/object', 'util/addpublishers', 'lib/localforage.nopromises' ], [ 'config', 'util/browser', 'util/object', 'util/addpublishers', 'lib/localforage.nopromises' ],
function ( config, browser, objectHelper, addPublishers, localforage ) { function ( config, browser, objectHelper, addPublishers, localforage ) {
function SettingsModel ( storageKey ) { function SettingsModel () {
if ( ! ( this instanceof SettingsModel ) ) { if ( ! ( this instanceof SettingsModel ) ) {
return new SettingsModel( storageKey ); return new SettingsModel();
} }
var self = this; var self = this;
@ -21,12 +21,10 @@ define(
var settings = { }; var settings = { };
storageKey = storageKey || 'settings';
if ( useLocalForage && browser.test( 'webworker' ) && browser.test( 'browserdb' ) && ! browser.test( 'safari' ) ) { if ( useLocalForage && browser.test( 'webworker' ) && browser.test( 'browserdb' ) && ! browser.test( 'safari' ) ) {
worker = new Worker( config.workers.settings ); worker = new Worker( config.workers.settings );
worker.addEventListener( 'message', workerResponded, false ); worker.addEventListener( 'message', workerResponded, false );
sendMessageToWorker( 'setStorageKey', storageKey ); sendMessageToWorker( 'setStorageKey', config.keys.settings );
sendMessageToWorker( 'setDefaultSettings', defaultSettings ); sendMessageToWorker( 'setDefaultSettings', defaultSettings );
} else { } else {
settingsUpdated( defaultSettings ); settingsUpdated( defaultSettings );
@ -79,7 +77,7 @@ define(
if ( worker ) { if ( worker ) {
sendMessageToWorker( 'save', newSettings ); sendMessageToWorker( 'save', newSettings );
} else { } else {
localforage.setItem( storageKey, newSettings, function ( err, savedSettings ) { localforage.setItem( config.keys.settings, newSettings, function ( err, savedSettings ) {
if ( err ) { if ( err ) {
sendError( 'settings.error.save' ); sendError( 'settings.error.save' );
console && console.log( 'localforage error', err ); console && console.log( 'localforage error', err );
@ -100,7 +98,7 @@ define(
if ( worker ) { if ( worker ) {
sendMessageToWorker( 'load' ); sendMessageToWorker( 'load' );
} else { } else {
localforage.getItem( storageKey, function ( err, loadedSettings ) { localforage.getItem( config.keys.settings, function ( err, loadedSettings ) {
if ( err ) { if ( err ) {
sendError( 'settings.error.load' ); sendError( 'settings.error.load' );
console && console.log( 'localforage error', err ); console && console.log( 'localforage error', err );