Added error message if dropbox content failed to be loaded

Gyran · Apr 11, 2014 · 070236b · 070236b
1 parent 9502685
commit 070236b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/scripts/OnePassword.js b/scripts/OnePassword.js
@@ -11,6 +11,8 @@
 
         Q.all([this.getContents(), this.getEncryptionKeys()]).then(function () {
             deferred.resolve();
+        }, function () {
+            deferred.reject();
         });
 
         return deferred.promise;
@@ -73,7 +75,7 @@
         keychainItem.decrypt(keychain);
     };
 
-    var getJson = function (url, cb) {
+    var getJson = function (url) {
         var deferred = Q.defer();
 
         var xhr = new XMLHttpRequest();
@@ -89,7 +91,7 @@
         };
 
         xhr.onerror = function () {
-            cb(xhr.statusText);
+            deferred.reject(new Error(xhr.statusText));
         };
 
         xhr.send();

diff --git a/scripts/popup.js b/scripts/popup.js
@@ -28,6 +28,8 @@
             onepassword = new window.OnePassword(items.baseurl);
             onepassword.load().then(function () {
                 btnUnlock.disabled = false;
+            }, function () {
+                error.textContent = "Could not load onepassword data. Make sure you are logged in to dropbox and that the url is correct on the options page.";
             });
 
             deferred.resolve(onepassword);

diff --git a/style/style.css b/style/style.css
@@ -60,7 +60,6 @@
 .error {
     text-align: center;
     color: #f00;
-    height: 40px;
     margin-top: 10px;
 }