wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1131584: add 'Share my Tabs' button to the screenshare dropdown menu in the conversation window. r=Standard8

Browse Source
This commit is contained in:
Mike de Boer 2015-02-20 16:41:02 +01:00
parent 269882bb38
commit 27f47033bc
7 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/loop/content/shared/js/actions.js
View File

@ -202,6 +202,8 @@ loop.shared.actions = (function() {
* Used to start a screen share.
*/
StartScreenShare: Action.define("startScreenShare", {
// The part of the screen to share, e.g. "window" or "browser".
type: String
}),
/**

5
browser/components/loop/content/shared/js/otSdkDriver.js
View File

@ -89,14 +89,13 @@ loop.OTSdkDriver = (function() {
/**
* Initiates a screen sharing publisher.
*/
startScreenShare: function() {
startScreenShare: function(actionData) {
this.dispatcher.dispatch(new sharedActions.ScreenSharingState({
state: SCREEN_SHARE_STATES.PENDING
}));
var config = this._getCopyPublisherConfig();
// This is temporary until we get a sharing type selector
config.videoSource = "window";
config.videoSource = actionData.type;
this.screenshare = this.sdk.initPublisher(this.getScreenShareElementFunc(),
config);

15
browser/components/loop/content/shared/js/views.js
View File

@ -102,8 +102,18 @@ loop.shared.views = (function(_, l10n) {
}
},
_startScreenShare: function(type) {
this.props.dispatcher.dispatch(new sharedActions.StartScreenShare({
type: type
}));
},
_handleShareTabs: function() {
this._startScreenShare("browser");
},
_handleShareWindows: function() {
this.props.dispatcher.dispatch(new sharedActions.StartScreenShare({}));
this._startScreenShare("window");
},
_getTitle: function() {
@ -143,6 +153,9 @@ loop.shared.views = (function(_, l10n) {
isActive ? null : React.createElement("span", {className: "chevron"})
),
React.createElement("ul", {ref: "menu", className: dropdownMenuClasses},
React.createElement("li", {onClick: this._handleShareTabs, className: "disabled"},
l10n.get("share_tabs_button_title")
),
React.createElement("li", {onClick: this._handleShareWindows},
l10n.get("share_windows_button_title")
)

15
browser/components/loop/content/shared/js/views.jsx
View File

@ -102,8 +102,18 @@ loop.shared.views = (function(_, l10n) {
}
},
_startScreenShare: function(type) {
this.props.dispatcher.dispatch(new sharedActions.StartScreenShare({
type: type
}));
},
_handleShareTabs: function() {
this._startScreenShare("browser");
},
_handleShareWindows: function() {
this.props.dispatcher.dispatch(new sharedActions.StartScreenShare({}));
this._startScreenShare("window");
},
_getTitle: function() {
@ -143,6 +153,9 @@ loop.shared.views = (function(_, l10n) {
{isActive ? null : <span className="chevron"/>}
</button>
<ul ref="menu" className={dropdownMenuClasses}>
<li onClick={this._handleShareTabs} className="disabled">
{l10n.get("share_tabs_button_title")}
</li>
<li onClick={this._handleShareWindows}>
{l10n.get("share_windows_button_title")}
</li>

16
browser/components/loop/test/shared/otSdkDriver_test.js
View File

@ -139,7 +139,9 @@ describe("loop.OTSdkDriver", function () {
});
it("should dispatch a `ScreenSharingState` action", function() {
driver.startScreenShare(new sharedActions.StartScreenShare());
driver.startScreenShare(new sharedActions.StartScreenShare({
type: "window"
}));
sinon.assert.calledOnce(dispatcher.dispatch);
sinon.assert.calledWithExactly(dispatcher.dispatch,
@ -149,7 +151,9 @@ describe("loop.OTSdkDriver", function () {
});
it("should initialize a publisher", function() {
driver.startScreenShare(new sharedActions.StartScreenShare());
driver.startScreenShare(new sharedActions.StartScreenShare({
type: "window"
}));
sinon.assert.calledOnce(sdk.initPublisher);
sinon.assert.calledWithMatch(sdk.initPublisher,
@ -161,7 +165,9 @@ describe("loop.OTSdkDriver", function () {
beforeEach(function() {
driver.getScreenShareElementFunc = function() {};
driver.startScreenShare(new sharedActions.StartScreenShare());
driver.startScreenShare(new sharedActions.StartScreenShare({
type: "window"
}));
sandbox.stub(dispatcher, "dispatch");
@ -611,7 +617,9 @@ describe("loop.OTSdkDriver", function () {
driver.getScreenShareElementFunc = function() {};
driver.startScreenShare(new sharedActions.StartScreenShare());
driver.startScreenShare(new sharedActions.StartScreenShare({
type: "window"
}));
sandbox.stub(dispatcher, "dispatch");
});

21
browser/components/loop/test/shared/views_test.js
View File

@ -152,7 +152,7 @@ describe("loop.shared.views", function() {
expect(comp.state.showMenu).eql(true);
});
it("should dispatch a StartScreenShare action on option click in screenshare dropdown",
it("should dispatch a 'browser' StartScreenShare action on option click",
function() {
var comp = TestUtils.renderIntoDocument(
React.createElement(sharedViews.ScreenShareControlButton, {
@ -166,7 +166,24 @@ describe("loop.shared.views", function() {
sinon.assert.calledOnce(dispatcher.dispatch);
sinon.assert.calledWithExactly(dispatcher.dispatch,
new sharedActions.StartScreenShare({}));
new sharedActions.StartScreenShare({ type: "browser" }));
});
it("should dispatch a 'window' StartScreenShare action on option click",
function() {
var comp = TestUtils.renderIntoDocument(
React.createElement(sharedViews.ScreenShareControlButton, {
dispatcher: dispatcher,
visible: true,
state: SCREEN_SHARE_STATES.INACTIVE
}));
TestUtils.Simulate.click(comp.getDOMNode().querySelector(
".conversation-window-dropdown > li:last-child"));
sinon.assert.calledOnce(dispatcher.dispatch);
sinon.assert.calledWithExactly(dispatcher.dispatch,
new sharedActions.StartScreenShare({ type: "window" }));
});
it("should dispatch a EndScreenShare action on click when the state is active",

1
browser/locales/en-US/chrome/browser/loop/loop.properties
View File

@ -187,6 +187,7 @@ mute_local_video_button_title=Mute your video
unmute_local_video_button_title=Unmute your video
active_screenshare_button_title=Stop sharing
inactive_screenshare_button_title=Share your screen
share_tabs_button_title=Share my Tabs
share_windows_button_title=Share other Windows
## LOCALIZATION NOTE (call_with_contact_title): The title displayed