corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1122032 Part 1 - Setup minimal screen sharing for Loop from desktop (disabled by default). r=mikedeboer

Browse Source
This commit is contained in:
Mark Banner
2015-02-02 21:53:19 +00:00
parent a7432e3e28
commit ddaf539e08
28 changed files with 566 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
browser/components/loop/content/js/conversation.js
View File

@@ -42,7 +42,8 @@ loop.conversation = (function(mozL10n) {
conversationStore: React.PropTypes.instanceOf(loop.store.ConversationStore)
.isRequired,
dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
roomStore: React.PropTypes.instanceOf(loop.store.RoomStore)
roomStore: React.PropTypes.instanceOf(loop.store.RoomStore),
mozLoop: React.PropTypes.object.isRequired,
},
getInitialState: function() {
@@ -78,6 +79,7 @@ loop.conversation = (function(mozL10n) {
case "room": {
return (React.createElement(DesktopRoomConversationView, {
dispatcher: this.props.dispatcher,
mozLoop: this.props.mozLoop,
roomStore: this.props.roomStore}
));
}
@@ -189,7 +191,8 @@ loop.conversation = (function(mozL10n) {
client: client,
conversation: conversation,
dispatcher: dispatcher,
sdk: window.OT}
sdk: window.OT,
mozLoop: navigator.mozLoop}
), document.querySelector('#main'));
dispatcher.dispatch(new sharedActions.GetWindowData({