1
=== modified file 'YahooNews.test.js'
2
--- YahooNews.test.js	2013-04-30 20:42:47 +0000
3
+++ YahooNews.test.js	2013-07-31 15:58:54 +0000
4
@@ -14,9 +14,12 @@
5
14
    },
14
    },
6
15
15
7
16
    validateCallLog: function (log) {
16
    validateCallLog: function (log) {
8
17
        var i;
9
17
        assertEquals('Unity.init', log[0].func, 'Unity.init');
18
        assertEquals('Unity.init', log[0].func, 'Unity.init');
12
18
        assertEquals('Unity.Notification.showNotification', log[1].func, 'Unity.Notification.showNotification');
19
        assert('log.length', log.length > 1);
13
19
        assertFalse('log.length', log.length < 3);
20
        for (i = 1; i < log.length; i++) {
14
21
            assertEquals('log[' + i + '] = Unity.Notification.showNotification', log[i].func, 'Unity.Notification.showNotification');
15
22
        }
16
20
    },
23
    },
17
21
24
18
22
    scriptName: 'YahooNews.user.js'
25
    scriptName: 'YahooNews.user.js'
19
23
26
20
=== modified file 'YahooNews.user.js'
21
--- YahooNews.user.js	2013-06-18 07:37:48 +0000
22
+++ YahooNews.user.js	2013-07-31 15:58:54 +0000
23
@@ -11,30 +11,34 @@
24
11
));
11
));
25
12
12
26
13
window.Unity = external.getUnityObject(1);
13
window.Unity = external.getUnityObject(1);
27
14
var timer;
28
15
29
16
function getFeaturedTitles() {
30
17
    return document.getElementsByClassName('yom-lead-featured-title');
31
18
}
32
19
33
20
/**
34
21
 * Validates the page for functional tests
35
22
 */
36
23
function selfTest() {
37
24
    if (!getFeaturedTitles()) {
38
25
        reportTestState('FAILED: getFeaturedTitles is null');
39
26
        return;
40
27
    }
41
28
    reportTestState('PASS SELF TEST');
42
29
}
43
14
30
44
15
function isCorrectPage() {
31
function isCorrectPage() {
46
16
    if (!document.getElementById('mediamegatron') && !document.getElementById('mediablistmixednewsforyoucatemp') && !document.getElementById('mediatabs')) {
32
    if (!getFeaturedTitles()) {
47
17
        return false;
33
        return false;
48
18
    }
34
    }
49
19
50
20
    return true;
35
    return true;
51
21
}
36
}
52
22
37
68
23
function messagingIndicatorSetup() {
38
function showNotifications(res) {
69
24
    var i, res = document.evaluate('//*[@id="mediatabs"]/div[@class="bd"]/div/div/div/div/div/div[@class="bd"]/ul/li/div/a', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
39
    var i = 0;
70
25
    if (!res.snapshotLength) {
40
    // Display up to 5 notifications
71
26
        res = document.evaluate('//*[@id="mediamegatron"]/div[@class="bd"]/div[@class="feature"]/div[@class="meta"]/div[@class="bd"]/a', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
41
    while (i < res.snapshotLength && i < 5) {
57
27
    }
58
28
59
29
    if (!res.snapshotLength) {
60
30
        res = document.evaluate('//*[@id="mediablistmixednewsforyoucatemp"]/div[@class="bd"]/ul/li/div/a', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
61
31
    }
62
32
63
33
    if (!res.snapshotLength) {
64
34
        res = document.evaluate('//ul[@class="tpl-thumb_100x75_title yom-list yom-list-large"]/li/div/a', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
65
35
    }
66
36
67
37
    for (i = 0; i < res.snapshotLength; i++) {
72
38
        var node = res.snapshotItem(i);
42
        var node = res.snapshotItem(i);
73
39
        var title = node.textContent;
43
        var title = node.textContent;
74
40
44
75
@@ -42,14 +46,36 @@
76
42
            localStorage.setItem(title, true);
46
            localStorage.setItem(title, true);
77
43
            Unity.Notification.showNotification(_("Yahoo News"), title, null);
47
            Unity.Notification.showNotification(_("Yahoo News"), title, null);
78
44
        }
48
        }
80
45
    }
49
        i++;
81
50
    }
82
51
}
83
52
84
53
function checkHeadlines() {
85
54
    // Frontpage headlines
86
55
    var res = document.evaluate('//*[@class="yom-lead-featured-title"]/a', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
87
56
    if (res.snapshotLength > 0) {
88
57
        showNotifications(res);
89
58
    }
90
59
91
60
    // "All news" headlines. This are loaded using JavaScript
92
61
    res = document.evaluate('//*[@class="body-wrap"]/h3/a', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
93
62
    if (res.snapshotLength > 0) {
94
63
        showNotifications(res);
95
64
    }
96
65
}
97
66
98
67
function messagingIndicatorSetup() {
99
68
    checkHeadlines();
100
69
    timer = setInterval(checkHeadlines, 5000); // Re-check every 5 seconds
101
70
102
71
    selfTest();
103
46
}
72
}
104
47
73
105
48
if (isCorrectPage()) {
74
if (isCorrectPage()) {
106
49
    Unity.init({
75
    Unity.init({
107
50
        name: _("Yahoo News"),
76
        name: _("Yahoo News"),
110
51
        domain: 'yahoo.com',
77
        domain: 'news.yahoo.com',
111
52
        homepage: 'news.yahoo.com',
78
        homepage: 'http://news.yahoo.com/',
112
53
        iconUrl: "icon://unity-webapps-yahoonews",
79
        iconUrl: "icon://unity-webapps-yahoonews",
113
54
        onInit: wrapCallback(messagingIndicatorSetup)
80
        onInit: wrapCallback(messagingIndicatorSetup)
114
55
    });
81
    });
Reviewer	Review Type	Date Requested	Status
Alexandre Abreu (community)		2013-07-31	Needs Fixing on 2013-08-01
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-31
Review via email: mp+177864@code.launchpad.net