Merge lp:~abreu-alexandre/unity-webapps-yahoomail/yahoomail-fix-refresh-issue into lp:unity-webapps-yahoomail

[Alexandre Abreu]

YahooMail does not really let itself being integrated in the messaging menu. The email counts is only being updated upon the user clicking and browsing the site synchronously which does not really comply with the model that is being followed for 'message based integration scripts'. The script is simplified to offer minimal integration and remove messaging menu integration overall.

YahooMail does not really let itself being integrated in the messaging menu. The email counts is only being updated upon the user clicking and browsing the site synchronously which does not really comply with the model that is being followed for 'message based integration scripts'. The script is simplified to offer minimal integration and remove messaging menu integration overall.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-raring-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-yahoomail-raring-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-yahoomail-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[Maxim Ermilov (zaspire)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'YahooMail.user.js'
--- YahooMail.user.js	2013-05-01 22:51:58 +0000
+++ YahooMail.user.js	2013-05-08 08:29:27 +0000
@@ -16,10 +16,7 @@
  *
  */
 function selfTest() {
-    if (!getComposeMessageNode() || !getCheckMailNode()) {
-        return;
-    }
-    if (!checkMessagesCount().length) {
+    if (!getComposeMessageNode()) {
         return;
     }
 
@@ -30,45 +27,6 @@
     return document.getElementById('main-btn-new').firstChild;
 }
 
-function getCheckMailNode() {
-    return document.getElementById('btn-checkmail');
-}
-
-function checkMessagesCount() {
-    var container = document.getElementById('Inbox');
-    var indicators = [];
-
-    var i, count = document.getElementById('inbox-count').textContent;
-
-    if (!count.length) {
-      count = '0';
-    }
-
-    function activateNode() {
-      launchClickEvent(this);
-    }
-    indicators.push({ name: _("Inbox"),
-                      count: count,
-                      callback: activateNode.bind(container) });
-
-    var snapshot = document.evaluate('//ul[@id="custom-folders"]/li/a',
-                                   document, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
-    for (i = 0; i < snapshot.snapshotLength; i++) {
-      var node = snapshot.snapshotItem(i);
-      count = '0';
-      if (node.lastChild.textContent.length) {
-        count = node.lastChild.textContent;
-      }
-
-      if (node.firstChild.textContent.length) {
-        indicators.push({ name: node.firstChild.textContent,
-                          callback: activateNode.bind(node.parentNode),
-                          count: count });
-      }
-    }
-    return indicators;
-}
-
 function isCorrectPage() {
     var i, ids = ['inbox-count', 'Inbox'];
 
@@ -82,28 +40,12 @@
 }
 
 function messagingIndicatorSetup() {
-    var _indicators = [];
-    var checkMessagesCountWrapper = function () {
-        _indicators = checkMessagesCount();
-        return _indicators;
-    };
-
-    var indicatorsController = new Indicators(checkMessagesCountWrapper);
-    setInterval(function () {
-        getCheckMailNode().click();
-    }, 3000);
-    window.onfocus = function () {
-        for (var i = 0; i < _indicators.length; i++) {
-            indicatorsController.visited(_indicators[i].name);
-        }
-    };
-
     function composeNewMessage() {
         var compose = getComposeMessageNode();
         launchClickEvent(compose);
     }
-    Unity.MessagingIndicator.addAction(_("Compose New Message"),
-                                       wrapCallback(composeNewMessage));
+    Unity.Launcher.addAction(_("Compose New Message"),
+			     wrapCallback(composeNewMessage));
 
     selfTest();
 }
@@ -116,3 +58,4 @@
                  onInit: wrapCallback(messagingIndicatorSetup) });
 
 }
+