Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1075509 - Standalone UI needs "call failed" sound. r=nperriault

Browse Source
This commit is contained in:
Romain Gauthier 2014-10-28 14:33:37 +01:00
parent 95e5eae8b8
commit 084803d02b
4 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
browser/components/loop/content/shared/sounds/failure.ogg Normal file
View File

Binary file not shown.

7
browser/components/loop/standalone/content/js/webapp.js
View File

@ -264,7 +264,6 @@ loop.webapp = (function($, _, OT, mozL10n) {
var PendingConversationView = React.createClass({displayName: 'PendingConversationView',
mixins: [sharedMixins.AudioMixin],
getInitialState: function() {
return {
callState: "connecting"
@ -571,6 +570,12 @@ loop.webapp = (function($, _, OT, mozL10n) {
});
var FailedConversationView = React.createClass({displayName: 'FailedConversationView',
mixins: [sharedMixins.AudioMixin],
componentDidMount: function() {
this.play("failure");
},
render: function() {
document.title = mozL10n.get("standalone_title_with_status",
{clientShortname: mozL10n.get("clientShortname2"),

7
browser/components/loop/standalone/content/js/webapp.jsx
View File

@ -264,7 +264,6 @@ loop.webapp = (function($, _, OT, mozL10n) {
var PendingConversationView = React.createClass({
mixins: [sharedMixins.AudioMixin],
getInitialState: function() {
return {
callState: "connecting"
@ -571,6 +570,12 @@ loop.webapp = (function($, _, OT, mozL10n) {
});
var FailedConversationView = React.createClass({
mixins: [sharedMixins.AudioMixin],
componentDidMount: function() {
this.play("failure");
},
render: function() {
document.title = mozL10n.get("standalone_title_with_status",
{clientShortname: mozL10n.get("clientShortname2"),

35
browser/components/loop/test/standalone/webapp_test.js
View File

@ -501,6 +501,41 @@ describe("loop.webapp", function() {
});
});
});
describe("FailedConversationView", function() {
var view, conversation, client, fakeAudio;
beforeEach(function() {
fakeAudio = {
play: sinon.spy(),
pause: sinon.spy(),
removeAttribute: sinon.spy()
};
sandbox.stub(window, "Audio").returns(fakeAudio);
client = new loop.StandaloneClient({
baseServerUrl: "http://fake.example.com"
});
conversation = new sharedModels.ConversationModel({}, {
sdk: {}
});
conversation.set("loopToken", "fakeToken");
view = React.addons.TestUtils.renderIntoDocument(
loop.webapp.FailedConversationView({
conversation: conversation,
client: client,
notifications: notifications
}));
});
it("should play a failure sound, once", function() {
sinon.assert.calledOnce(window.Audio);
sinon.assert.calledWithExactly(window.Audio,
"shared/sounds/failure.ogg");
expect(fakeAudio.loop).to.equal(false);
});
});
});
describe("WebappRootView", function() {