launchpad-reviewers team mailing list archive

[Richard Harding <rick.harding@xxxxxxxxxxxxx>]

Richard Harding has proposed merging lp:~rharding/launchpad/rollback_yui_3rd_time into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rharding/launchpad/rollback_yui_3rd_time/+merge/116757

Rollback the side by side yui change due to deploy conflicts/issues.
-- 
https://code.launchpad.net/~rharding/launchpad/rollback_yui_3rd_time/+merge/116757
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rharding/launchpad/rollback_yui_3rd_time into lp:launchpad.

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-07-25 15:13:54 +0000
+++ buildout.cfg	2012-07-25 21:08:23 +0000
@@ -4,7 +4,6 @@
 [buildout]
 parts =
     yui-default
-    yui-3.5
     scripts
     filetemplates
     tags
@@ -43,17 +42,28 @@
 command =
     mkdir -p ${buildout:yui-directory}/yui-${:yui_version}
     rm -rf ${buildout:yui-directory}/yui-${:yui_version}/*
+<<<<<<< TREE
     unzip -q download-cache/dist/yui_${:yui_version}.zip -d ${buildout:yui-directory}/yui-${:yui_version}-tmp
     mv ${buildout:yui-directory}/yui-${:yui_version}-tmp/yui/build/* ${buildout:yui-directory}/yui-${:yui_version}
     rm -rf ${buildout:yui-directory}/yui-${:yui_version}-tmp
+=======
+    tar -zxf download-cache/dist/yui-${:yui_version}.tar.gz \
+        --wildcards --strip-components 2 \
+        -C ${buildout:yui-directory}/yui-${:yui_version} \
+        '*/build'
+>>>>>>> MERGE-SOURCE
 
 [yui-default]
 <= yui
 yui_version = ${versions:yui}
 
+[yui-3.4]
+<= yui
+yui_version = 3.4.1
+
 [yui-3.5]
 <=yui
-yui_version = 3.5.1
+yui_version = 3.5.0pr1
 
 [filetemplates]
 recipe = z3c.recipe.filetemplate

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2012-07-25 03:37:37 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2012-07-25 21:08:23 +0000
@@ -88,7 +88,8 @@
       tal:content="string:var cookie_scope = '${request/lp:cookie_scope}';"></script>
 
   <tal:js-loader condition="request/features/js.combo_loader.enabled">
-   <script type="text/javascript" tal:attributes="src string:${combo_url}/?${yui_version}/yui/yui-min.js&amp;lp/meta.js&amp;${yui_version}/loader/loader-min.js"></script>
+   <script type="text/javascript"
+        tal:attributes="src string:${combo_url}/?yui/yui/yui-min.js&amp;lp/meta.js&amp;yui/loader/loader-min.js"></script>
    <script type="text/javascript" tal:content="string:
         var raw = null;
         if (LP.devmode) {
@@ -97,11 +98,10 @@
         YUI.GlobalConfig = {
             combine: true,
             comboBase: '${combo_url}/?',
-            root: '${yui_version}/',
+            root: 'yui/',
             filter: raw,
             debug: ${yui_console_debug},
             fetchCSS: false,
-            maxURLLength: 2000,
             groups: {
                 lp: {
                     combine: true,