Merge pull request mozilla-b2g#7319 from borjasalguero/remove_phonenu…

…mberjs_berlin [Bug 811539] [SMS] Delete PhoneNumberJS once will be available in Gecko
dscravag · Jan 9, 2013 · 3204365 · 3204365
2 parents d6516c8 + 40f20ef
commit 3204365
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 259 deletions.
diff --git a/apps/sms/index.html b/apps/sms/index.html
@@ -30,13 +30,6 @@
     <script type="text/javascript" src="shared/js/custom_dialog.js"></script>
     <script type="text/javascript" src="shared/js/desktop.js"></script>
     <script type="text/javascript" src="shared/js/notification_helper.js"></script>
-    <!-- Phone number library -->
-    <script type="text/javascript" src="shared/js/phoneNumberJS/PhoneNumberMetaData.js"></script>
-    <script type="text/javascript" src="shared/js/phoneNumberJS/PhoneNumber.js"></script>
-    <script type="text/javascript" src="shared/js/phoneNumberJS/mcc_iso3166_table.js"></script>
-    <script type="text/javascript" src="js/phoneNumberUtils.js"></script>
-
-
     <!-- Specific code -->
     <script type="text/javascript" src="js/blacklist.js"></script>
     <script type="text/javascript" src="js/contacts.js"></script>

diff --git a/apps/sms/js/contacts.js b/apps/sms/js/contacts.js
@@ -1,6 +1,8 @@
-/* 
- * Contact Manager
-*/
+/* -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
 var ContactDataManager = {
   contactData: {},
 
@@ -9,26 +11,12 @@ var ContactDataManager = {
     if (!navigator.mozContacts) {
       return;
     }
-    var numNormalized = PhoneNumberManager.getNormalizedNumber(number);
-    // Based on E.164 (http://en.wikipedia.org/wiki/E.164)
-    if (number.length < 8) {
-      var options = {
-        filterBy: ['tel'],
-        filterOp: 'equals',
-        filterValue: number
-      };
-    } else {
-      // Based on E.164 (http://en.wikipedia.org/wiki/E.164)
-      // Some locals added a '0' at the beggining (UK, Sweden...)
-      if (numNormalized[0] == 0 || numNormalized[0] == '0') {
-        var numNormalized = Number(numNormalized.toString().substr(1));
-      }
-      var options = {
-        filterBy: ['tel'],
-        filterOp: 'contains',
-        filterValue: numNormalized
-      };
-    }
+    // Get contacts given a number
+    var options = {
+      filterBy: ['tel'],
+      filterOp: 'contains',
+      filterValue: number
+    };
     var self = this;
     var req = window.navigator.mozContacts.find(options);
     req.onsuccess = function onsuccess() {

diff --git a/apps/sms/js/phoneNumberUtils.js b/apps/sms/js/phoneNumberUtils.js