1028537 - Alert telephony.ConferenceGroup is undefined using Gaia in Desktop

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::System::Lockscreen, defect)

Description

[Julien G]

User Agent: Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:30.0) Gecko/20100101 Firefox/30.0 (Beta/Release)
Build ID: 20140608211810

Steps to reproduce:

I used Gaia with Firefox Desktop and started the simulator


Actual results:

an error "telephony.ConferenceGroup is undefined" spawned in the console


Expected results:

No error should have happened

Comment 1

[Julien G]

Attachment: patch.diff

Comment 2

[Julien G]

Attachment: patch_upstream.diff

Comment 3

[Julien G]

Attachment: patch_upstream.diff

Corrected quotes (linting)

Comment 4

[Vivien Nicolas (:vingtetun) (:21) - (NOT reading bugmails, needinfo? please)]

Comment on attachment 8443922 [details] [diff] [review]
patch_upstream.diff

Review of attachment 8443922 [details] [diff] [review]:
-----------------------------------------------------------------

r+ with the following changes.

Since you can't push, I took the liberty to fix the small nits I made and test your change against our Continuous Integration server (See https://tbpl.mozilla.org/?tree=Gaia-Try&rev=4602da1bfcf77686e015161984b62dabdea2ad3e).

If the CI is green, I will land the patch. Thanks for the contribution.

::: apps/callscreen/js/conference_group_handler.js
@@ +5,5 @@
>  'use strict';
>  
>  var ConferenceGroupHandler = (function() {
>    var groupLine = document.getElementById('group-call');
> +  var groupLabel = document.getEleemntById('group-call-label');

nit: Please remove this broken change.

@@ +22,5 @@
>      CallsHandler.mergeConferenceGroupWithActiveCall();
>    };
>  
>    var telephony = window.navigator.mozTelephony;
> +  if(telephony.hasOwnProperty('conferenceGroup')) {

Please replace "if(" by "if (" to follow the guideline.

Comment 5

[Vivien Nicolas (:vingtetun) (:21) - (NOT reading bugmails, needinfo? please)]

Gaia-Try complains but for completely irrelevant tests here. Let's land that.

Comment 6

[Vivien Nicolas (:vingtetun) (:21) - (NOT reading bugmails, needinfo? please)]

https://github.com/mozilla-b2g/gaia/commit/ce1a8ea7f6ef1381f39acec993d83752c58f4a81