From 1c082b8fe17b0884afd37bdf36b4cc6238a16b16 Mon Sep 17 00:00:00 2001 From: Rob DiCiuccio Date: Fri, 18 Jul 2014 14:49:07 -0700 Subject: [PATCH] Pagecontainer: pass triggerData with load event Fixes gh-7580 --- js/widgets/pagecontainer.js | 2 +- tests/integration/pagecontainer/page_event_sequence_core.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/widgets/pagecontainer.js b/js/widgets/pagecontainer.js index d42b1e551df..291c634f60d 100644 --- a/js/widgets/pagecontainer.js +++ b/js/widgets/pagecontainer.js @@ -538,7 +538,7 @@ define( [ // Note that it is the responsibility of the listener/handler // that called preventDefault(), to resolve/reject the // deferred object within the triggerData. - if ( this._triggerWithDeprecated( "load" ).event.isDefaultPrevented() ) { + if ( this._triggerWithDeprecated( "load", triggerData ).event.isDefaultPrevented() ) { return; } diff --git a/tests/integration/pagecontainer/page_event_sequence_core.js b/tests/integration/pagecontainer/page_event_sequence_core.js index 3ef0bf1105a..e4ddf2b366e 100644 --- a/tests/integration/pagecontainer/page_event_sequence_core.js +++ b/tests/integration/pagecontainer/page_event_sequence_core.js @@ -98,11 +98,11 @@ asyncTest( "Event sequence during navigation to another page", function() { // Deprecated as of 1.4.0 { type: "pageload", target: "the-body", - data: { prevPage: undefined, nextPage: undefined, toPage: undefined } }, + data: { prevPage: "start-page", nextPage: undefined, toPage: "other-page" } }, // Valid { type: "pagecontainerload", target: "the-body", - data: { prevPage: undefined, nextPage: undefined, toPage: undefined } }, + data: { prevPage: "start-page", nextPage: undefined, toPage: "other-page" } }, // Valid - page widget events { type: "pagebeforecreate", target: "other-page",