Merge lp:~abreu-alexandre/webapps-applications/add-backward-compatibility-code into lp:~webapps/webapps-applications/2.4

Proposed by Alexandre Abreu
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 497
Merged at revision: 497
Proposed branch: lp:~abreu-alexandre/webapps-applications/add-backward-compatibility-code
Merge into: lp:~webapps/webapps-applications/2.4
Diff against target: 46 lines (+27/-1)
2 files modified
common/utils.js.in (+26/-0)
configure.ac (+1/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/webapps-applications/add-backward-compatibility-code
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+147751@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'common/utils.js.in'
--- common/utils.js.in 2012-12-07 12:56:24 +0000
+++ common/utils.js.in 2013-02-11 19:51:27 +0000
@@ -15,6 +15,32 @@
15 return strid;15 return strid;
16}16}
1717
18/**
19 * WARNING: this is only kept here for backward compatibility reasons.
20 * This needs to be as soon as the individual scripts are SRUed and
21 * updated to use the latest mechanism
22 */
23var _previousIndicators = [];
24function showIndicators(list) {
25 if (list.length == _previousIndicators.length) {
26 var same = true;
27 for (var i = 0; i < list.length; i++) {
28 if (list[i].name != _previousIndicators[i].name)
29 same = false;
30 if (list[i].count != _previousIndicators[i].count)
31 same = false;
32 }
33 if (same)
34 return;
35 }
36 _previousIndicators = list;
37 Unity.MessagingIndicator.clearIndicators();
38 for (var i = 0; i < list.length; i++) {
39 Unity.MessagingIndicator.showIndicator(list[i].name, { count: list[i].count,
40 callback: list[i].callback });
41 }
42}
43
18function trim(str) {44function trim(str) {
19 return str.replace(/^\s+|\s+$/g, "");45 return str.replace(/^\s+|\s+$/g, "");
20}46}
2147
=== modified file 'configure.ac'
--- configure.ac 2013-02-04 15:13:54 +0000
+++ configure.ac 2013-02-11 19:51:27 +0000
@@ -1,4 +1,4 @@
1AC_INIT(webapps,2.4.12)1AC_INIT(webapps,2.4.13)
22
3AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])3AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])
4AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])4AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])

Subscribers

People subscribed via source and target branches

to all changes: