From 39a4d99aad4a6d1d675dbf2c9ec4cbb45232598b Mon Sep 17 00:00:00 2001
From: Georg Fischer <snorpey@gmail.com>
Date: Wed, 30 Dec 2015 15:20:01 +0100
Subject: [PATCH] load localforage key from config instead of passing it as an
 argument

---
 scripts/models/settingsmodel.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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