From c2f2ff18e5838040d5e9ce611fc483a962e73f49 Mon Sep 17 00:00:00 2001
From: Matthias Seemann <seemann@visisoft.de>
Date: Tue, 5 Jan 2016 21:37:41 +0100
Subject: [PATCH] Making getItem Storage API conforming by returning null
 instead of undefined for not-existing entries

---
 dist/memorystorage.min.js     |  2 +-
 dist/memorystorage.min.js.map |  2 +-
 dist/memorystorage.umd.js     |  2 +-
 src/memorystorage.js          |  2 +-
 tests/test.js                 | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dist/memorystorage.min.js b/dist/memorystorage.min.js
index 99e1c7b..1829053 100644
--- a/dist/memorystorage.min.js
+++ b/dist/memorystorage.min.js
@@ -1,3 +1,3 @@
 /*! [memorystorage 0.10.0](http://download.github.io/memorystorage) Copyright 2015 by [Stijn de Witt](http://StijnDeWitt.com). Some rights reserved. License: [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) */
-!function(u,m,d){"function"==typeof define&&define.amd?define("memorystorage",[],function(){return d()}):"object"==typeof exports?module.exports=d():u[m]=d()}(this,"MemoryStorage",function(){"use strict";function MemoryStorage(e){function f(){var b=Object.keys(g).filter(function(b){return!(b in a)});return b.concat(Object.keys(h))}e=e||"global";var g=c[e];if(g)return g;if(!(this instanceof MemoryStorage))return new MemoryStorage(e);g=c[e]=this;var h={};return Object.defineProperty(g,b,{enumerable:!1,configurable:!0,get:function(){return h}}),Object.defineProperty(g,"id",{enumerable:!0,configurable:!0,get:function(){return e}}),Object.defineProperty(g,"length",{enumerable:!0,configurable:!0,get:function(){return f().length}}),g.getItem=function(c){return c in a?this[b][c]:this[c]},g.setItem=function(c,e){c in a?this[b][c]=e:this[c]=e},g.removeItem=function(c){c in a?delete this[b][c]:delete this[c]},g.key=function(a){var b=f();return a>=0&&a<b.length?b[a]:null},g.clear=function(){for(var c,e=(Object.keys(this).filter(function(b){return!(b in a)})),f=0;c=e[f];f++)c in a||delete this[c];e=Object.keys(this[b]);for(var c,f=0;c=e[f];f++)delete this[b][c]},"undefined"==typeof Proxy?g:new Proxy(g,{ownKeys:function(){return f()}})}var a={clear:1,getItem:1,id:1,key:1,length:1,removeItem:1,setItem:1},b="__memorystorage_cloaked_items__",c={};return MemoryStorage});
+!function(u,m,d){"function"==typeof define&&define.amd?define("memorystorage",[],function(){return d()}):"object"==typeof exports?module.exports=d():u[m]=d()}(this,"MemoryStorage",function(){"use strict";function MemoryStorage(e){function f(){var b=Object.keys(g).filter(function(b){return!(b in a)});return b.concat(Object.keys(h))}e=e||"global";var g=c[e];if(g)return g;if(!(this instanceof MemoryStorage))return new MemoryStorage(e);g=c[e]=this;var h={};return Object.defineProperty(g,b,{enumerable:!1,configurable:!0,get:function(){return h}}),Object.defineProperty(g,"id",{enumerable:!0,configurable:!0,get:function(){return e}}),Object.defineProperty(g,"length",{enumerable:!0,configurable:!0,get:function(){return f().length}}),g.getItem=function(c){return(c in a?this[b][c]:this[c])||null},g.setItem=function(c,e){c in a?this[b][c]=e:this[c]=e},g.removeItem=function(c){c in a?delete this[b][c]:delete this[c]},g.key=function(a){var b=f();return a>=0&&a<b.length?b[a]:null},g.clear=function(){for(var c,e=(Object.keys(this).filter(function(b){return!(b in a)})),f=0;c=e[f];f++)c in a||delete this[c];e=Object.keys(this[b]);for(var c,f=0;c=e[f];f++)delete this[b][c]},"undefined"==typeof Proxy?g:new Proxy(g,{ownKeys:function(){return f()}})}var a={clear:1,getItem:1,id:1,key:1,length:1,removeItem:1,setItem:1},b="__memorystorage_cloaked_items__",c={};return MemoryStorage});
 //# sourceMappingURL=memorystorage.min.js.map
