Merge lp:~abreu-alexandre/unity-webapps-gmail/fix-login-when-inwebappcontainer-mode into lp:unity-webapps-gmail

[Alexandre Abreu]

Fix login when running in webapp container mode

Fix login when running in webapp container mode

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-saucy-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-saucy-armhf-ci/7/console

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

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

Looks like you need to appease the jslint gods before this can go in ;-)

[lp:~abreu-alexandre/unity-webapps-gmail/fix-login-when-inwebappcontainer-mode]

77. By Alexandre Abreu on 2013-10-24

fix jslint errors

[Alexandre Abreu (abreu-alexandre)]

> Looks like you need to appease the jslint gods before this can go in ;-)

done!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-trusty-armhf-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-webapps-gmail-ci/8/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

lgtm

review: Approve

=== modified file 'GMail.user.js'
--- GMail.user.js	2013-09-24 07:38:46 +0000
+++ GMail.user.js	2013-10-24 16:50:22 +0000
@@ -154,6 +154,14 @@
         } catch (gapps_err) {
             gappslogin = "";
         }
+
+	// in the webapp container (qtwebkit based) we get served something specific
+        try {
+            if (!gappslogin && !gmaillogin) {
+                gmaillogin = document.evaluate('//div[@role="navigation"]/div/div[1]/div[2]/ol/li[1]/div/div/div[1]/div/span[2]', document, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue.textContent;
+            }
+        } catch (err) {}
+
         var login = gmaillogin.indexOf("@") !== -1 ? gmaillogin : gappslogin.indexOf("@") !== -1 ? gappslogin : "";
 
         Unity.init({ name: "GMail",