Merge pull request #27821 from arcturus/bug-1058790

Bug 1058790 - [RTL] International numbers are not correctly handled in Contacts r=jmcf
mozilla-b2g · Feb 3, 2015 · ed2b99f · ed2b99f
2 parents e7880a6 + d2072f4
commit ed2b99f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/apps/communications/contacts/elements/form.html b/apps/communications/contacts/elements/form.html
@@ -22,7 +22,9 @@ <h1 id='contact-form-title' data-l10n-id="addContact">Add contact</h1>
         </div>
         <section class="second-row">
           <p class="setbox-item">
-            <input placeholder="Phone" data-field="value" data-l10n-id="tel" name="tel[#i#][value]" class="textfield" type="tel" value="#value#" id="number_#i#">
+            <bdi>
+              <input placeholder="Phone" data-field="value" data-l10n-id="tel" name="tel[#i#][value]" class="textfield" type="tel" value="#value#" id="number_#i#">
+            </bdi>
             <button type="reset">Clear</button>
           </p>
         </section>

diff --git a/apps/communications/contacts/js/views/ice_settings.js b/apps/communications/contacts/js/views/ice_settings.js
@@ -170,11 +170,11 @@ contacts.ICE = (function() {
     iceContactCheckboxes[index].checked = active;
     iceContactButtons[index].disabled = !active;
 
-    var span = document.createElement('span');
-    span.classList.add('ice-contact');
-    span.textContent = label;
+    var bdi = document.createElement('bdi');
+    bdi.classList.add('ice-contact');
+    bdi.textContent = label;
     iceContactButtons[index].innerHTML = '';
-    iceContactButtons[index].appendChild(span);
+    iceContactButtons[index].appendChild(bdi);
     iceContactButtons[index].dataset.contactId = contactId;
   }
 

diff --git a/apps/communications/contacts/js/views/list.js b/apps/communications/contacts/js/views/list.js
@@ -638,6 +638,7 @@ contacts.List = (function() {
       ele = document.createElement('p');
     }
     ele.classList.add('contact-text');
+    var bdi = document.createElement('bdi');
     var givenName = (contact.givenName && contact.givenName[0]) || '';
     var familyName = (contact.familyName && contact.familyName[0]) || '';
 
@@ -648,12 +649,14 @@ contacts.List = (function() {
     }
 
     if (orderByLastName) {
-      ele.appendChild(document.createTextNode(givenName + ' '));
-      ele.appendChild(createStrongTag(familyName));
+      bdi.appendChild(document.createTextNode(givenName + ' '));
+      bdi.appendChild(createStrongTag(familyName));
     } else {
-      ele.appendChild(createStrongTag(givenName));
-      ele.appendChild(document.createTextNode(' ' + familyName));
+      bdi.appendChild(createStrongTag(givenName));
+      bdi.appendChild(document.createTextNode(' ' + familyName));
     }
+
+    ele.appendChild(bdi);
     return ele;
   }
 

diff --git a/apps/communications/contacts/style/contacts.css b/apps/communications/contacts/style/contacts.css
@@ -340,7 +340,7 @@ form p textarea + button[type="reset"].hide {
   margin-left: 0 !important;
 }
 
-#contact-detail p > strong,
+#contact-detail bdi > strong,
 .action-block b,
 .comment-notes {
   font-size: 1.6rem;

diff --git a/apps/communications/contacts/test/unit/views/list_test.js b/apps/communications/contacts/test/unit/views/list_test.js
@@ -1058,7 +1058,7 @@ suite('Render contacts list', function() {
         assert.equal(node.dataset.order,
           Normalizer.escapeHTML(expected, true));
 
-        var printed = node.querySelector('p');
+        var printed = node.querySelector('bdi');
 
         // Check as well the correct highlight
         // familyName to be in bold
@@ -1090,7 +1090,7 @@ suite('Render contacts list', function() {
       assert.equal(
         node.dataset.order, Normalizer.escapeHTML(expected, true));
 
-      var name = node.querySelector('p');
+      var name = node.querySelector('bdi');
 
       // Check highlight
       // Given name to be in bold

diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/contacts/app.py b/tests/python/gaia-ui-tests/gaiatest/apps/contacts/app.py
@@ -128,8 +128,8 @@ def is_no_contacts_message_displayed(self):
 
     class Contact(PageRegion):
 
-        _name_locator = (By.CSS_SELECTOR, 'p > strong')
-        _full_name_locator = (By.CSS_SELECTOR, 'p.contact-text')
+        _name_locator = (By.CSS_SELECTOR, 'bdi > strong')
+        _full_name_locator = (By.CSS_SELECTOR, 'p.contact-text bdi')
         _image_locator = (By.CSS_SELECTOR, 'span[data-type="img"]')
 
         @property