notifier: add badge; bump version

diff --git a/utils/notifier/background.html b/utils/notifier/background.html
index a26e9fc472b275d797036b206db3c46445e815d2..8a3acb2beb70b4779fd6cd91955cbd9e0c2645b5 100644 (file)
--- a/utils/notifier/background.html
+++ b/utils/notifier/background.html
@@ -30,16 +30,30 @@ function update() {
 
                        var icon = new Object();
                        var title = new Object();
+                       var badge = new Object();
+
+                       var showBadge = localStorage["show_badge"];
 
                        if (xhr.status == 200) {
                                var unread = parseInt(xhr.responseText);
        
                                if (unread > 0) {
-                                       icon.path = "images/alert.png";         
+
+                                       icon.path = "images/alert.png";
                                        title.title = "You have %s unread articles.".replace("%s", unread);
+                                       badge.text = unread + "";
+                               } else if (unread == -1) {
+                                       icon.path = "images/error.png";         
+
+                                       var errorMsg = xhr.responseText.split(";")[1];
+
+                                       title.title = "Error: %s.".replace("%s", errorMsg.trim());
+                                       badge.text = "";
+
                                } else {
                                        icon.path = "images/normal.png";
                                        title.title = "You have no unread articles.";
+                                       badge.text = "";
                                }
 
                                localStorage["last_updated"] = d.getTime();
@@ -48,9 +62,13 @@ function update() {
                                localStorage["last_error"] = xhr.responseText;
 
                                icon.path = "images/error.png";
-                               title.title = "Error (%s) while requesting article information.".replace("%s", xhr.status);
+                               title.title = "Error (%s) while updating.".replace("%s", xhr.status);
                        }
 
+                       if (showBadge !== "1") badge.text = ""; 
+
+                       chrome.browserAction.setBadgeText(badge);
+
                        chrome.browserAction.setTitle(title);
                        chrome.browserAction.setIcon(icon);
 
@@ -104,7 +122,7 @@ function init() {
                        chrome.tabs.create(cp);
                }
 
-       });     
+       });
                
        window.setTimeout("timeout()", 1000);
 

diff --git a/utils/notifier/manifest.json b/utils/notifier/manifest.json
index 59630f922729f05c4ea72196df55ab8967613263..f0f00953a21e8e4b45a397f3dec1cf72dbf9d54b 100644 (file)
--- a/utils/notifier/manifest.json
+++ b/utils/notifier/manifest.json
@@ -1,14 +1,14 @@
 {
   "name": "Tiny Tiny RSS Notifier",
   "background_page": "background.html",
-  "version": "0.1",
+  "version": "0.2",
   "description": "This extension displays the number of unread articles in your Tiny Tiny RSS installation",
   "options_page": "options.html",
   "icons": { "48": "images/icon.png", "128": "images/icon.png" },
   "browser_action": {
     "default_icon": "images/normal.png",
     "default_title": "You have no unread articles.",
-        "-popup": "popup.html"
+        "popup.disabled": "popup.html"
   },
   "permissions": [
     "tabs", "http://*/*", "https://*/*"

diff --git a/utils/notifier/options.html b/utils/notifier/options.html
index 99ae0787d605ef132c354d8fd957c96c35ff2f45..d7becf222fe19c180a49cd03747895291caaa0e0 100644 (file)
--- a/utils/notifier/options.html
+++ b/utils/notifier/options.html
@@ -37,6 +37,8 @@ function save() {
                new Effect.Highlight(f.update_interval);
        }
 
+       localStorage['show_badge'] = (f.show_badge.checked) ? "1" : "0";
+
        var d = new Date();
 
        localStorage["prefs_updated"] = d.getTime();
@@ -64,6 +66,11 @@ function init() {
        else
                f.update_interval.value = '15';
 
+       if (localStorage['show_badge'])
+               f.show_badge.checked = localStorage['show_badge'] == "1";
+       else
+               f.show_badge.checked = true;
+
        var last_updated = $('last_updated');
 
        var d = new Date();
@@ -128,6 +135,11 @@ p.last-updated {
                        <input name="update_interval" size="30" value=""/>
                </fieldset>
 
+               <fieldset>
+                       <label>Show badge:</label>
+                       <input name="show_badge" type="checkbox"  value="1"/>
+               </fieldset>
+
                <input type="submit" value="Save"/>
        </form>
 

diff --git a/utils/notifier/popup.html b/utils/notifier/popup.html
new file mode 100644 (file)
index 0000000..de75dfb
--- /dev/null
+++ b/utils/notifier/popup.html
@@ -0,0 +1,14 @@
+<html>
+<style type="text/css">
+ul { 
+       padding : 0px;
+       margin : 0px;
+}
+</style>
+<body>
+       <ul>
+               <li>Update</li>
+
+       </ul>
+</body>
+</html>