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

Bug 1065201: introduce new sounds for Hello standalone and desktop. r=mikedeboer

Browse Source
This commit is contained in:
Romain Gauthier
2014-11-06 14:51:50 +01:00
parent f9be6a29c2
commit b7257b6a37
18 changed files with 317 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,7 +286,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
},
_handleRingingProgress: function() {
this.play("ringing", {loop: true});
this.play("ringtone", {loop: true});
this.setState({callState: "ringing"});
},
@@ -534,8 +534,6 @@ loop.webapp = (function($, _, OT, mozL10n) {
* Ended conversation view.
*/
var EndedConversationView = React.createClass({displayName: 'EndedConversationView',
mixins: [sharedMixins.AudioMixin],
propTypes: {
conversation: React.PropTypes.instanceOf(sharedModels.ConversationModel)
.isRequired,
@@ -544,10 +542,6 @@ loop.webapp = (function($, _, OT, mozL10n) {
onAfterFeedbackReceived: React.PropTypes.func.isRequired
},
componentDidMount: function() {
this.play("terminated");
},
render: function() {
document.title = mozL10n.get("standalone_title_with_status",
{clientShortname: mozL10n.get("clientShortname2"),

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

@@ -286,7 +286,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
},
_handleRingingProgress: function() {
this.play("ringing", {loop: true});
this.play("ringtone", {loop: true});
this.setState({callState: "ringing"});
},
@@ -534,8 +534,6 @@ loop.webapp = (function($, _, OT, mozL10n) {
* Ended conversation view.
*/
var EndedConversationView = React.createClass({
mixins: [sharedMixins.AudioMixin],
propTypes: {
conversation: React.PropTypes.instanceOf(sharedModels.ConversationModel)
.isRequired,
@@ -544,10 +542,6 @@ loop.webapp = (function($, _, OT, mozL10n) {
onAfterFeedbackReceived: React.PropTypes.func.isRequired
},
componentDidMount: function() {
this.play("terminated");
},
render: function() {
document.title = mozL10n.get("standalone_title_with_status",
{clientShortname: mozL10n.get("clientShortname2"),