Merge lp:~bhdouglass/rockwork/localstorage-fix into lp:rockwork

Proposed by Brian Douglass
Status: Merged
Merged at revision: 87
Proposed branch: lp:~bhdouglass/rockwork/localstorage-fix
Merge into: lp:rockwork
Diff against target: 26 lines (+7/-2)
1 file modified
rockworkd/libpebble/jskit/jskitsetup.js (+7/-2)
To merge this branch: bzr merge lp:~bhdouglass/rockwork/localstorage-fix
Reviewer Review Type Date Requested Status
Michael Zanetti Pending
Review via email: mp+285728@code.launchpad.net

Description of the change

Fixed localStorage not accepting 0 as a key (this fixes Rockodi).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rockworkd/libpebble/jskit/jskitsetup.js'
2--- rockworkd/libpebble/jskit/jskitsetup.js 2016-02-02 06:04:06 +0000
3+++ rockworkd/libpebble/jskit/jskitsetup.js 2016-02-11 14:16:13 +0000
4@@ -104,7 +104,12 @@
5 var storage = {};
6 Object.defineProperty(storage, "getItem", {
7 value: function (key) {
8- return (key && storage[key]) ? storage[key] : null;
9+ var value = null;
10+ if (key !== undefined && key !== null && storage[key] !== undefined) {
11+ value = storage[key];
12+ }
13+
14+ return value;
15 },
16 writable: false,
17 configurable: false,
18@@ -122,7 +127,7 @@
19
20 Object.defineProperty(storage, "setItem", {
21 value: function (key, value) {
22- if (key) {
23+ if (key !== undefined && key !== null) {
24 _jskit.localstorage.setItem(key, value);
25 storage[key] = (value && value.toString) ? value.toString() : value;
26 return true;

Subscribers

People subscribed via source and target branches