Merge pull request #42 from dryabov/master

open external links in new window
iShift · Sep 23, 2014 · b06389c · b06389c
2 parents 5065f71 + be72159
commit b06389c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/app/js/interface.js b/app/js/interface.js
@@ -82,6 +82,13 @@
         });
     });
 
+     /**
+      * Open external links in new window
+      */
+    win.on('new-win-policy', function (frame, url, policy) {
+        policy.forceNewWindow();
+    });
+
     /**
      * Disable drag&drop to window
      */

diff --git a/app/js/tray.js b/app/js/tray.js
@@ -14,7 +14,7 @@ window.addEventListener('init', function () {
         }),
         menuTray = new gui.Menu(),
         skipMinimizeToTray = false,
-        reNewMessages = /^\(\d+\)/,
+        reNewMessages = /^\((\d+)\)/,
         observer,
         themeDir = appDir + ds + 'html';
 
@@ -164,6 +164,11 @@ window.addEventListener('init', function () {
                 tray.tooltip = title;
                 bNewMessages = reNewMessages.test(title);
                 tray.icon = bNewMessages ? icon_new : icon_normal;
+                var count = 0;
+                if (bNewMessages) {
+                    count = title.match(reNewMessages)[1];
+                }
+                win.setBadgeLabel(count ? count : '');
             } else {
                 bNewMessages = (title !== '');
             }
@@ -182,6 +187,7 @@ window.addEventListener('init', function () {
 
     addEventListener('updateIframe', function () {
         bNewMessages = false;
+        win.setBadgeLabel('');
 
         var iframedoc = window.getIframeDocument();