From 032d9fe8a2887fce6af860188446469ad11606a5 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Wed, 11 Mar 2015 19:08:23 +0000 Subject: [PATCH] Follow-up to bug 1140481 - Fix Loop's ui-showcase. rs=dmose over irc NPOTB DONTBUILD CLOSED TREE --- browser/components/loop/ui/ui-showcase.js | 13 ++++++++----- browser/components/loop/ui/ui-showcase.jsx | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/browser/components/loop/ui/ui-showcase.js b/browser/components/loop/ui/ui-showcase.js index 5c37fbd2f60..0c08c4364d1 100644 --- a/browser/components/loop/ui/ui-showcase.js +++ b/browser/components/loop/ui/ui-showcase.js @@ -63,10 +63,12 @@ } ); + var mockSDK = _.extend({}, Backbone.Events); + var dispatcher = new loop.Dispatcher(); var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, { mozLoop: navigator.mozLoop, - sdkDriver: {} + sdkDriver: mockSDK }); var roomStore = new loop.store.RoomStore(dispatcher, { mozLoop: navigator.mozLoop @@ -77,10 +79,13 @@ var conversationStore = new loop.store.ConversationStore(dispatcher, { client: {}, mozLoop: navigator.mozLoop, - sdkDriver: {} + sdkDriver: mockSDK }); - loop.store.StoreMixin.register({feedbackStore: feedbackStore}); + loop.store.StoreMixin.register({ + conversationStore: conversationStore, + feedbackStore: feedbackStore + }); // Local mocks @@ -97,8 +102,6 @@ requestCallUrlInfo: noop }; - var mockSDK = {}; - var mockConversationModel = new loop.shared.models.ConversationModel({ callerId: "Mrs Jones", urlCreationDate: (new Date() / 1000).toString() diff --git a/browser/components/loop/ui/ui-showcase.jsx b/browser/components/loop/ui/ui-showcase.jsx index c9331bde94f..9e912e092e7 100644 --- a/browser/components/loop/ui/ui-showcase.jsx +++ b/browser/components/loop/ui/ui-showcase.jsx @@ -63,10 +63,12 @@ } ); + var mockSDK = _.extend({}, Backbone.Events); + var dispatcher = new loop.Dispatcher(); var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, { mozLoop: navigator.mozLoop, - sdkDriver: {} + sdkDriver: mockSDK }); var roomStore = new loop.store.RoomStore(dispatcher, { mozLoop: navigator.mozLoop @@ -77,10 +79,13 @@ var conversationStore = new loop.store.ConversationStore(dispatcher, { client: {}, mozLoop: navigator.mozLoop, - sdkDriver: {} + sdkDriver: mockSDK }); - loop.store.StoreMixin.register({feedbackStore: feedbackStore}); + loop.store.StoreMixin.register({ + conversationStore: conversationStore, + feedbackStore: feedbackStore + }); // Local mocks @@ -97,8 +102,6 @@ requestCallUrlInfo: noop }; - var mockSDK = {}; - var mockConversationModel = new loop.shared.models.ConversationModel({ callerId: "Mrs Jones", urlCreationDate: (new Date() / 1000).toString()