Bug 1150953 - merge pull request #29333 from DouglasSherk:1150953-cal…

…lscreen-bdi-contact to mozilla-b2g:master
mozilla-b2g · Apr 3, 2015 · 050e521 · 050e521
2 parents 1c1eb64 + cf1f3f8
commit 050e521
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/apps/callscreen/js/calls_handler.js b/apps/callscreen/js/calls_handler.js
@@ -296,11 +296,11 @@ var CallsHandler = (function callsHandler() {
         if (contact && contact.name) {
           CallScreen.incomingInfo.classList.add('additionalInfo');
           CallScreen.incomingNumber.textContent = contact.name;
-          CallScreen.incomingNumberAdditionalInfo.textContent =
+          CallScreen.incomingNumberAdditionalInfo.innerHTML =
             Utils.getPhoneNumberAndType(matchingTel);
         } else {
           CallScreen.incomingNumber.textContent = number;
-          CallScreen.incomingNumberAdditionalInfo.textContent = '';
+          CallScreen.incomingNumberAdditionalInfo.innerHTML = '';
         }
 
         FontSizeManager.adaptToSpace(

diff --git a/apps/callscreen/js/handled_call.js b/apps/callscreen/js/handled_call.js
@@ -232,10 +232,10 @@ HandledCall.prototype.replaceAdditionalContactInfo =
   function hc_replaceAdditionalContactInfo(additionalContactInfo) {
   if (!additionalContactInfo ||
     additionalContactInfo.trim() === '') {
-    this.additionalInfoNode.textContent = '';
+    this.additionalInfoNode.innerHTML = '';
     this.node.classList.remove('additionalInfo');
   } else {
-    this.additionalInfoNode.textContent = additionalContactInfo;
+    this.additionalInfoNode.innerHTML = additionalContactInfo;
     this.node.classList.add('additionalInfo');
   }
 };

diff --git a/apps/callscreen/test/unit/calls_handler_test.js b/apps/callscreen/test/unit/calls_handler_test.js
@@ -352,7 +352,7 @@ suite('calls handler', function() {
         MockNavigatorMozTelephony.mTriggerCallsChanged();
         assert.equal(MockCallScreen.incomingNumber.textContent, 'test name');
         assert.isTrue(MockUtils.mCalledGetPhoneNumberAndType);
-        assert.equal(MockCallScreen.incomingNumberAdditionalInfo.textContent,
+        assert.equal(MockCallScreen.incomingNumberAdditionalInfo.innerHTML,
                      'type, 12334');
       });
 
@@ -364,7 +364,7 @@ suite('calls handler', function() {
                      extraCall.id.number);
         assert.isTrue(MockUtils.mCalledGetPhoneNumberAndType);
         assert.equal(
-          MockCallScreen.incomingNumberAdditionalInfo.textContent, '');
+          MockCallScreen.incomingNumberAdditionalInfo.innerHTML, '');
       });
 
       suite('adaptToSpace and ensureFixedBaseline', function() {

diff --git a/apps/callscreen/test/unit/handled_call_test.js b/apps/callscreen/test/unit/handled_call_test.js
@@ -660,7 +660,7 @@ suite('dialer/handled_call', function() {
       mockCall = new MockCall('888', 'incoming');
       subject = new HandledCall(mockCall);
       MockVoicemail.mResolvePromise(false);
-      assert.equal(subject.additionalInfoNode.textContent, 'type, 888');
+      assert.equal(subject.additionalInfoNode.innerHTML, 'type, 888');
     });
 
     test('check switch-calls mode', function() {
@@ -669,9 +669,9 @@ suite('dialer/handled_call', function() {
       mockCall.secondId = { number: '999' };
       subject.updateCallNumber();
 
-      assert.equal('', subject.additionalInfoNode.textContent);
+      assert.equal('', subject.additionalInfoNode.innerHTML);
       subject.restoreAdditionalContactInfo();
-      assert.equal('', subject.additionalInfoNode.textContent);
+      assert.equal('', subject.additionalInfoNode.innerHTML);
     });
 
     suite('additional contact info', function() {
@@ -686,7 +686,7 @@ suite('dialer/handled_call', function() {
         });
 
         test('should update the text content', function() {
-          assert.equal(subject.additionalInfoNode.textContent,
+          assert.equal(subject.additionalInfoNode.innerHTML,
                        'test additional info');
         });
 
@@ -701,7 +701,7 @@ suite('dialer/handled_call', function() {
         });
 
         test('should empty the text content', function() {
-          assert.equal(subject.additionalInfoNode.textContent, '');
+          assert.equal(subject.additionalInfoNode.innerHTML, '');
         });
 
         test('should remove the css class', function() {
@@ -1034,7 +1034,7 @@ suite('dialer/handled_call', function() {
       mockCall.emergency = true;
       mockCall._connect();
 
-      assert.equal(subject.additionalInfoNode.textContent, 'emergencyNumber');
+      assert.equal(subject.additionalInfoNode.innerHTML, 'emergencyNumber');
       assert.isTrue(subject.node.classList.contains('emergency'));
       assert.isTrue(subject.node.textContent.contains('112'));
     });

diff --git a/apps/sharedtest/test/unit/dialer/utils_test.js b/apps/sharedtest/test/unit/dialer/utils_test.js
@@ -51,7 +51,8 @@ suite('dialer/utils', function() {
       MockContacts.findByNumber(number, function(contact, matchingTel) {
         var additionalInfo = subject.getPhoneNumberAndType(matchingTel);
         sinon.assert.calledWith(MockL10n.get, MockContacts.mType);
-        assert.equal(MockContacts.mType + ', ' + number, additionalInfo);
+        assert.equal(MockContacts.mType + ', ' + '<bdi>' + number + '</bdi>',
+                     additionalInfo);
       });
     });
 

diff --git a/shared/js/dialer/utils.js b/shared/js/dialer/utils.js
@@ -142,6 +142,7 @@ var Utils = {
   },
 
   getPhoneNumberAndType: function ut_getPhoneNumberAndType(matchingTel) {
-    return this._getPhoneNumberType(matchingTel) + ', ' + matchingTel.value;
+    return this._getPhoneNumberType(matchingTel) + ', ' +
+           '<bdi>' + matchingTel.value + '</bdi>';
   }
 };