\ No newline at end of file
diff --git a/dist/memorystorage.min.js.map b/dist/memorystorage.min.js.map
index 8c44652..0a127a6 100644
--- a/dist/memorystorage.min.js.map
+++ b/dist/memorystorage.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"memorystorage.min.js","sources":["memorystorage.umd.js"],"names":["u","m","d","define","amd","exports","module","this","MemoryStorage","id","enumerableKeys","keys","Object","result","filter","x","API","concat","cloaked","storage","defineProperty","CLOAK","enumerable","configurable","get","length","getItem","key","setItem","val","removeItem","idx","clear","i","Proxy","ownKeys"],"mappings":";CAAC,SAAUA,EAAGC,EAAGC,GACM,kBAAXC,SAAyBA,OAAOC,IAAMD,OAAO,mBAAqB,WAAW,MAAQD,OACpE,gBAAZG,SAAuBC,OAAOD,QAAUH,IAClDF,EAAEC,GAAKC,KACZK,KAAM,gBAAiB,WAAY,YAgCrC,SAASC,eAAcC,GAyBtB,QAASC,KACR,GAAIC,GAAOC,OAAOD,KAAKE,GAAQC,OAAO,SAASC,GAAG,QAASA,IAAKC,KAChE,OAAOL,GAAKM,OAAOL,OAAOD,KAAKO,IAzBhCT,EAAKA,GAAM,QAEX,IAAII,GAASM,EAAQV,EAErB,IAAII,EAAS,MAAOA,EAGpB,MAAON,eAAgBC,gBAAiB,MAAO,IAAIA,eAAcC,EAGjEI,GAASM,EAAQV,GAAMF,IAGvB,IAAIW,KA6DJ,OA5DAN,QAAOQ,eAAeP,EAAQQ,GAC7BC,YAAY,EACZC,cAAc,EACdC,IAAK,WAAW,MAAON,MAYxBN,OAAOQ,eAAeP,EAAQ,MAC7BS,YAAY,EACZC,cAAc,EACdC,IAAK,WAAW,MAAOf,MAGxBG,OAAOQ,eAAeP,EAAQ,UAC7BS,YAAY,EACZC,cAAc,EACdC,IAAK,WACJ,MAAOd,KAAiBe,UAI1BZ,EAAOa,QAAU,SAA+BC,GAC/C,MAAOA,KAAOX,GAAMT,KAAKc,GAAOM,GAAOpB,KAAKoB,IAE7Cd,EAAOe,QAAU,SAA+BD,EAAKE,GAChDF,IAAOX,GAAMT,KAAKc,GAAOM,GAAOE,EAC9BtB,KAAKoB,GAAOE,GAEnBhB,EAAOiB,WAAa,SAAkCH,GACjDA,IAAOX,SAAaT,MAAKc,GAAOM,SACvBpB,MAAKoB,IAOnBd,EAAOc,IAAM,SAA2BI,GACvC,GAAIpB,GAAOD,GACX,OAAOqB,IAAO,GAAKA,EAAMpB,EAAKc,OAASd,EAAKoB,GAAO,MAEpDlB,EAAOmB,MAAQ,WAEd,IAAK,GAAQL,GADThB,GAAOC,OAAOD,KAAKJ,MAAMO,OAAO,SAASC,GAAG,QAASA,IAAKC,OACrDiB,EAAE,EAAON,EAAIhB,EAAKsB,GAAIA,IACvBN,IAAOX,UAAcT,MAAKoB,EAElChB,GAAOC,OAAOD,KAAKJ,KAAKc,GACxB,KAAK,GAAQM,GAAJM,EAAE,EAAON,EAAIhB,EAAKsB,GAAIA,UACvB1B,MAAKc,GAAOM,IAIA,mBAAVO,OAEHrB,EAGD,GAAIqB,OAAMrB,GAChBsB,QAAS,WACR,MAAOzB,QA1GV,GAAIM,IAAOgB,MAAQ,EAAGN,QAAU,EAAGjB,GAAK,EAAGkB,IAAM,EAAGF,OAAS,EAAGK,WAAa,EAAGF,QAAU,GACzFP,EAAQ,kCAGLF,IA4GJ,OAAOX"}
\ No newline at end of file
+{"version":3,"sources":["memorystorage.umd.js"],"names":["u","m","d","define","amd","exports","module","this","MemoryStorage","id","enumerableKeys","keys","Object","result","filter","x","API","concat","cloaked","storage","defineProperty","CLOAK","enumerable","configurable","get","length","getItem","key","setItem","val","removeItem","idx","clear","i","Proxy","ownKeys"],"mappings":";CAAC,SAAUA,EAAGC,EAAGC,GACM,kBAAXC,SAAyBA,OAAOC,IAAMD,OAAO,mBAAqB,WAAW,MAAQD,OACpE,gBAAZG,SAAuBC,OAAOD,QAAUH,IAClDF,EAAEC,GAAKC,KACZK,KAAM,gBAAiB,WAAY,YAgCrC,SAASC,eAAcC,GAyBtB,QAASC,KACR,GAAIC,GAAOC,OAAOD,KAAKE,GAAQC,OAAO,SAASC,GAAG,QAASA,IAAKC,KAChE,OAAOL,GAAKM,OAAOL,OAAOD,KAAKO,IAzBhCT,EAAKA,GAAM,QAEX,IAAII,GAASM,EAAQV,EAErB,IAAII,EAAS,MAAOA,EAGpB,MAAON,eAAgBC,gBAAiB,MAAO,IAAIA,eAAcC,EAGjEI,GAASM,EAAQV,GAAMF,IAGvB,IAAIW,KA6DJ,OA5DAN,QAAOQ,eAAeP,EAAQQ,GAC7BC,YAAY,EACZC,cAAc,EACdC,IAAK,WAAW,MAAON,MAYxBN,OAAOQ,eAAeP,EAAQ,MAC7BS,YAAY,EACZC,cAAc,EACdC,IAAK,WAAW,MAAOf,MAGxBG,OAAOQ,eAAeP,EAAQ,UAC7BS,YAAY,EACZC,cAAc,EACdC,IAAK,WACJ,MAAOd,KAAiBe,UAI1BZ,EAAOa,QAAU,SAA+BC,GAC/C,OAAQA,IAAOX,GAAMT,KAAKc,GAAOM,GAAOpB,KAAKoB,KAAS,MAEvDd,EAAOe,QAAU,SAA+BD,EAAKE,GAChDF,IAAOX,GAAMT,KAAKc,GAAOM,GAAOE,EAC9BtB,KAAKoB,GAAOE,GAEnBhB,EAAOiB,WAAa,SAAkCH,GACjDA,IAAOX,SAAaT,MAAKc,GAAOM,SACvBpB,MAAKoB,IAOnBd,EAAOc,IAAM,SAA2BI,GACvC,GAAIpB,GAAOD,GACX,OAAOqB,IAAO,GAAKA,EAAMpB,EAAKc,OAASd,EAAKoB,GAAO,MAEpDlB,EAAOmB,MAAQ,WAEd,IAAK,GAAQL,GADThB,GAAOC,OAAOD,KAAKJ,MAAMO,OAAO,SAASC,GAAG,QAASA,IAAKC,OACrDiB,EAAE,EAAON,EAAIhB,EAAKsB,GAAIA,IACvBN,IAAOX,UAAcT,MAAKoB,EAElChB,GAAOC,OAAOD,KAAKJ,KAAKc,GACxB,KAAK,GAAQM,GAAJM,EAAE,EAAON,EAAIhB,EAAKsB,GAAIA,UACvB1B,MAAKc,GAAOM,IAIA,mBAAVO,OAEHrB,EAGD,GAAIqB,OAAMrB,GAChBsB,QAAS,WACR,MAAOzB,QA1GV,GAAIM,IAAOgB,MAAQ,EAAGN,QAAU,EAAGjB,GAAK,EAAGkB,IAAM,EAAGF,OAAS,EAAGK,WAAa,EAAGF,QAAU,GACzFP,EAAQ,kCAGLF,IA4GJ,OAAOX","file":"memorystorage.min.js"}
\ No newline at end of file
diff --git a/dist/memorystorage.umd.js b/dist/memorystorage.umd.js
index 649b45b..9d746b3 100644
--- a/dist/memorystorage.umd.js
+++ b/dist/memorystorage.umd.js
@@ -80,7 +80,7 @@ function MemoryStorage(id) {// jshint ignore:line
 	});
 	// Create API methods
 	result.getItem = function MemoryStorage_getItem(key) {
-		return key in API ? this[CLOAK][key] : this[key];
+		return (key in API ? this[CLOAK][key] : this[key]) || null;
 	};
 	result.setItem = function MemoryStorage_setItem(key, val) {
 		if (key in API) {this[CLOAK][key] = val;}
diff --git a/src/memorystorage.js b/src/memorystorage.js
index d258f3b..b3d020d 100644
--- a/src/memorystorage.js
+++ b/src/memorystorage.js
@@ -74,7 +74,7 @@ function MemoryStorage(id) {// jshint ignore:line
 	});
 	// Create API methods
 	result.getItem = function MemoryStorage_getItem(key) {
-		return key in API ? this[CLOAK][key] : this[key];
+		return (key in API ? this[CLOAK][key] : this[key]) || null;
 	};
 	result.setItem = function MemoryStorage_setItem(key, val) {
 		if (key in API) {this[CLOAK][key] = val;}
diff --git a/tests/test.js b/tests/test.js
index a8203ca..58d1479 100644
--- a/tests/test.js
+++ b/tests/test.js
@@ -39,7 +39,7 @@ QUnit.test("W3C Web Storage API Compliance Test", function( assert ) {
 	assert.ok(store.length===2, "item removed correctly with removeItem");
 	store.removeItem('test1');
 	assert.ok(store.length===2, "double removal has no effect");
-	assert.ok(store.getItem('test1')===undefined, "get removed item returns undefined");
+	assert.ok(store.getItem('test1')===null, "get removed item returns null");
 
 	store.clear();
 	store.setItem('getItem', 'test');
@@ -53,21 +53,21 @@ QUnit.test("W3C Web Storage API Compliance Test", function( assert ) {
 				"store API key names are included in the key enumeration");
 	}
 	store.removeItem('getItem');
-	assert.ok(store.getItem('getItem') === undefined, "After removal of item with API name, getItem returns undefined.");
+	assert.ok(store.getItem('getItem') === null, "After removal of item with API name, getItem returns null.");
 	
 	var glob = new MemoryStorage();
 	assert.ok(glob.length===0, "local store items are not visible globally");
 	glob.setItem('glob0', 'data0');
 	assert.ok(glob.length===1 && glob.getItem('glob0')==='data0', "globally stored items are retrieved ok");
-	assert.ok(store.getItem('glob0')===undefined, "global items are not visible in the local store");
+	assert.ok(store.getItem('glob0')===null, "global items are not visible in the local store");
 	glob.removeItem('glob0');
 	assert.ok(glob.length===0, "global length is updated correctly");
 	assert.ok(glob.key(0)===null, "global keys are removed correctly");
-	assert.ok(glob.getItem('glob0')===undefined, "global values are removed correctly");
+	assert.ok(glob.getItem('glob0')===null, "global values are removed correctly");
 
 	assert.ok(store.length===0, "store is cleared");
 	assert.ok(store.key(0)===null, "no keys in cleared store");
-	assert.ok(store.getItem('test0')===undefined, "no values in cleared store");
+	assert.ok(store.getItem('test0')===null, "no values in cleared store");
 });
 
 QUnit.test("Multiple Instances Test", function( assert ) {