launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/argh into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/argh/+merge/67511

Fixes breakage introduced by the fix for bug #808561: the accordion widget in lib/lp/contrib needs to be included in launchpad.js.

Also removed "lang" from longpoll.js' dependencies; it is core so was causing warnings.
-- 
https://code.launchpad.net/~wgrant/launchpad/argh/+merge/67511
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/argh into lp:launchpad.

=== modified file 'Makefile'
--- Makefile	2011-07-11 01:34:32 +0000
+++ Makefile	2011-07-11 10:21:41 +0000
@@ -26,8 +26,7 @@
 endif
 
 JS_SOURCE_PATHS = -path './lib/lp/*/javascript/*' ! -path '*/tests/*' \
-    ! -path '*/testing/*' ! -path './lib/lp/services/*' \
-    ! -path './lib/lp/contrib/*'
+    ! -path '*/testing/*' ! -path './lib/lp/services/*'
 JS_YUI := $(shell utilities/yui-deps.py $(JS_BUILD:raw=))
 JS_OTHER := $(wildcard lib/canonical/launchpad/javascript/*/*.js)
 JS_LP := $(shell find $(JS_SOURCE_PATHS) -name '*.js' ! -name '.*.js' )

=== modified file 'lib/lp/app/longpoll/javascript/longpoll.js'
--- lib/lp/app/longpoll/javascript/longpoll.js	2011-07-07 09:59:11 +0000
+++ lib/lp/app/longpoll/javascript/longpoll.js	2011-07-11 10:21:41 +0000
@@ -194,4 +194,4 @@
     }
 };
 
-}, "0.1", {"requires":["base", "event", "lang", "json", "io"]});
+}, "0.1", {"requires":["base", "event", "json", "io"]});