From f90f6328ddceb808f5ccc2611b241f90cf6ae621 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 14 May 2015 13:44:46 -0700
Subject: [PATCH] Don't resolve the background page til storage is ready

---
 js/chromium.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/js/chromium.js b/js/chromium.js
index ae5437dc3..105d6253b 100644
--- a/js/chromium.js
+++ b/js/chromium.js
@@ -73,15 +73,18 @@
         },
 
         getBackground: function(callback) {
+            var getBackground;
             if (chrome.extension) {
-                return new Promise(function(resolve) {
-                    callback(chrome.extension.getBackgroundPage());
+                var bg = chrome.extension.getBackgroundPage();
+                bg.storage.onready(function() {
+                    callback(bg);
                     resolve();
                 });
             } else if (chrome.runtime) {
-                return new Promise(function(resolve) {
-                    chrome.runtime.getBackgroundPage(callback);
-                    resolve();
+                chrome.runtime.getBackgroundPage(function(bg) {
+                    bg.storage.onready(function() {
+                        callback(bg);
+                    });
                 });
             }
         },