launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #06058
[Merge] lp:~stevenk/launchpad/step-one-mochi into lp:launchpad
Steve Kowalik has proposed merging lp:~stevenk/launchpad/step-one-mochi into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~stevenk/launchpad/step-one-mochi/+merge/87921
This branch removes all references to Mochi that *aren't* in lp-mochi.js. Deryck and I are fairly confident that the removals are not used anywhere.
Structual subscriptions was using a Mochi function which is provided by core JS, which I have fixed.
--
https://code.launchpad.net/~stevenk/launchpad/step-one-mochi/+merge/87921
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/step-one-mochi into lp:launchpad.
=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py 2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/browser/bugtarget.py 2012-01-09 11:40:30 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Canonical Ltd. This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
"""IBugTarget-related browser views."""
@@ -1295,18 +1295,6 @@
return milestone_buglistings
-class BugCountDataItem:
- """Data about bug count for a status."""
-
- def __init__(self, label, count, color):
- self.label = label
- self.count = count
- if color.startswith('#'):
- self.color = 'MochiKit.Color.Color.fromHexString("%s")' % color
- else:
- self.color = 'MochiKit.Color.Color["%sColor"]()' % color
-
-
class BugTargetBugTagsView(LaunchpadView):
"""Helper methods for rendering the bug tags portlet."""
=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml 2012-01-03 15:38:19 +0000
+++ lib/lp/code/browser/configure.zcml 2012-01-09 11:40:30 +0000
@@ -69,12 +69,6 @@
template="../templates/branch-listing-cross-product.pt"
permission="zope.Public"
/>
- <browser:page
- for="zope.interface.Interface"
- name="+test-webservice-js"
- template="../templates/test-webservice-js.pt"
- permission="zope.Public"
- />
<browser:url
for="lp.code.interfaces.codereviewvote.ICodeReviewVoteReference"
=== removed file 'lib/lp/code/templates/test-webservice-js.pt'
--- lib/lp/code/templates/test-webservice-js.pt 2011-05-27 21:03:22 +0000
+++ lib/lp/code/templates/test-webservice-js.pt 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
- <head>
- <title>Launchpad AJAX client test page</title>
- <script src="/+icing/MochiKit.js" type="text/javascript"></script>
- <script src="/+icing/launchpad-ajax.js" type="text/javascript"></script>
- </head>
- <body>
- <div id="topline"></div>
- <div id="locationbar"></div>
- <div>
- <p>This page is used to test Launchpad's AJAX client.</p>
- </div>
- </body>
-</html>
-
=== modified file 'lib/lp/registry/javascript/structural-subscription.js'
--- lib/lp/registry/javascript/structural-subscription.js 2012-01-06 12:34:37 +0000
+++ lib/lp/registry/javascript/structural-subscription.js 2012-01-09 11:40:30 +0000
@@ -1405,14 +1405,15 @@
if (filter_info.team_has_contact_address
&& !filter_info.user_is_team_admin) {
- var subject = urlEncode('Team contact address and subscriptions');
+ var subject = encodeURIComponent(
+ 'Team contact address and subscriptions');
var user_participation;
if (filter_info.user_is_on_team_mailing_list) {
user_participation = 'subscribe to the team\'s mailing list';
} else {
user_participation = 'be a part of the team';
}
- var message = urlEncode(
+ var message = encodeURIComponent(
'Hello. I receive email notifications about bugs in '+
filter_info.target_title+' because of a team subscription for '+
filter_info.subscriber_title+'. I would like to continue to '+
@@ -1866,5 +1867,6 @@
}, '0.1', {requires: [
'dom', 'node', 'lp.anim', 'lazr.formoverlay', 'lazr.overlay',
- 'lazr.effects', 'lp.app.errors', 'lp.client', 'gallery-accordion', 'lp.app.inlinehelp'
+ 'lazr.effects', 'lp.app.errors', 'lp.client', 'gallery-accordion',
+ 'lp.app.inlinehelp'
]});
=== modified file 'lib/lp/registry/javascript/tests/test_structural_subscription.html'
--- lib/lp/registry/javascript/tests/test_structural_subscription.html 2012-01-06 12:34:37 +0000
+++ lib/lp/registry/javascript/tests/test_structural_subscription.html 2012-01-09 11:40:30 +0000
@@ -32,8 +32,6 @@
src="../../../contrib/javascript/yui3-gallery/gallery-accordion/gallery-accordion.js">
</script>
<script type="text/javascript"
- src="../../../../canonical/launchpad/icing/MochiKit.js"></script>
- <script type="text/javascript"
src="../../../services/inlinehelp/javascript/inlinehelp.js"></script>
