← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~stevenk/launchpad/add-yui-3.10.2 into lp:launchpad

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/add-yui-3.10.2 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/add-yui-3.10.2/+merge/167689

Also build YUI 3.10.2, and preemptively fix a test that will fail with 3.10.2 as default.
-- 
https://code.launchpad.net/~stevenk/launchpad/add-yui-3.10.2/+merge/167689
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/add-yui-3.10.2 into lp:launchpad.
=== modified file 'Makefile'
--- Makefile	2013-05-09 23:35:44 +0000
+++ Makefile	2013-06-06 04:30:38 +0000
@@ -23,7 +23,7 @@
 LP_BUILT_JS_ROOT=${ICING}/build
 
 JS_BUILD_DIR := build/js
-YUI_VERSIONS := 3.9.1
+YUI_VERSIONS := 3.9.1 3.10.2
 YUI_BUILDS := $(patsubst %,$(JS_BUILD_DIR)/yui-%, $(YUI_VERSIONS))
 YUI_DEFAULT := yui-3.9.1
 YUI_DEFAULT_SYMLINK := $(JS_BUILD_DIR)/yui

=== modified file 'lib/lp/app/javascript/longpoll.js'
--- lib/lp/app/javascript/longpoll.js	2012-02-17 18:51:38 +0000
+++ lib/lp/app/javascript/longpoll.js	2013-06-06 04:30:38 +0000
@@ -84,6 +84,10 @@
     successPoll : function (id, response) {
         try {
             var data = Y.JSON.parse(response.responseText);
+            if (!data.hasOwnProperty('event_key')) {
+                Y.fire(namespace.longpoll_fail_event);
+                return false;
+            }
             Y.fire(data.event_key, data);
             return true;
         }