Launchpad itself

Merge lp:~mars/launchpad/unroll-mochikit-patch-hardening into lp:launchpad/db-devel

  1. unroll-mochikit-patch-hardening
  2. Merge into db-devel
Proposed by Māris Fogels
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mars/launchpad/unroll-mochikit-patch-hardening
Merge into: lp:launchpad/db-devel
Diff against target: 21 lines (+3/-1)
1 file modified
lib/lp/app/templates/base-layout-macros.pt (+3/-1)
To merge this branch: bzr merge lp:~mars/launchpad/unroll-mochikit-patch-hardening
Reviewer Review Type Date Requested Status
Paul Hummer (community) code Approve
Review via email: mp+17894@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Māris Fogels (mars) wrote :

This branch fixes two problems with the MochiKit removal branch:

 * The XXX comment added in that branch no longer appears on every page
 * The stand-alone module for MochiKit dependant code is now loaded when in devmode

Revision history for this message
Paul Hummer (rockstar) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
2--- lib/lp/app/templates/base-layout-macros.pt 2010-01-21 21:03:05 +0000
3+++ lib/lp/app/templates/base-layout-macros.pt 2010-01-22 15:54:16 +0000
4@@ -52,7 +52,7 @@
5 do any initialization.
6 </tal:comment>
7
8- <tal:comment>
9+ <tal:comment replace="nothing">
10 XXX mars 2010-01-21
11 We have to load MochiKit outside of the main javascript rollup so that the
12 rollup's size does not exceed 512Kb. That magic number triggers a bug
13@@ -166,6 +166,8 @@
14 <script type="text/javascript"
15 tal:attributes="src string:${lp_js}/lp/lp.js"></script>
16 <script type="text/javascript"
17+ tal:attributes="src string:${lp_js}/lp/lp-mochi.js"></script>
18+ <script type="text/javascript"
19 tal:attributes="src string:${lp_js}/lp/dragscroll.js"></script>
20 <script type="text/javascript"
21 tal:attributes="src string:${lp_js}/lp/picker.js"></script>

Subscribers

People subscribed via source and target branches

to status/vote changes: