intl-tel-input 6.0.4 → 8.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a164649718e4a119936ad164836823591a36a0a2
-  data.tar.gz: f8510375924e65af4ecc1554078ea74035ffc0cd
+  metadata.gz: 8bcd2575cb0194eb84176b2a55ecd684d1de8af9
+  data.tar.gz: f2bf5adf402d0b65fba2b774e12e1cb9bbaf0925
 SHA512:
-  metadata.gz: 8cfd0ae51cf1d5247124b92fd62771199eb1aa7b251ef5201fedb5e4b1691450901c2fc37bd321a1c7b0e7cc33aad0da288534c6922c0846ba5044d9fe9bee98
-  data.tar.gz: a9b211b0cf3c8f44d93f30219e2a4745fcb4761739c03b6a1316013dcc20ed4890f7b4b4e391ce73ee159e44dae8d8094d41487e1a50cb54df01b93872d46808
+  metadata.gz: 1ccc162c8930296b36f301312f652094aeb5a2137ff2900efad9debf1b933354d6db2435012b678a3c82ab4cb4d1cd9d9b68ca3a2ffe836e859d6a6518bba772
+  data.tar.gz: b739245a85d2290fe846394ec3ace310f386aae258285dcac545b2faf05a090234ae52d56df294af694da6806a091598190e627d8e89d3daf29673e0bd16809e

data/README.md

@@ -10,3 +10,18 @@ Check the original documentation here:
 Include the gem in your Gemfile:
 
     gem 'intl-tel-input'
+
+
+Add the following to your application.js:
+
+```
+//= require intl-tel-input
+```
+
+Also add to your application.css:
+
+```
+/*
+ *= require intl-tel-input
+ */
+```

data/app/assets/javascripts/intl-tel-input.js

@@ -1,13 +1,16 @@
 /*
-International Telephone Input v6.0.4
-https://github.com/Bluefieldscom/intl-tel-input.git
-*/
-// wrap in UMD - see https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
+ * International Telephone Input v8.4.9
+ * https://github.com/jackocnr/intl-tel-input.git
+ * Licensed under the MIT license
+ */
+// wrap in UMD - see https://github.com/umdjs/umd/blob/master/jqueryPluginCommonjs.js
 (function(factory) {
     if (typeof define === "function" && define.amd) {
         define([ "jquery" ], function($) {
             factory($, window, document);
         });
+    } else if (typeof module === "object" && module.exports) {
+        module.exports = factory(require("jquery"), window, document);
     } else {
         factory(jQuery, window, document);
     }
@@ -16,18 +19,24 @@ https://github.com/Bluefieldscom/intl-tel-input.git
     // these vars persist through all instances of the plugin
     var pluginName = "intlTelInput", id = 1, // give each instance it's own id for namespaced event handling
     defaults = {
-        // typing digits after a valid number will be added to the extension part of the number
-        allowExtensions: false,
-        // automatically format the number according to the selected country
-        autoFormat: true,
+        // whether or not to allow the dropdown
+        allowDropdown: true,
         // if there is just a dial code in the input: remove it on blur, and re-add it on focus
         autoHideDialCode: true,
         // add or remove input placeholder with an example number for the selected country
         autoPlaceholder: true,
-        // default country
-        defaultCountry: "",
+        // modify the auto placeholder
+        customPlaceholder: null,
+        // append menu to a specific element
+        dropdownContainer: "",
+        // don't display these countries
+        excludeCountries: [],
+        // format the input value during initialisation
+        formatOnInit: true,
         // geoIp lookup function
         geoIpLookup: null,
+        // initial country
+        initialCountry: "",
         // don't insert international dial codes
         nationalMode: true,
         // number type to use for placeholders
@@ -36,6 +45,8 @@ https://github.com/Bluefieldscom/intl-tel-input.git
         onlyCountries: [],
         // the countries at the top of the list. defaults to united states and united kingdom
         preferredCountries: [ "us", "gb" ],
+        // display the country dial code next to the selected flag so it's not part of the typed number
+        separateDialCode: false,
         // specify the path to the libphonenumber script to enable validation/formatting
         utilsScript: ""
     }, keys = {
@@ -46,31 +57,22 @@ https://github.com/Bluefieldscom/intl-tel-input.git
         PLUS: 43,
         A: 65,
         Z: 90,
-        ZERO: 48,
-        NINE: 57,
         SPACE: 32,
-        BSPACE: 8,
-        TAB: 9,
-        DEL: 46,
-        CTRL: 17,
-        CMD1: 91,
-        // Chrome
-        CMD2: 224
-    }, windowLoaded = false;
+        TAB: 9
+    };
     // keep track of if the window.load event has fired as impossible to check after the fact
     $(window).load(function() {
-        windowLoaded = true;
+        // UPDATE: use a public static field so we can fudge it in the tests
+        $.fn[pluginName].windowLoaded = true;
     });
     function Plugin(element, options) {
-        this.element = element;
+        this.telInput = $(element);
         this.options = $.extend({}, defaults, options);
-        this._defaults = defaults;
         // event namespace
         this.ns = "." + pluginName + id++;
         // Chrome, FF, Safari, IE9+
         this.isGoodBrowser = Boolean(element.setSelectionRange);
         this.hadInitialPlaceholder = Boolean($(element).attr("placeholder"));
-        this._name = pluginName;
     }
     Plugin.prototype = {
         _init: function() {
@@ -78,19 +80,29 @@ https://github.com/Bluefieldscom/intl-tel-input.git
             if (this.options.nationalMode) {
                 this.options.autoHideDialCode = false;
             }
-            // IE Mobile doesn't support the keypress event (see issue 68) which makes autoFormat impossible
-            if (navigator.userAgent.match(/IEMobile/i)) {
-                this.options.autoFormat = false;
+            // if separateDialCode then doesn't make sense to A) insert dial code into input (autoHideDialCode), and B) display national numbers (because we're displaying the country dial code next to them)
+            if (this.options.separateDialCode) {
+                this.options.autoHideDialCode = this.options.nationalMode = false;
+                // let's force this for now for simplicity - we can support this later if need be
+                this.options.allowDropdown = true;
             }
             // we cannot just test screen size as some smartphones/website meta tags will report desktop resolutions
-            // Note: for some reason jasmine fucks up if you put this in the main Plugin function with the rest of these declarations
+            // Note: for some reason jasmine breaks if you put this in the main Plugin function with the rest of these declarations
             // Note: to target Android Mobiles (and not Tablets), we must find "Android" and "Mobile"
             this.isMobile = /Android.+Mobile|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+            if (this.isMobile) {
+                // trigger the mobile dropdown css
+                $("body").addClass("iti-mobile");
+                // on mobile, we want a full screen dropdown, so we must append it to the body
+                if (!this.options.dropdownContainer) {
+                    this.options.dropdownContainer = "body";
+                }
+            }
             // we return these deferred objects from the _init() call so they can be watched, and then we resolve them when each specific request returns
-            // Note: again, jasmine had a spazz when I put these in the Plugin function
+            // Note: again, jasmine breaks when I put these in the Plugin function
             this.autoCountryDeferred = new $.Deferred();
             this.utilsScriptDeferred = new $.Deferred();
-            // process all the data: onlyCountries, preferredCountries etc
+            // process all the data: onlyCountries, excludeCountries, preferredCountries etc
             this._processCountryData();
             // generate the markup
             this._generateMarkup();
@@ -106,12 +118,14 @@ https://github.com/Bluefieldscom/intl-tel-input.git
         /********************
    *  PRIVATE METHODS
    ********************/
-        // prepare all of the country data, including onlyCountries and preferredCountries options
+        // prepare all of the country data, including onlyCountries, excludeCountries and preferredCountries options
         _processCountryData: function() {
-            // set the instances country data objects
-            this._setInstanceCountryData();
-            // set the preferredCountries property
-            this._setPreferredCountries();
+            // process onlyCountries or excludeCountries array if present
+            this._processAllCountries();
+            // process the countryCodes map
+            this._processCountryCodes();
+            // process the preferredCountries
+            this._processPreferredCountries();
         },
         // add a country code to this.countryCodes
         _addCountryCode: function(iso2, dialCode, priority) {
@@ -121,28 +135,43 @@ https://github.com/Bluefieldscom/intl-tel-input.git
             var index = priority || 0;
             this.countryCodes[dialCode][index] = iso2;
         },
-        // process onlyCountries array if present, and generate the countryCodes map
-        _setInstanceCountryData: function() {
+        // filter the given countries using the process function
+        _filterCountries: function(countryArray, processFunc) {
             var i;
-            // process onlyCountries option
-            if (this.options.onlyCountries.length) {
-                // standardise case
-                for (i = 0; i < this.options.onlyCountries.length; i++) {
-                    this.options.onlyCountries[i] = this.options.onlyCountries[i].toLowerCase();
-                }
-                // build instance country array
-                this.countries = [];
-                for (i = 0; i < allCountries.length; i++) {
-                    if ($.inArray(allCountries[i].iso2, this.options.onlyCountries) != -1) {
-                        this.countries.push(allCountries[i]);
-                    }
+            // standardise case
+            for (i = 0; i < countryArray.length; i++) {
+                countryArray[i] = countryArray[i].toLowerCase();
+            }
+            // build instance country array
+            this.countries = [];
+            for (i = 0; i < allCountries.length; i++) {
+                if (processFunc($.inArray(allCountries[i].iso2, countryArray))) {
+                    this.countries.push(allCountries[i]);
                 }
+            }
+        },
+        // process onlyCountries or excludeCountries array if present
+        _processAllCountries: function() {
+            if (this.options.onlyCountries.length) {
+                // process onlyCountries option
+                this._filterCountries(this.options.onlyCountries, function(inArray) {
+                    // if country is in array
+                    return inArray != -1;
+                });
+            } else if (this.options.excludeCountries.length) {
+                // process excludeCountries option
+                this._filterCountries(this.options.excludeCountries, function(inArray) {
+                    // if country is not in array
+                    return inArray == -1;
+                });
             } else {
                 this.countries = allCountries;
             }
-            // generate countryCodes map
+        },
+        // process the countryCodes map
+        _processCountryCodes: function() {
             this.countryCodes = {};
-            for (i = 0; i < this.countries.length; i++) {
+            for (var i = 0; i < this.countries.length; i++) {
                 var c = this.countries[i];
                 this._addCountryCode(c.iso2, c.dialCode, c.priority);
                 // area codes
@@ -154,9 +183,8 @@ https://github.com/Bluefieldscom/intl-tel-input.git
                 }
             }
         },
-        // process preferred countries - iterate through the preferences,
-        // fetching the country data for each one
-        _setPreferredCountries: function() {
+        // process preferred countries - iterate through the preferences, fetching the country data for each one
+        _processPreferredCountries: function() {
             this.preferredCountries = [];
             for (var i = 0; i < this.options.preferredCountries.length; i++) {
                 var countryCode = this.options.preferredCountries[i].toLowerCase(), countryData = this._getCountryData(countryCode, false, true);
@@ -167,59 +195,69 @@ https://github.com/Bluefieldscom/intl-tel-input.git
         },
         // generate all of the markup for the plugin: the selected flag overlay, and the dropdown
         _generateMarkup: function() {
-            // telephone input
-            this.telInput = $(this.element);
             // prevent autocomplete as there's no safe, cross-browser event we can react to, so it can easily put the plugin in an inconsistent state e.g. the wrong flag selected for the autocompleted number, which on submit could mean the wrong number is saved (esp in nationalMode)
             this.telInput.attr("autocomplete", "off");
             // containers (mostly for positioning)
+            var parentClass = "intl-tel-input";
+            if (this.options.allowDropdown) {
+                parentClass += " allow-dropdown";
+            }
+            if (this.options.separateDialCode) {
+                parentClass += " separate-dial-code";
+            }
             this.telInput.wrap($("<div>", {
-                "class": "intl-tel-input"
+                "class": parentClass
             }));
             this.flagsContainer = $("<div>", {
-                "class": "flag-dropdown"
+                "class": "flag-container"
             }).insertBefore(this.telInput);
             // currently selected flag (displayed to left of input)
             var selectedFlag = $("<div>", {
-                // make element focusable and tab naviagable
-                tabindex: "0",
                 "class": "selected-flag"
-            }).appendTo(this.flagsContainer);
+            });
+            selectedFlag.appendTo(this.flagsContainer);
             this.selectedFlagInner = $("<div>", {
                 "class": "iti-flag"
             }).appendTo(selectedFlag);
-            // CSS triangle
-            $("<div>", {
-                "class": "arrow"
-            }).appendTo(selectedFlag);
-            // country list
-            // mobile is just a native select element
-            // desktop is a proper list containing: preferred countries, then divider, then all countries
-            if (this.isMobile) {
-                this.countryList = $("<select>", {
-                    "class": "iti-mobile-select"
-                }).appendTo(this.flagsContainer);
-            } else {
+            if (this.options.separateDialCode) {
+                this.selectedDialCode = $("<div>", {
+                    "class": "selected-dial-code"
+                }).appendTo(selectedFlag);
+            }
+            if (this.options.allowDropdown) {
+                // make element focusable and tab naviagable
+                selectedFlag.attr("tabindex", "0");
+                // CSS triangle
+                $("<div>", {
+                    "class": "iti-arrow"
+                }).appendTo(selectedFlag);
+                // country dropdown: preferred countries, then divider, then all countries
                 this.countryList = $("<ul>", {
-                    "class": "country-list v-hide"
-                }).appendTo(this.flagsContainer);
-                if (this.preferredCountries.length && !this.isMobile) {
+                    "class": "country-list hide"
+                });
+                if (this.preferredCountries.length) {
                     this._appendListItems(this.preferredCountries, "preferred");
                     $("<li>", {
                         "class": "divider"
                     }).appendTo(this.countryList);
                 }
-            }
-            this._appendListItems(this.countries, "");
-            if (!this.isMobile) {
-                // now we can grab the dropdown height, and hide it properly
-                this.dropdownHeight = this.countryList.outerHeight();
-                this.countryList.removeClass("v-hide").addClass("hide");
+                this._appendListItems(this.countries, "");
                 // this is useful in lots of places
                 this.countryListItems = this.countryList.children(".country");
+                // create dropdownContainer markup
+                if (this.options.dropdownContainer) {
+                    this.dropdown = $("<div>", {
+                        "class": "intl-tel-input iti-container"
+                    }).append(this.countryList);
+                } else {
+                    this.countryList.appendTo(this.flagsContainer);
+                }
+            } else {
+                // a little hack so we don't break anything
+                this.countryListItems = $();
             }
         },
         // add a country <li> to the countryList <ul> container
-        // UPDATE: if isMobile, add an <option> to the countryList <select> container
         _appendListItems: function(countries, className) {
             // we create so many DOM elements, it is faster to build a temp string
             // and then add everything to the DOM in one go at the end
@@ -227,85 +265,86 @@ https://github.com/Bluefieldscom/intl-tel-input.git
             // for each country
             for (var i = 0; i < countries.length; i++) {
                 var c = countries[i];
-                if (this.isMobile) {
-                    tmp += "<option data-dial-code='" + c.dialCode + "' value='" + c.iso2 + "'>";
-                    tmp += c.name + " +" + c.dialCode;
-                    tmp += "</option>";
-                } else {
-                    // open the list item
-                    tmp += "<li class='country " + className + "' data-dial-code='" + c.dialCode + "' data-country-code='" + c.iso2 + "'>";
-                    // add the flag
-                    tmp += "<div class='flag'><div class='iti-flag " + c.iso2 + "'></div></div>";
-                    // and the country name and dial code
-                    tmp += "<span class='country-name'>" + c.name + "</span>";
-                    tmp += "<span class='dial-code'>+" + c.dialCode + "</span>";
-                    // close the list item
-                    tmp += "</li>";
-                }
+                // open the list item
+                tmp += "<li class='country " + className + "' data-dial-code='" + c.dialCode + "' data-country-code='" + c.iso2 + "'>";
+                // add the flag
+                tmp += "<div class='flag-box'><div class='iti-flag " + c.iso2 + "'></div></div>";
+                // and the country name and dial code
+                tmp += "<span class='country-name'>" + c.name + "</span>";
+                tmp += "<span class='dial-code'>+" + c.dialCode + "</span>";
+                // close the list item
+                tmp += "</li>";
             }
             this.countryList.append(tmp);
         },
-        // set the initial state of the input value and the selected flag
+        // set the initial state of the input value and the selected flag by:
+        // 1. extracting a dial code from the given number
+        // 2. using explicit initialCountry
+        // 3. picking the first preferred country
+        // 4. picking the first country
         _setInitialState: function() {
             var val = this.telInput.val();
-            // if there is a number, and it's valid, we can go ahead and set the flag, else fall back to default
+            // if we already have a dial code we can go ahead and set the flag, else fall back to default
             if (this._getDialCode(val)) {
                 this._updateFlagFromNumber(val, true);
-            } else if (this.options.defaultCountry != "auto") {
-                // check the defaultCountry option, else fall back to the first in the list
-                if (this.options.defaultCountry) {
-                    this.options.defaultCountry = this._getCountryData(this.options.defaultCountry.toLowerCase(), false, false);
+            } else if (this.options.initialCountry !== "auto") {
+                // see if we should select a flag
+                if (this.options.initialCountry) {
+                    this._setFlag(this.options.initialCountry, true);
                 } else {
-                    this.options.defaultCountry = this.preferredCountries.length ? this.preferredCountries[0] : this.countries[0];
+                    // no dial code and no initialCountry, so default to first in list
+                    this.defaultCountry = this.preferredCountries.length ? this.preferredCountries[0].iso2 : this.countries[0].iso2;
+                    if (!val) {
+                        this._setFlag(this.defaultCountry, true);
+                    }
                 }
-                this._selectFlag(this.options.defaultCountry.iso2);
-                // if empty, insert the default dial code (this function will check !nationalMode and !autoHideDialCode)
-                if (!val) {
-                    this._updateDialCode(this.options.defaultCountry.dialCode, false);
+                // if empty and no nationalMode and no autoHideDialCode then insert the default dial code
+                if (!val && !this.options.nationalMode && !this.options.autoHideDialCode && !this.options.separateDialCode) {
+                    this.telInput.val("+" + this.selectedCountryData.dialCode);
                 }
             }
+            // NOTE: if initialCountry is set to auto, that will be handled separately
             // format
             if (val) {
                 // this wont be run after _updateDialCode as that's only called if no val
-                this._updateVal(val);
+                this._updateValFromNumber(val, this.options.formatOnInit);
             }
         },
         // initialise the main event listeners: input keyup, and click selected flag
         _initListeners: function() {
-            var that = this;
             this._initKeyListeners();
-            // autoFormat prevents the change event from firing, so we need to check for changes between focus and blur in order to manually trigger it
-            if (this.options.autoHideDialCode || this.options.autoFormat) {
+            if (this.options.autoHideDialCode) {
                 this._initFocusListeners();
             }
-            if (this.isMobile) {
-                this.countryList.on("change" + this.ns, function(e) {
-                    that._selectListItem($(this).find("option:selected"));
-                });
-            } else {
-                // hack for input nested inside label: clicking the selected-flag to open the dropdown would then automatically trigger a 2nd click on the input which would close it again
-                var label = this.telInput.closest("label");
-                if (label.length) {
-                    label.on("click" + this.ns, function(e) {
-                        // if the dropdown is closed, then focus the input, else ignore the click
-                        if (that.countryList.hasClass("hide")) {
-                            that.telInput.focus();
-                        } else {
-                            e.preventDefault();
-                        }
-                    });
-                }
-                // toggle country dropdown on click
-                var selectedFlag = this.selectedFlagInner.parent();
-                selectedFlag.on("click" + this.ns, function(e) {
-                    // only intercept this event if we're opening the dropdown
-                    // else let it bubble up to the top ("click-off-to-close" listener)
-                    // we cannot just stopPropagation as it may be needed to close another instance
-                    if (that.countryList.hasClass("hide") && !that.telInput.prop("disabled") && !that.telInput.prop("readonly")) {
-                        that._showDropdown();
+            if (this.options.allowDropdown) {
+                this._initDropdownListeners();
+            }
+        },
+        // initialise the dropdown listeners
+        _initDropdownListeners: function() {
+            var that = this;
+            // hack for input nested inside label: clicking the selected-flag to open the dropdown would then automatically trigger a 2nd click on the input which would close it again
+            var label = this.telInput.closest("label");
+            if (label.length) {
+                label.on("click" + this.ns, function(e) {
+                    // if the dropdown is closed, then focus the input, else ignore the click
+                    if (that.countryList.hasClass("hide")) {
+                        that.telInput.focus();
+                    } else {
+                        e.preventDefault();
                     }
                 });
             }
+            // toggle country dropdown on click
+            var selectedFlag = this.selectedFlagInner.parent();
+            selectedFlag.on("click" + this.ns, function(e) {
+                // only intercept this event if we're opening the dropdown
+                // else let it bubble up to the top ("click-off-to-close" listener)
+                // we cannot just stopPropagation as it may be needed to close another instance
+                if (that.countryList.hasClass("hide") && !that.telInput.prop("disabled") && !that.telInput.prop("readonly")) {
+                    that._showDropdown();
+                }
+            });
             // open dropdown list if currently focused
             this.flagsContainer.on("keydown" + that.ns, function(e) {
                 var isDropdownHidden = that.countryList.hasClass("hide");
@@ -322,32 +361,34 @@ https://github.com/Bluefieldscom/intl-tel-input.git
                 }
             });
         },
+        // init many requests: utils script / geo ip lookup
         _initRequests: function() {
             var that = this;
-            // if the user has specified the path to the utils script, fetch it on window.load
+            // if the user has specified the path to the utils script, fetch it on window.load, else resolve
             if (this.options.utilsScript) {
                 // if the plugin is being initialised after the window.load event has already been fired
-                if (windowLoaded) {
-                    this.loadUtils();
+                if ($.fn[pluginName].windowLoaded) {
+                    $.fn[pluginName].loadUtils(this.options.utilsScript, this.utilsScriptDeferred);
                 } else {
                     // wait until the load event so we don't block any other requests e.g. the flags image
                     $(window).load(function() {
-                        that.loadUtils();
+                        $.fn[pluginName].loadUtils(that.options.utilsScript, that.utilsScriptDeferred);
                     });
                 }
             } else {
                 this.utilsScriptDeferred.resolve();
             }
-            if (this.options.defaultCountry == "auto") {
+            if (this.options.initialCountry === "auto") {
                 this._loadAutoCountry();
             } else {
                 this.autoCountryDeferred.resolve();
             }
         },
+        // perform the geo ip lookup
         _loadAutoCountry: function() {
             var that = this;
             // check for cookie
-            var cookieAutoCountry = $.cookie ? $.cookie("itiAutoCountry") : "";
+            var cookieAutoCountry = window.Cookies ? Cookies.get("itiAutoCountry") : "";
             if (cookieAutoCountry) {
                 $.fn[pluginName].autoCountry = cookieAutoCountry;
             }
@@ -356,221 +397,69 @@ https://github.com/Bluefieldscom/intl-tel-input.git
             // 2) not already started loading (start)
             // 3) already started loading (do nothing - just wait for loading callback to fire)
             if ($.fn[pluginName].autoCountry) {
-                this.autoCountryLoaded();
+                this.handleAutoCountry();
             } else if (!$.fn[pluginName].startedLoadingAutoCountry) {
                 // don't do this twice!
                 $.fn[pluginName].startedLoadingAutoCountry = true;
                 if (typeof this.options.geoIpLookup === "function") {
                     this.options.geoIpLookup(function(countryCode) {
                         $.fn[pluginName].autoCountry = countryCode.toLowerCase();
-                        if ($.cookie) {
-                            $.cookie("itiAutoCountry", $.fn[pluginName].autoCountry, {
+                        if (window.Cookies) {
+                            Cookies.set("itiAutoCountry", $.fn[pluginName].autoCountry, {
                                 path: "/"
                             });
                         }
                         // tell all instances the auto country is ready
                         // TODO: this should just be the current instances
-                        $(".intl-tel-input input").intlTelInput("autoCountryLoaded");
+                        // UPDATE: use setTimeout in case their geoIpLookup function calls this callback straight away (e.g. if they have already done the geo ip lookup somewhere else). Using setTimeout means that the current thread of execution will finish before executing this, which allows the plugin to finish initialising.
+                        setTimeout(function() {
+                            $(".intl-tel-input input").intlTelInput("handleAutoCountry");
+                        });
                     });
                 }
             }
         },
+        // initialize any key listeners
         _initKeyListeners: function() {
             var that = this;
-            if (this.options.autoFormat) {
-                // format number and update flag on keypress
-                // use keypress event as we want to ignore all input except for a select few keys,
-                // but we dont want to ignore the navigation keys like the arrows etc.
-                // NOTE: no point in refactoring this to only bind these listeners on focus/blur because then you would need to have those 2 listeners running the whole time anyway...
-                this.telInput.on("keypress" + this.ns, function(e) {
-                    // 32 is space, and after that it's all chars (not meta/nav keys)
-                    // this fix is needed for Firefox, which triggers keypress event for some meta/nav keys
-                    // Update: also ignore if this is a metaKey e.g. FF and Safari trigger keypress on the v of Ctrl+v
-                    // Update: also ignore if ctrlKey (FF on Windows/Ubuntu)
-                    // Update: also check that we have utils before we do any autoFormat stuff
-                    if (e.which >= keys.SPACE && !e.ctrlKey && !e.metaKey && window.intlTelInputUtils && !that.telInput.prop("readonly")) {
-                        e.preventDefault();
-                        // allowed keys are just numeric keys and plus
-                        // we must allow plus for the case where the user does select-all and then hits plus to start typing a new number. we could refine this logic to first check that the selection contains a plus, but that wont work in old browsers, and I think it's overkill anyway
-                        var isAllowedKey = e.which >= keys.ZERO && e.which <= keys.NINE || e.which == keys.PLUS, input = that.telInput[0], noSelection = that.isGoodBrowser && input.selectionStart == input.selectionEnd, max = that.telInput.attr("maxlength"), val = that.telInput.val(), // assumes that if max exists, it is >0
-                        isBelowMax = max ? val.length < max : true;
-                        // first: ensure we dont go over maxlength. we must do this here to prevent adding digits in the middle of the number
-                        // still reformat even if not an allowed key as they could by typing a formatting char, but ignore if there's a selection as doesn't make sense to replace selection with illegal char and then immediately remove it
-                        if (isBelowMax && (isAllowedKey || noSelection)) {
-                            var newChar = isAllowedKey ? String.fromCharCode(e.which) : null;
-                            that._handleInputKey(newChar, true, isAllowedKey);
-                            // if something has changed, trigger the input event (which was otherwised squashed by the preventDefault)
-                            if (val != that.telInput.val()) {
-                                that.telInput.trigger("input");
-                            }
-                        }
-                        if (!isAllowedKey) {
-                            that._handleInvalidKey();
-                        }
-                    }
-                });
-            }
-            // handle cut/paste event (now supported in all major browsers)
-            this.telInput.on("cut" + this.ns + " paste" + this.ns, function() {
+            // update flag on keyup
+            // (keep this listener separate otherwise the setTimeout breaks all the tests)
+            this.telInput.on("keyup" + this.ns, function() {
+                that._updateFlagFromNumber(that.telInput.val());
+            });
+            // update flag on cut/paste events (now supported in all major browsers)
+            this.telInput.on("cut" + this.ns + " paste" + this.ns + " keyup" + this.ns, function() {
                 // hack because "paste" event is fired before input is updated
                 setTimeout(function() {
-                    if (that.options.autoFormat && window.intlTelInputUtils) {
-                        var cursorAtEnd = that.isGoodBrowser && that.telInput[0].selectionStart == that.telInput.val().length;
-                        that._handleInputKey(null, cursorAtEnd);
-                        that._ensurePlus();
-                    } else {
-                        // if no autoFormat, just update flag
-                        that._updateFlagFromNumber(that.telInput.val());
-                    }
-                });
-            });
-            // handle keyup event
-            // if autoFormat enabled: we use keyup to catch delete events (after the fact)
-            // if no autoFormat, this is used to update the flag
-            this.telInput.on("keyup" + this.ns, function(e) {
-                // the "enter" key event from selecting a dropdown item is triggered here on the input, because the document.keydown handler that initially handles that event triggers a focus on the input, and so the keyup for that same key event gets triggered here. weird, but just make sure we dont bother doing any re-formatting in this case (we've already done preventDefault in the keydown handler, so it wont actually submit the form or anything).
-                // ALSO: ignore keyup if readonly
-                if (e.which == keys.ENTER || that.telInput.prop("readonly")) {} else if (that.options.autoFormat && window.intlTelInputUtils) {
-                    // cursorAtEnd defaults to false for bad browsers else they would never get a reformat on delete
-                    var cursorAtEnd = that.isGoodBrowser && that.telInput[0].selectionStart == that.telInput.val().length;
-                    if (!that.telInput.val()) {
-                        // if they just cleared the input, update the flag to the default
-                        that._updateFlagFromNumber("");
-                    } else if (e.which == keys.DEL && !cursorAtEnd || e.which == keys.BSPACE) {
-                        // if delete in the middle: reformat with no suffix (no need to reformat if delete at end)
-                        // if backspace: reformat with no suffix (need to reformat if at end to remove any lingering suffix - this is a feature)
-                        // important to remember never to add suffix on any delete key as can fuck up in ie8 so you can never delete a formatting char at the end
-                        that._handleInputKey();
-                    }
-                    that._ensurePlus();
-                } else {
-                    // if no autoFormat, just update flag
                     that._updateFlagFromNumber(that.telInput.val());
-                }
+                });
             });
         },
-        // prevent deleting the plus (if not in nationalMode)
-        _ensurePlus: function() {
-            if (!this.options.nationalMode) {
-                var val = this.telInput.val(), input = this.telInput[0];
-                if (val.charAt(0) != "+") {
-                    // newCursorPos is current pos + 1 to account for the plus we are about to add
-                    var newCursorPos = this.isGoodBrowser ? input.selectionStart + 1 : 0;
-                    this.telInput.val("+" + val);
-                    if (this.isGoodBrowser) {
-                        input.setSelectionRange(newCursorPos, newCursorPos);
-                    }
-                }
-            }
-        },
-        // alert the user to an invalid key event
-        _handleInvalidKey: function() {
-            var that = this;
-            this.telInput.trigger("invalidkey").addClass("iti-invalid-key");
-            setTimeout(function() {
-                that.telInput.removeClass("iti-invalid-key");
-            }, 100);
-        },
-        // when autoFormat is enabled: handle various key events on the input:
-        // 1) adding a new number character, which will replace any selection, reformat, and preserve the cursor position
-        // 2) reformatting on backspace/delete
-        // 3) cut/paste event
-        _handleInputKey: function(newNumericChar, addSuffix, isAllowedKey) {
-            var val = this.telInput.val(), cleanBefore = this._getClean(val), originalLeftChars, // raw DOM element
-            input = this.telInput[0], digitsOnRight = 0;
-            if (this.isGoodBrowser) {
-                // cursor strategy: maintain the number of digits on the right. we use the right instead of the left so that A) we dont have to account for the new digit (or multiple digits if paste event), and B) we're always on the right side of formatting suffixes
-                digitsOnRight = this._getDigitsOnRight(val, input.selectionEnd);
-                // if handling a new number character: insert it in the right place
-                if (newNumericChar) {
-                    // replace any selection they may have made with the new char
-                    val = val.substr(0, input.selectionStart) + newNumericChar + val.substring(input.selectionEnd, val.length);
-                } else {
-                    // here we're not handling a new char, we're just doing a re-format (e.g. on delete/backspace/paste, after the fact), but we still need to maintain the cursor position. so make note of the char on the left, and then after the re-format, we'll count in the same number of digits from the right, and then keep going through any formatting chars until we hit the same left char that we had before.
-                    // UPDATE: now have to store 2 chars as extensions formatting contains 2 spaces so you need to be able to distinguish
-                    originalLeftChars = val.substr(input.selectionStart - 2, 2);
-                }
-            } else if (newNumericChar) {
-                val += newNumericChar;
-            }
-            // update the number and flag
-            this.setNumber(val, null, addSuffix, true, isAllowedKey);
-            // update the cursor position
-            if (this.isGoodBrowser) {
-                var newCursor;
-                val = this.telInput.val();
-                // if it was at the end, keep it there
-                if (!digitsOnRight) {
-                    newCursor = val.length;
-                } else {
-                    // else count in the same number of digits from the right
-                    newCursor = this._getCursorFromDigitsOnRight(val, digitsOnRight);
-                    // but if delete/paste etc, keep going left until hit the same left char as before
-                    if (!newNumericChar) {
-                        newCursor = this._getCursorFromLeftChar(val, newCursor, originalLeftChars);
-                    }
-                }
-                // set the new cursor
-                input.setSelectionRange(newCursor, newCursor);
-            }
-        },
-        // we start from the position in guessCursor, and work our way left until we hit the originalLeftChars or a number to make sure that after reformatting the cursor has the same char on the left in the case of a delete etc
-        _getCursorFromLeftChar: function(val, guessCursor, originalLeftChars) {
-            for (var i = guessCursor; i > 0; i--) {
-                var leftChar = val.charAt(i - 1);
-                if ($.isNumeric(leftChar) || val.substr(i - 2, 2) == originalLeftChars) {
-                    return i;
-                }
-            }
-            return 0;
+        // adhere to the input's maxlength attr
+        _cap: function(number) {
+            var max = this.telInput.attr("maxlength");
+            return max && number.length > max ? number.substr(0, max) : number;
         },
-        // after a reformat we need to make sure there are still the same number of digits to the right of the cursor
-        _getCursorFromDigitsOnRight: function(val, digitsOnRight) {
-            for (var i = val.length - 1; i >= 0; i--) {
-                if ($.isNumeric(val.charAt(i))) {
-                    if (--digitsOnRight === 0) {
-                        return i;
-                    }
-                }
-            }
-            return 0;
-        },
-        // get the number of numeric digits to the right of the cursor so we can reposition the cursor correctly after the reformat has happened
-        _getDigitsOnRight: function(val, selectionEnd) {
-            var digitsOnRight = 0;
-            for (var i = selectionEnd; i < val.length; i++) {
-                if ($.isNumeric(val.charAt(i))) {
-                    digitsOnRight++;
-                }
-            }
-            return digitsOnRight;
-        },
-        // listen for focus and blur
+        // listen for mousedown, focus and blur
         _initFocusListeners: function() {
             var that = this;
-            if (this.options.autoHideDialCode) {
-                // mousedown decides where the cursor goes, so if we're focusing we must preventDefault as we'll be inserting the dial code, and we want the cursor to be at the end no matter where they click
-                this.telInput.on("mousedown" + this.ns, function(e) {
-                    if (!that.telInput.is(":focus") && !that.telInput.val()) {
-                        e.preventDefault();
-                        // but this also cancels the focus, so we must trigger that manually
-                        that.telInput.focus();
-                    }
-                });
-            }
+            // mousedown decides where the cursor goes, so if we're focusing we must preventDefault as we'll be inserting the dial code, and we want the cursor to be at the end no matter where they click
+            this.telInput.on("mousedown" + this.ns, function(e) {
+                if (!that.telInput.is(":focus") && !that.telInput.val()) {
+                    e.preventDefault();
+                    // but this also cancels the focus, so we must trigger that manually
+                    that.telInput.focus();
+                }
+            });
+            // on focus: if empty, insert the dial code for the currently selected flag
             this.telInput.on("focus" + this.ns, function(e) {
-                var value = that.telInput.val();
-                // save this to compare on blur
-                that.telInput.data("focusVal", value);
-                // on focus: if empty, insert the dial code for the currently selected flag
-                if (that.options.autoHideDialCode && !value && !that.telInput.prop("readonly") && that.selectedCountryData.dialCode) {
-                    that._updateVal("+" + that.selectedCountryData.dialCode, null, true);
+                if (!that.telInput.val() && !that.telInput.prop("readonly") && that.selectedCountryData.dialCode) {
+                    // insert the dial code
+                    that.telInput.val("+" + that.selectedCountryData.dialCode);
                     // after auto-inserting a dial code, if the first key they hit is '+' then assume they are entering a new number, so remove the dial code. use keypress instead of keydown because keydown gets triggered for the shift key (required to hit the + key), and instead of keyup because that shows the new '+' before removing the old one
                     that.telInput.one("keypress.plus" + that.ns, function(e) {
                         if (e.which == keys.PLUS) {
-                            // if autoFormat is enabled, this key event will have already have been handled by another keypress listener (hence we need to add the "+"). if disabled, it will be handled after this by a keyup listener (hence no need to add the "+").
-                            var newVal = that.options.autoFormat && window.intlTelInputUtils ? "+" : "";
-                            that.telInput.val(newVal);
+                            that.telInput.val("");
                         }
                     });
                     // after tabbing in, make sure the cursor is at the end we must use setTimeout to get outside of the focus handler as it seems the selection happens after that
@@ -583,34 +472,24 @@ https://github.com/Bluefieldscom/intl-tel-input.git
                     });
                 }
             });
+            // on blur: if just a dial code then remove it
             this.telInput.on("blur" + this.ns, function() {
-                if (that.options.autoHideDialCode) {
-                    // on blur: if just a dial code then remove it
-                    var value = that.telInput.val(), startsPlus = value.charAt(0) == "+";
-                    if (startsPlus) {
-                        var numeric = that._getNumeric(value);
-                        // if just a plus, or if just a dial code
-                        if (!numeric || that.selectedCountryData.dialCode == numeric) {
-                            that.telInput.val("");
-                        }
+                var value = that.telInput.val(), startsPlus = value.charAt(0) == "+";
+                if (startsPlus) {
+                    var numeric = that._getNumeric(value);
+                    // if just a plus, or if just a dial code
+                    if (!numeric || that.selectedCountryData.dialCode == numeric) {
+                        that.telInput.val("");
                     }
-                    // remove the keypress listener we added on focus
-                    that.telInput.off("keypress.plus" + that.ns);
-                }
-                // if autoFormat, we must manually trigger change event if value has changed
-                if (that.options.autoFormat && window.intlTelInputUtils && that.telInput.val() != that.telInput.data("focusVal")) {
-                    that.telInput.trigger("change");
                 }
+                // remove the keypress listener we added on focus
+                that.telInput.off("keypress.plus" + that.ns);
             });
         },
         // extract the numeric digits from the given string
         _getNumeric: function(s) {
             return s.replace(/\D/g, "");
         },
-        _getClean: function(s) {
-            var prefix = s.charAt(0) == "+" ? "+" : "";
-            return prefix + this._getNumeric(s);
-        },
         // show the dropdown
         _showDropdown: function() {
             this._setDropdownPosition();
@@ -618,24 +497,41 @@ https://github.com/Bluefieldscom/intl-tel-input.git
             var activeListItem = this.countryList.children(".active");
             if (activeListItem.length) {
                 this._highlightListItem(activeListItem);
-            }
-            // show it
-            this.countryList.removeClass("hide");
-            if (activeListItem.length) {
                 this._scrollTo(activeListItem);
             }
             // bind all the dropdown-related listeners: mouseover, click, click-off, keydown
             this._bindDropdownListeners();
             // update the arrow
-            this.selectedFlagInner.children(".arrow").addClass("up");
+            this.selectedFlagInner.children(".iti-arrow").addClass("up");
         },
         // decide where to position dropdown (depends on position within viewport, and scroll)
         _setDropdownPosition: function() {
-            var inputTop = this.telInput.offset().top, windowTop = $(window).scrollTop(), // dropdownFitsBelow = (dropdownBottom < windowBottom)
-            dropdownFitsBelow = inputTop + this.telInput.outerHeight() + this.dropdownHeight < windowTop + $(window).height(), dropdownFitsAbove = inputTop - this.dropdownHeight > windowTop;
-            // dropdownHeight - 1 for border
-            var cssTop = !dropdownFitsBelow && dropdownFitsAbove ? "-" + (this.dropdownHeight - 1) + "px" : "";
-            this.countryList.css("top", cssTop);
+            var that = this;
+            if (this.options.dropdownContainer) {
+                this.dropdown.appendTo(this.options.dropdownContainer);
+            }
+            // show the menu and grab the dropdown height
+            this.dropdownHeight = this.countryList.removeClass("hide").outerHeight();
+            if (!this.isMobile) {
+                var pos = this.telInput.offset(), inputTop = pos.top, windowTop = $(window).scrollTop(), // dropdownFitsBelow = (dropdownBottom < windowBottom)
+                dropdownFitsBelow = inputTop + this.telInput.outerHeight() + this.dropdownHeight < windowTop + $(window).height(), dropdownFitsAbove = inputTop - this.dropdownHeight > windowTop;
+                // by default, the dropdown will be below the input. If we want to position it above the input, we add the dropup class.
+                this.countryList.toggleClass("dropup", !dropdownFitsBelow && dropdownFitsAbove);
+                // if dropdownContainer is enabled, calculate postion
+                if (this.options.dropdownContainer) {
+                    // by default the dropdown will be directly over the input because it's not in the flow. If we want to position it below, we need to add some extra top value.
+                    var extraTop = !dropdownFitsBelow && dropdownFitsAbove ? 0 : this.telInput.innerHeight();
+                    // calculate placement
+                    this.dropdown.css({
+                        top: inputTop + extraTop,
+                        left: pos.left
+                    });
+                    // close menu on window scroll
+                    $(window).on("scroll" + this.ns, function() {
+                        that._closeDropdown();
+                    });
+                }
+            }
         },
         // we only bind dropdown listeners when the dropdown is open
         _bindDropdownListeners: function() {
@@ -728,36 +624,22 @@ https://github.com/Bluefieldscom/intl-tel-input.git
         _startsWith: function(a, b) {
             return a.substr(0, b.length).toUpperCase() == b;
         },
-        // update the input's value to the given val
-        // if autoFormat=true, format it first according to the country-specific formatting rules
-        // Note: preventConversion will be false (i.e. we allow conversion) on init and when dev calls public method setNumber
-        _updateVal: function(val, format, addSuffix, preventConversion, isAllowedKey) {
-            var formatted;
-            if (this.options.autoFormat && window.intlTelInputUtils && this.selectedCountryData) {
-                if (typeof format == "number" && intlTelInputUtils.isValidNumber(val, this.selectedCountryData.iso2)) {
-                    // if user specified a format, and it's a valid number, then format it accordingly
-                    formatted = intlTelInputUtils.formatNumberByType(val, this.selectedCountryData.iso2, format);
-                } else if (!preventConversion && this.options.nationalMode && val.charAt(0) == "+" && intlTelInputUtils.isValidNumber(val, this.selectedCountryData.iso2)) {
-                    // if nationalMode and we have a valid intl number, convert it to ntl
-                    formatted = intlTelInputUtils.formatNumberByType(val, this.selectedCountryData.iso2, intlTelInputUtils.numberFormat.NATIONAL);
-                } else {
-                    // else do the regular AsYouType formatting
-                    formatted = intlTelInputUtils.formatNumber(val, this.selectedCountryData.iso2, addSuffix, this.options.allowExtensions, isAllowedKey);
+        // update the input's value to the given val (format first if possible)
+        // NOTE: this is called from _setInitialState, handleUtils and setNumber
+        _updateValFromNumber: function(number, doFormat, format) {
+            if (doFormat && window.intlTelInputUtils && this.selectedCountryData) {
+                if (!$.isNumeric(format)) {
+                    format = this.options.nationalMode || number.charAt(0) != "+" ? intlTelInputUtils.numberFormat.NATIONAL : intlTelInputUtils.numberFormat.INTERNATIONAL;
                 }
-                // ensure we dont go over maxlength. we must do this here to truncate any formatting suffix, and also handle paste events
-                var max = this.telInput.attr("maxlength");
-                if (max && formatted.length > max) {
-                    formatted = formatted.substr(0, max);
-                }
-            } else {
-                // no autoFormat, so just insert the original value
-                formatted = val;
+                number = intlTelInputUtils.formatNumber(number, this.selectedCountryData.iso2, format);
             }
-            this.telInput.val(formatted);
+            number = this._beforeSetNumber(number);
+            this.telInput.val(number);
         },
         // check if need to select a new flag based on the given number
-        _updateFlagFromNumber: function(number, updateDefault) {
-            // if we're in nationalMode and we're on US/Canada, make sure the number starts with a +1 so _getDialCode will be able to extract the area code
+        // Note: called from _setInitialState, keyup handler, setNumber
+        _updateFlagFromNumber: function(number, isInit) {
+            // if we're in nationalMode and we already have US/Canada selected, make sure the number starts with a +1 so _getDialCode will be able to extract the area code
             // update: if we dont yet have selectedCountryData, but we're here (trying to update the flag from the number), that means we're initialising the plugin with a number that already has a dial code, so fine to ignore this bit
             if (number && this.options.nationalMode && this.selectedCountryData && this.selectedCountryData.dialCode == "1" && number.charAt(0) != "+") {
                 if (number.charAt(0) != "1") {
@@ -782,17 +664,17 @@ https://github.com/Bluefieldscom/intl-tel-input.git
                 }
             } else if (number.charAt(0) == "+" && this._getNumeric(number).length) {
                 // invalid dial code, so empty
-                // Note: use getNumeric here because the number has not been formatted yet, so could contain bad shit
+                // Note: use getNumeric here because the number has not been formatted yet, so could contain bad chars
                 countryCode = "";
             } else if (!number || number == "+") {
                 // empty, or just a plus, so default
-                countryCode = this.options.defaultCountry.iso2;
+                countryCode = this.defaultCountry;
             }
             if (countryCode !== null) {
-                this._selectFlag(countryCode, updateDefault);
+                this._setFlag(countryCode, isInit);
             }
         },
-        // check if the given number contains an unknown area code from the North American Numbering Plan i.e. the only dialCode that could be extracted was +1 but the actual number's length is >=4
+        // check if the given number contains an unknown area code from the North American Numbering Plan i.e. the only dialCode that could be extracted was +1 (instead of say +1 702) and the actual number's length is >=4
         _isUnknownNanp: function(number, dialCode) {
             return dialCode == "+1" && this._getNumeric(number).length >= 4;
         },
@@ -817,50 +699,58 @@ https://github.com/Bluefieldscom/intl-tel-input.git
             }
         },
         // select the given flag, update the placeholder and the active list item
-        _selectFlag: function(countryCode, updateDefault) {
+        // Note: called from _setInitialState, _updateFlagFromNumber, _selectListItem, setCountry
+        _setFlag: function(countryCode, isInit) {
+            var prevCountry = this.selectedCountryData && this.selectedCountryData.iso2 ? this.selectedCountryData : {};
             // do this first as it will throw an error and stop if countryCode is invalid
             this.selectedCountryData = countryCode ? this._getCountryData(countryCode, false, false) : {};
-            // update the "defaultCountry" - we only need the iso2 from now on, so just store that
-            if (updateDefault && this.selectedCountryData.iso2) {
-                // can't just make this equal to selectedCountryData as would be a ref to that object
-                this.options.defaultCountry = {
-                    iso2: this.selectedCountryData.iso2
-                };
+            // update the defaultCountry - we only need the iso2 from now on, so just store that
+            if (this.selectedCountryData.iso2) {
+                this.defaultCountry = this.selectedCountryData.iso2;
             }
             this.selectedFlagInner.attr("class", "iti-flag " + countryCode);
             // update the selected country's title attribute
             var title = countryCode ? this.selectedCountryData.name + ": +" + this.selectedCountryData.dialCode : "Unknown";
             this.selectedFlagInner.parent().attr("title", title);
+            if (this.options.separateDialCode) {
+                var dialCode = this.selectedCountryData.dialCode ? "+" + this.selectedCountryData.dialCode : "", parent = this.telInput.parent();
+                if (prevCountry.dialCode) {
+                    parent.removeClass("iti-sdc-" + (prevCountry.dialCode.length + 1));
+                }
+                if (dialCode) {
+                    parent.addClass("iti-sdc-" + dialCode.length);
+                }
+                this.selectedDialCode.text(dialCode);
+            }
             // and the input's placeholder
             this._updatePlaceholder();
-            if (this.isMobile) {
-                this.countryList.val(countryCode);
-            } else {
-                // update the active list item
-                this.countryListItems.removeClass("active");
-                if (countryCode) {
-                    this.countryListItems.find(".iti-flag." + countryCode).first().closest(".country").addClass("active");
-                }
+            // update the active list item
+            this.countryListItems.removeClass("active");
+            if (countryCode) {
+                this.countryListItems.find(".iti-flag." + countryCode).first().closest(".country").addClass("active");
+            }
+            // on change flag, trigger a custom event
+            if (!isInit && prevCountry.iso2 !== countryCode) {
+                this.telInput.trigger("countrychange", this.selectedCountryData);
             }
         },
         // update the input placeholder to an example number from the currently selected country
         _updatePlaceholder: function() {
             if (window.intlTelInputUtils && !this.hadInitialPlaceholder && this.options.autoPlaceholder && this.selectedCountryData) {
-                var iso2 = this.selectedCountryData.iso2, numberType = intlTelInputUtils.numberType[this.options.numberType || "FIXED_LINE"], placeholder = iso2 ? intlTelInputUtils.getExampleNumber(iso2, this.options.nationalMode, numberType) : "";
+                var numberType = intlTelInputUtils.numberType[this.options.numberType], placeholder = this.selectedCountryData.iso2 ? intlTelInputUtils.getExampleNumber(this.selectedCountryData.iso2, this.options.nationalMode, numberType) : "";
+                placeholder = this._beforeSetNumber(placeholder);
+                if (typeof this.options.customPlaceholder === "function") {
+                    placeholder = this.options.customPlaceholder(placeholder, this.selectedCountryData);
+                }
                 this.telInput.attr("placeholder", placeholder);
             }
         },
         // called when the user selects a list item from the dropdown
         _selectListItem: function(listItem) {
-            var countryCodeAttr = this.isMobile ? "value" : "data-country-code";
             // update selected flag and active list item
-            this._selectFlag(listItem.attr(countryCodeAttr), true);
-            if (!this.isMobile) {
-                this._closeDropdown();
-            }
+            this._setFlag(listItem.attr("data-country-code"));
+            this._closeDropdown();
             this._updateDialCode(listItem.attr("data-dial-code"), true);
-            // always fire the change event as even if nationalMode=true (and we haven't updated the input val), the system as a whole has still changed - see country-sync example. think of it as making a selection from a select element.
-            this.telInput.trigger("change");
             // focus the input
             this.telInput.focus();
             // fix for FF and IE11 (with nationalMode=false i.e. auto inserting dial code), who try to put the cursor at the beginning the first time
@@ -873,13 +763,20 @@ https://github.com/Bluefieldscom/intl-tel-input.git
         _closeDropdown: function() {
             this.countryList.addClass("hide");
             // update the arrow
-            this.selectedFlagInner.children(".arrow").removeClass("up");
+            this.selectedFlagInner.children(".iti-arrow").removeClass("up");
             // unbind key events
             $(document).off(this.ns);
             // unbind click-off-to-close
             $("html").off(this.ns);
             // unbind hover and click listeners
             this.countryList.off(this.ns);
+            // remove menu from container
+            if (this.options.dropdownContainer) {
+                if (!this.isMobile) {
+                    $(window).off("scroll" + this.ns);
+                }
+                this.dropdown.detach();
+            }
         },
         // check if an element is visible within it's container, else scroll until it is
         _scrollTo: function(element, middle) {
@@ -899,30 +796,39 @@ https://github.com/Bluefieldscom/intl-tel-input.git
                 container.scrollTop(newScrollTop - heightDifference);
             }
         },
-        // replace any existing dial code with the new one (if not in nationalMode)
-        // also we need to know if we're focusing for a couple of reasons e.g. if so, we want to add any formatting suffix, also if the input is empty and we're not in nationalMode, then we want to insert the dial code
-        _updateDialCode: function(newDialCode, focusing) {
+        // replace any existing dial code with the new one
+        // Note: called from _selectListItem and setCountry
+        _updateDialCode: function(newDialCode, hasSelectedListItem) {
             var inputVal = this.telInput.val(), newNumber;
             // save having to pass this every time
             newDialCode = "+" + newDialCode;
-            if (this.options.nationalMode && inputVal.charAt(0) != "+") {
-                // if nationalMode, we just want to re-format
-                newNumber = inputVal;
-            } else if (inputVal) {
-                // if the previous number contained a valid dial code, replace it
-                // (if more than just a plus character)
+            if (inputVal.charAt(0) == "+") {
+                // there's a plus so we're dealing with a replacement (doesn't matter if nationalMode or not)
                 var prevDialCode = this._getDialCode(inputVal);
-                if (prevDialCode.length > 1) {
+                if (prevDialCode) {
+                    // current number contains a valid dial code, so replace it
                     newNumber = inputVal.replace(prevDialCode, newDialCode);
                 } else {
-                    // if the previous number didn't contain a dial code, we should persist it
-                    var existingNumber = inputVal.charAt(0) != "+" ? $.trim(inputVal) : "";
-                    newNumber = newDialCode + existingNumber;
+                    // current number contains an invalid dial code, so ditch it
+                    // (no way to determine where the invalid dial code ends and the rest of the number begins)
+                    newNumber = newDialCode;
                 }
+            } else if (this.options.nationalMode || this.options.separateDialCode) {
+                // don't do anything
+                return;
             } else {
-                newNumber = !this.options.autoHideDialCode || focusing ? newDialCode : "";
+                // nationalMode is disabled
+                if (inputVal) {
+                    // there is an existing value with no dial code: prefix the new dial code
+                    newNumber = newDialCode + inputVal;
+                } else if (hasSelectedListItem || !this.options.autoHideDialCode) {
+                    // no existing value and either they've just selected a list item, or autoHideDialCode is disabled: insert new dial code
+                    newNumber = newDialCode;
+                } else {
+                    return;
+                }
             }
-            this._updateVal(newNumber, null, focusing);
+            this.telInput.val(newNumber);
         },
         // try and extract a valid international dial code from a full telephone number
         // Note: returns the raw string inc plus character and any whitespace/dots etc
@@ -951,53 +857,80 @@ https://github.com/Bluefieldscom/intl-tel-input.git
             }
             return dialCode;
         },
+        // get the input val, adding the dial code if separateDialCode is enabled
+        _getFullNumber: function() {
+            var prefix = this.options.separateDialCode ? "+" + this.selectedCountryData.dialCode : "";
+            return prefix + this.telInput.val();
+        },
+        // remove the dial code if separateDialCode is enabled
+        _beforeSetNumber: function(number) {
+            if (this.options.separateDialCode) {
+                var dialCode = this._getDialCode(number);
+                if (dialCode) {
+                    // US dialCode is "+1", which is what we want
+                    // CA dialCode is "+1 123", which is wrong - should be "+1" (as it has multiple area codes)
+                    // AS dialCode is "+1 684", which is what we want
+                    // Solution: if the country has area codes, then revert to just the dial code
+                    if (this.selectedCountryData.areaCodes !== null) {
+                        dialCode = "+" + this.selectedCountryData.dialCode;
+                    }
+                    // a lot of numbers will have a space separating the dial code and the main number, and some NANP numbers will have a hyphen e.g. +1 684-733-1234 - in both cases we want to get rid of it
+                    // NOTE: don't just trim all non-numerics as may want to preserve an open parenthesis etc
+                    var start = number[dialCode.length] === " " || number[dialCode.length] === "-" ? dialCode.length + 1 : dialCode.length;
+                    number = number.substr(start);
+                }
+            }
+            return this._cap(number);
+        },
         /********************
    *  PUBLIC METHODS
    ********************/
         // this is called when the geoip call returns
-        autoCountryLoaded: function() {
-            if (this.options.defaultCountry == "auto") {
-                this.options.defaultCountry = $.fn[pluginName].autoCountry;
-                this._setInitialState();
+        handleAutoCountry: function() {
+            if (this.options.initialCountry === "auto") {
+                // we must set this even if there is an initial val in the input: in case the initial val is invalid and they delete it - they should see their auto country
+                this.defaultCountry = $.fn[pluginName].autoCountry;
+                // if there's no initial value in the input, then update the flag
+                if (!this.telInput.val()) {
+                    this.setCountry(this.defaultCountry);
+                }
                 this.autoCountryDeferred.resolve();
             }
         },
         // remove plugin
         destroy: function() {
-            if (!this.isMobile) {
+            if (this.allowDropdown) {
                 // make sure the dropdown is closed (and unbind listeners)
                 this._closeDropdown();
-            }
-            // key events, and focus/blur events if autoHideDialCode=true
-            this.telInput.off(this.ns);
-            if (this.isMobile) {
-                // change event on select country
-                this.countryList.off(this.ns);
-            } else {
                 // click event to open dropdown
                 this.selectedFlagInner.parent().off(this.ns);
                 // label click hack
                 this.telInput.closest("label").off(this.ns);
             }
-            // remove markup
+            // unbind all events: key events, and focus/blur events if autoHideDialCode=true
+            this.telInput.off(this.ns);
+            // remove markup (but leave the original input)
             var container = this.telInput.parent();
             container.before(this.telInput).remove();
         },
-        // extract the phone number extension if present
+        // get the extension from the current number
         getExtension: function() {
-            return this.telInput.val().split(" ext. ")[1] || "";
+            if (window.intlTelInputUtils) {
+                return intlTelInputUtils.getExtension(this._getFullNumber(), this.selectedCountryData.iso2);
+            }
+            return "";
         },
-        // format the number to the given type
-        getNumber: function(type) {
+        // format the number to the given format
+        getNumber: function(format) {
             if (window.intlTelInputUtils) {
-                return intlTelInputUtils.formatNumberByType(this.telInput.val(), this.selectedCountryData.iso2, type);
+                return intlTelInputUtils.formatNumber(this._getFullNumber(), this.selectedCountryData.iso2, format);
             }
             return "";
         },
         // get the type of the entered number e.g. landline/mobile
         getNumberType: function() {
             if (window.intlTelInputUtils) {
-                return intlTelInputUtils.getNumberType(this.telInput.val(), this.selectedCountryData.iso2);
+                return intlTelInputUtils.getNumberType(this._getFullNumber(), this.selectedCountryData.iso2);
             }
             return -99;
         },
@@ -1009,77 +942,52 @@ https://github.com/Bluefieldscom/intl-tel-input.git
         // get the validation error
         getValidationError: function() {
             if (window.intlTelInputUtils) {
-                return intlTelInputUtils.getValidationError(this.telInput.val(), this.selectedCountryData.iso2);
+                return intlTelInputUtils.getValidationError(this._getFullNumber(), this.selectedCountryData.iso2);
             }
             return -99;
         },
         // validate the input val - assumes the global function isValidNumber (from utilsScript)
         isValidNumber: function() {
-            var val = $.trim(this.telInput.val()), countryCode = this.options.nationalMode ? this.selectedCountryData.iso2 : "";
-            if (window.intlTelInputUtils) {
-                return intlTelInputUtils.isValidNumber(val, countryCode);
-            }
-            return false;
-        },
-        // load the utils script
-        loadUtils: function(path) {
-            var that = this;
-            var utilsScript = path || this.options.utilsScript;
-            if (!$.fn[pluginName].loadedUtilsScript && utilsScript) {
-                // don't do this twice! (dont just check if the global intlTelInputUtils exists as if init plugin multiple times in quick succession, it may not have finished loading yet)
-                $.fn[pluginName].loadedUtilsScript = true;
-                // dont use $.getScript as it prevents caching
-                $.ajax({
-                    url: utilsScript,
-                    success: function() {
-                        // tell all instances the utils are ready
-                        $(".intl-tel-input input").intlTelInput("utilsLoaded");
-                    },
-                    complete: function() {
-                        that.utilsScriptDeferred.resolve();
-                    },
-                    dataType: "script",
-                    cache: true
-                });
-            } else {
-                this.utilsScriptDeferred.resolve();
-            }
+            var val = $.trim(this._getFullNumber()), countryCode = this.options.nationalMode ? this.selectedCountryData.iso2 : "";
+            return window.intlTelInputUtils ? intlTelInputUtils.isValidNumber(val, countryCode) : null;
         },
         // update the selected flag, and update the input val accordingly
-        selectCountry: function(countryCode) {
+        setCountry: function(countryCode) {
             countryCode = countryCode.toLowerCase();
             // check if already selected
             if (!this.selectedFlagInner.hasClass(countryCode)) {
-                this._selectFlag(countryCode, true);
+                this._setFlag(countryCode);
                 this._updateDialCode(this.selectedCountryData.dialCode, false);
             }
         },
         // set the input value and update the flag
-        setNumber: function(number, format, addSuffix, preventConversion, isAllowedKey) {
-            // ensure starts with plus
-            if (!this.options.nationalMode && number.charAt(0) != "+") {
-                number = "+" + number;
-            }
-            // we must update the flag first, which updates this.selectedCountryData, which is used later for formatting the number before displaying it
+        // NOTE: format arg is for public method: to allow devs to format how they want
+        setNumber: function(number, format) {
+            // we must update the flag first, which updates this.selectedCountryData, which is used for formatting the number before displaying it
             this._updateFlagFromNumber(number);
-            this._updateVal(number, format, addSuffix, preventConversion, isAllowedKey);
+            this._updateValFromNumber(number, $.isNumeric(format), format);
         },
-        // this is called when the utils are ready
-        utilsLoaded: function() {
-            // if autoFormat is enabled and there's an initial value in the input, then format it
-            if (this.options.autoFormat && this.telInput.val()) {
-                this._updateVal(this.telInput.val());
+        // this is called when the utils request completes
+        handleUtils: function() {
+            // if the request was successful
+            if (window.intlTelInputUtils) {
+                // if there's an initial value in the input, then format it
+                if (this.telInput.val()) {
+                    this._updateValFromNumber(this.telInput.val(), this.options.formatOnInit);
+                }
+                this._updatePlaceholder();
             }
-            this._updatePlaceholder();
+            this.utilsScriptDeferred.resolve();
         }
     };
-    // adapted to allow public functions
     // using https://github.com/jquery-boilerplate/jquery-boilerplate/wiki/Extending-jQuery-Boilerplate
+    // (adapted to allow public functions)
     $.fn[pluginName] = function(options) {
         var args = arguments;
         // Is the first parameter an object (options), or was omitted,
         // instantiate a new instance of the plugin.
         if (options === undefined || typeof options === "object") {
+            // collect all of the deferred objects for all instances created with this selector
             var deferreds = [];
             this.each(function() {
                 if (!$.data(this, "plugin_" + pluginName)) {
@@ -1125,36 +1033,53 @@ https://github.com/Bluefieldscom/intl-tel-input.git
     $.fn[pluginName].getCountryData = function() {
         return allCountries;
     };
-    $.fn[pluginName].version = "6.0.4";
+    // load the utils script
+    $.fn[pluginName].loadUtils = function(path, utilsScriptDeferred) {
+        if (!$.fn[pluginName].loadedUtilsScript) {
+            // don't do this twice! (dont just check if window.intlTelInputUtils exists as if init plugin multiple times in quick succession, it may not have finished loading yet)
+            $.fn[pluginName].loadedUtilsScript = true;
+            // dont use $.getScript as it prevents caching
+            $.ajax({
+                url: path,
+                complete: function() {
+                    // tell all instances that the utils request is complete
+                    $(".intl-tel-input input").intlTelInput("handleUtils");
+                },
+                dataType: "script",
+                cache: true
+            });
+        } else if (utilsScriptDeferred) {
+            utilsScriptDeferred.resolve();
+        }
+    };
+    // version
+    $.fn[pluginName].version = "8.4.9";
     // Tell JSHint to ignore this warning: "character may get silently deleted by one or more browsers"
     // jshint -W100
     // Array of country objects for the flag dropdown.
     // Each contains a name, country code (ISO 3166-1 alpha-2) and dial code.
     // Originally from https://github.com/mledoze/countries
-    // then modified using the following JavaScript (NOW OUT OF DATE):
-    /*
-var result = [];
-_.each(countries, function(c) {
-  // ignore countries without a dial code
-  if (c.callingCode[0].length) {
-    result.push({
-      // var locals contains country names with localised versions in brackets
-      n: _.findWhere(locals, {
-        countryCode: c.cca2
-      }).name,
-      i: c.cca2.toLowerCase(),
-      d: c.callingCode[0]
-    });
-  }
-});
-JSON.stringify(result);
-*/
     // then with a couple of manual re-arrangements to be alphabetical
     // then changed Kazakhstan from +76 to +7
     // and Vatican City from +379 to +39 (see issue 50)
     // and Caribean Netherlands from +5997 to +599
     // and Curacao from +5999 to +599
-    // Removed: Åland Islands, Christmas Island, Cocos Islands, Guernsey, Isle of Man, Jersey, Kosovo, Mayotte, Pitcairn Islands, South Georgia, Svalbard, Western Sahara
+    // Removed:  Kosovo, Pitcairn Islands, South Georgia
+    // UPDATE Sept 12th 2015
+    // List of regions that have iso2 country codes, which I have chosen to omit:
+    // (based on this information: https://en.wikipedia.org/wiki/List_of_country_calling_codes)
+    // AQ - Antarctica - all different country codes depending on which "base"
+    // BV - Bouvet Island - no calling code
+    // GS - South Georgia and the South Sandwich Islands - "inhospitable collection of islands" - same flag and calling code as Falkland Islands
+    // HM - Heard Island and McDonald Islands - no calling code
+    // PN - Pitcairn - tiny population (56), same calling code as New Zealand
+    // TF - French Southern Territories - no calling code
+    // UM - United States Minor Outlying Islands - no calling code
+    // UPDATE the criteria of supported countries or territories (see issue 297)
+    // Have an iso2 code: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+    // Have a country calling code: https://en.wikipedia.org/wiki/List_of_country_calling_codes
+    // Have a flag
+    // Must be supported by libphonenumber: https://github.com/googlei18n/libphonenumber
     // Update: converted objects to arrays to save bytes!
     // Update: added "priority" for countries with the same dialCode as others
     // Update: added array of area codes for countries with the same dialCode as others
@@ -1166,7 +1091,7 @@ JSON.stringify(result);
     //    Order (if >1 country with same dial code),
     //    Area codes (if >1 country with same dial code)
     // ]
-    var allCountries = [ [ "Afghanistan (‫افغانستان‬‎)", "af", "93" ], [ "Albania (Shqipëri)", "al", "355" ], [ "Algeria (‫الجزائر‬‎)", "dz", "213" ], [ "American Samoa", "as", "1684" ], [ "Andorra", "ad", "376" ], [ "Angola", "ao", "244" ], [ "Anguilla", "ai", "1264" ], [ "Antigua and Barbuda", "ag", "1268" ], [ "Argentina", "ar", "54" ], [ "Armenia (Հայաստան)", "am", "374" ], [ "Aruba", "aw", "297" ], [ "Australia", "au", "61" ], [ "Austria (Österreich)", "at", "43" ], [ "Azerbaijan (Azərbaycan)", "az", "994" ], [ "Bahamas", "bs", "1242" ], [ "Bahrain (‫البحرين‬‎)", "bh", "973" ], [ "Bangladesh (বাংলাদেশ)", "bd", "880" ], [ "Barbados", "bb", "1246" ], [ "Belarus (Беларусь)", "by", "375" ], [ "Belgium (België)", "be", "32" ], [ "Belize", "bz", "501" ], [ "Benin (Bénin)", "bj", "229" ], [ "Bermuda", "bm", "1441" ], [ "Bhutan (འབྲུག)", "bt", "975" ], [ "Bolivia", "bo", "591" ], [ "Bosnia and Herzegovina (Босна и Херцеговина)", "ba", "387" ], [ "Botswana", "bw", "267" ], [ "Brazil (Brasil)", "br", "55" ], [ "British Indian Ocean Territory", "io", "246" ], [ "British Virgin Islands", "vg", "1284" ], [ "Brunei", "bn", "673" ], [ "Bulgaria (България)", "bg", "359" ], [ "Burkina Faso", "bf", "226" ], [ "Burundi (Uburundi)", "bi", "257" ], [ "Cambodia (កម្ពុជា)", "kh", "855" ], [ "Cameroon (Cameroun)", "cm", "237" ], [ "Canada", "ca", "1", 1, [ "204", "226", "236", "249", "250", "289", "306", "343", "365", "387", "403", "416", "418", "431", "437", "438", "450", "506", "514", "519", "548", "579", "581", "587", "604", "613", "639", "647", "672", "705", "709", "742", "778", "780", "782", "807", "819", "825", "867", "873", "902", "905" ] ], [ "Cape Verde (Kabu Verdi)", "cv", "238" ], [ "Caribbean Netherlands", "bq", "599", 1 ], [ "Cayman Islands", "ky", "1345" ], [ "Central African Republic (République centrafricaine)", "cf", "236" ], [ "Chad (Tchad)", "td", "235" ], [ "Chile", "cl", "56" ], [ "China (中国)", "cn", "86" ], [ "Colombia", "co", "57" ], [ "Comoros (‫جزر القمر‬‎)", "km", "269" ], [ "Congo (DRC) (Jamhuri ya Kidemokrasia ya Kongo)", "cd", "243" ], [ "Congo (Republic) (Congo-Brazzaville)", "cg", "242" ], [ "Cook Islands", "ck", "682" ], [ "Costa Rica", "cr", "506" ], [ "Côte d’Ivoire", "ci", "225" ], [ "Croatia (Hrvatska)", "hr", "385" ], [ "Cuba", "cu", "53" ], [ "Curaçao", "cw", "599", 0 ], [ "Cyprus (Κύπρος)", "cy", "357" ], [ "Czech Republic (Česká republika)", "cz", "420" ], [ "Denmark (Danmark)", "dk", "45" ], [ "Djibouti", "dj", "253" ], [ "Dominica", "dm", "1767" ], [ "Dominican Republic (República Dominicana)", "do", "1", 2, [ "809", "829", "849" ] ], [ "Ecuador", "ec", "593" ], [ "Egypt (‫مصر‬‎)", "eg", "20" ], [ "El Salvador", "sv", "503" ], [ "Equatorial Guinea (Guinea Ecuatorial)", "gq", "240" ], [ "Eritrea", "er", "291" ], [ "Estonia (Eesti)", "ee", "372" ], [ "Ethiopia", "et", "251" ], [ "Falkland Islands (Islas Malvinas)", "fk", "500" ], [ "Faroe Islands (Føroyar)", "fo", "298" ], [ "Fiji", "fj", "679" ], [ "Finland (Suomi)", "fi", "358" ], [ "France", "fr", "33" ], [ "French Guiana (Guyane française)", "gf", "594" ], [ "French Polynesia (Polynésie française)", "pf", "689" ], [ "Gabon", "ga", "241" ], [ "Gambia", "gm", "220" ], [ "Georgia (საქართველო)", "ge", "995" ], [ "Germany (Deutschland)", "de", "49" ], [ "Ghana (Gaana)", "gh", "233" ], [ "Gibraltar", "gi", "350" ], [ "Greece (Ελλάδα)", "gr", "30" ], [ "Greenland (Kalaallit Nunaat)", "gl", "299" ], [ "Grenada", "gd", "1473" ], [ "Guadeloupe", "gp", "590", 0 ], [ "Guam", "gu", "1671" ], [ "Guatemala", "gt", "502" ], [ "Guinea (Guinée)", "gn", "224" ], [ "Guinea-Bissau (Guiné Bissau)", "gw", "245" ], [ "Guyana", "gy", "592" ], [ "Haiti", "ht", "509" ], [ "Honduras", "hn", "504" ], [ "Hong Kong (香港)", "hk", "852" ], [ "Hungary (Magyarország)", "hu", "36" ], [ "Iceland (Ísland)", "is", "354" ], [ "India (भारत)", "in", "91" ], [ "Indonesia", "id", "62" ], [ "Iran (‫ایران‬‎)", "ir", "98" ], [ "Iraq (‫العراق‬‎)", "iq", "964" ], [ "Ireland", "ie", "353" ], [ "Israel (‫ישראל‬‎)", "il", "972" ], [ "Italy (Italia)", "it", "39", 0 ], [ "Jamaica", "jm", "1876" ], [ "Japan (日本)", "jp", "81" ], [ "Jordan (‫الأردن‬‎)", "jo", "962" ], [ "Kazakhstan (Казахстан)", "kz", "7", 1 ], [ "Kenya", "ke", "254" ], [ "Kiribati", "ki", "686" ], [ "Kuwait (‫الكويت‬‎)", "kw", "965" ], [ "Kyrgyzstan (Кыргызстан)", "kg", "996" ], [ "Laos (ລາວ)", "la", "856" ], [ "Latvia (Latvija)", "lv", "371" ], [ "Lebanon (‫لبنان‬‎)", "lb", "961" ], [ "Lesotho", "ls", "266" ], [ "Liberia", "lr", "231" ], [ "Libya (‫ليبيا‬‎)", "ly", "218" ], [ "Liechtenstein", "li", "423" ], [ "Lithuania (Lietuva)", "lt", "370" ], [ "Luxembourg", "lu", "352" ], [ "Macau (澳門)", "mo", "853" ], [ "Macedonia (FYROM) (Македонија)", "mk", "389" ], [ "Madagascar (Madagasikara)", "mg", "261" ], [ "Malawi", "mw", "265" ], [ "Malaysia", "my", "60" ], [ "Maldives", "mv", "960" ], [ "Mali", "ml", "223" ], [ "Malta", "mt", "356" ], [ "Marshall Islands", "mh", "692" ], [ "Martinique", "mq", "596" ], [ "Mauritania (‫موريتانيا‬‎)", "mr", "222" ], [ "Mauritius (Moris)", "mu", "230" ], [ "Mexico (México)", "mx", "52" ], [ "Micronesia", "fm", "691" ], [ "Moldova (Republica Moldova)", "md", "373" ], [ "Monaco", "mc", "377" ], [ "Mongolia (Монгол)", "mn", "976" ], [ "Montenegro (Crna Gora)", "me", "382" ], [ "Montserrat", "ms", "1664" ], [ "Morocco (‫المغرب‬‎)", "ma", "212" ], [ "Mozambique (Moçambique)", "mz", "258" ], [ "Myanmar (Burma) (မြန်မာ)", "mm", "95" ], [ "Namibia (Namibië)", "na", "264" ], [ "Nauru", "nr", "674" ], [ "Nepal (नेपाल)", "np", "977" ], [ "Netherlands (Nederland)", "nl", "31" ], [ "New Caledonia (Nouvelle-Calédonie)", "nc", "687" ], [ "New Zealand", "nz", "64" ], [ "Nicaragua", "ni", "505" ], [ "Niger (Nijar)", "ne", "227" ], [ "Nigeria", "ng", "234" ], [ "Niue", "nu", "683" ], [ "Norfolk Island", "nf", "672" ], [ "North Korea (조선 민주주의 인민 공화국)", "kp", "850" ], [ "Northern Mariana Islands", "mp", "1670" ], [ "Norway (Norge)", "no", "47" ], [ "Oman (‫عُمان‬‎)", "om", "968" ], [ "Pakistan (‫پاکستان‬‎)", "pk", "92" ], [ "Palau", "pw", "680" ], [ "Palestine (‫فلسطين‬‎)", "ps", "970" ], [ "Panama (Panamá)", "pa", "507" ], [ "Papua New Guinea", "pg", "675" ], [ "Paraguay", "py", "595" ], [ "Peru (Perú)", "pe", "51" ], [ "Philippines", "ph", "63" ], [ "Poland (Polska)", "pl", "48" ], [ "Portugal", "pt", "351" ], [ "Puerto Rico", "pr", "1", 3, [ "787", "939" ] ], [ "Qatar (‫قطر‬‎)", "qa", "974" ], [ "Réunion (La Réunion)", "re", "262" ], [ "Romania (România)", "ro", "40" ], [ "Russia (Россия)", "ru", "7", 0 ], [ "Rwanda", "rw", "250" ], [ "Saint Barthélemy (Saint-Barthélemy)", "bl", "590", 1 ], [ "Saint Helena", "sh", "290" ], [ "Saint Kitts and Nevis", "kn", "1869" ], [ "Saint Lucia", "lc", "1758" ], [ "Saint Martin (Saint-Martin (partie française))", "mf", "590", 2 ], [ "Saint Pierre and Miquelon (Saint-Pierre-et-Miquelon)", "pm", "508" ], [ "Saint Vincent and the Grenadines", "vc", "1784" ], [ "Samoa", "ws", "685" ], [ "San Marino", "sm", "378" ], [ "São Tomé and Príncipe (São Tomé e Príncipe)", "st", "239" ], [ "Saudi Arabia (‫المملكة العربية السعودية‬‎)", "sa", "966" ], [ "Senegal (Sénégal)", "sn", "221" ], [ "Serbia (Србија)", "rs", "381" ], [ "Seychelles", "sc", "248" ], [ "Sierra Leone", "sl", "232" ], [ "Singapore", "sg", "65" ], [ "Sint Maarten", "sx", "1721" ], [ "Slovakia (Slovensko)", "sk", "421" ], [ "Slovenia (Slovenija)", "si", "386" ], [ "Solomon Islands", "sb", "677" ], [ "Somalia (Soomaaliya)", "so", "252" ], [ "South Africa", "za", "27" ], [ "South Korea (대한민국)", "kr", "82" ], [ "South Sudan (‫جنوب السودان‬‎)", "ss", "211" ], [ "Spain (España)", "es", "34" ], [ "Sri Lanka (ශ්‍රී ලංකාව)", "lk", "94" ], [ "Sudan (‫السودان‬‎)", "sd", "249" ], [ "Suriname", "sr", "597" ], [ "Swaziland", "sz", "268" ], [ "Sweden (Sverige)", "se", "46" ], [ "Switzerland (Schweiz)", "ch", "41" ], [ "Syria (‫سوريا‬‎)", "sy", "963" ], [ "Taiwan (台灣)", "tw", "886" ], [ "Tajikistan", "tj", "992" ], [ "Tanzania", "tz", "255" ], [ "Thailand (ไทย)", "th", "66" ], [ "Timor-Leste", "tl", "670" ], [ "Togo", "tg", "228" ], [ "Tokelau", "tk", "690" ], [ "Tonga", "to", "676" ], [ "Trinidad and Tobago", "tt", "1868" ], [ "Tunisia (‫تونس‬‎)", "tn", "216" ], [ "Turkey (Türkiye)", "tr", "90" ], [ "Turkmenistan", "tm", "993" ], [ "Turks and Caicos Islands", "tc", "1649" ], [ "Tuvalu", "tv", "688" ], [ "U.S. Virgin Islands", "vi", "1340" ], [ "Uganda", "ug", "256" ], [ "Ukraine (Україна)", "ua", "380" ], [ "United Arab Emirates (‫الإمارات العربية المتحدة‬‎)", "ae", "971" ], [ "United Kingdom", "gb", "44" ], [ "United States", "us", "1", 0 ], [ "Uruguay", "uy", "598" ], [ "Uzbekistan (Oʻzbekiston)", "uz", "998" ], [ "Vanuatu", "vu", "678" ], [ "Vatican City (Città del Vaticano)", "va", "39", 1 ], [ "Venezuela", "ve", "58" ], [ "Vietnam (Việt Nam)", "vn", "84" ], [ "Wallis and Futuna", "wf", "681" ], [ "Yemen (‫اليمن‬‎)", "ye", "967" ], [ "Zambia", "zm", "260" ], [ "Zimbabwe", "zw", "263" ] ];
+    var allCountries = [ [ "Afghanistan (‫افغانستان‬‎)", "af", "93" ], [ "Albania (Shqipëri)", "al", "355" ], [ "Algeria (‫الجزائر‬‎)", "dz", "213" ], [ "American Samoa", "as", "1684" ], [ "Andorra", "ad", "376" ], [ "Angola", "ao", "244" ], [ "Anguilla", "ai", "1264" ], [ "Antigua and Barbuda", "ag", "1268" ], [ "Argentina", "ar", "54" ], [ "Armenia (Հայաստան)", "am", "374" ], [ "Aruba", "aw", "297" ], [ "Australia", "au", "61", 0 ], [ "Austria (Österreich)", "at", "43" ], [ "Azerbaijan (Azərbaycan)", "az", "994" ], [ "Bahamas", "bs", "1242" ], [ "Bahrain (‫البحرين‬‎)", "bh", "973" ], [ "Bangladesh (বাংলাদেশ)", "bd", "880" ], [ "Barbados", "bb", "1246" ], [ "Belarus (Беларусь)", "by", "375" ], [ "Belgium (België)", "be", "32" ], [ "Belize", "bz", "501" ], [ "Benin (Bénin)", "bj", "229" ], [ "Bermuda", "bm", "1441" ], [ "Bhutan (འབྲུག)", "bt", "975" ], [ "Bolivia", "bo", "591" ], [ "Bosnia and Herzegovina (Босна и Херцеговина)", "ba", "387" ], [ "Botswana", "bw", "267" ], [ "Brazil (Brasil)", "br", "55" ], [ "British Indian Ocean Territory", "io", "246" ], [ "British Virgin Islands", "vg", "1284" ], [ "Brunei", "bn", "673" ], [ "Bulgaria (България)", "bg", "359" ], [ "Burkina Faso", "bf", "226" ], [ "Burundi (Uburundi)", "bi", "257" ], [ "Cambodia (កម្ពុជា)", "kh", "855" ], [ "Cameroon (Cameroun)", "cm", "237" ], [ "Canada", "ca", "1", 1, [ "204", "226", "236", "249", "250", "289", "306", "343", "365", "387", "403", "416", "418", "431", "437", "438", "450", "506", "514", "519", "548", "579", "581", "587", "604", "613", "639", "647", "672", "705", "709", "742", "778", "780", "782", "807", "819", "825", "867", "873", "902", "905" ] ], [ "Cape Verde (Kabu Verdi)", "cv", "238" ], [ "Caribbean Netherlands", "bq", "599", 1 ], [ "Cayman Islands", "ky", "1345" ], [ "Central African Republic (République centrafricaine)", "cf", "236" ], [ "Chad (Tchad)", "td", "235" ], [ "Chile", "cl", "56" ], [ "China (中国)", "cn", "86" ], [ "Christmas Island", "cx", "61", 2 ], [ "Cocos (Keeling) Islands", "cc", "61", 1 ], [ "Colombia", "co", "57" ], [ "Comoros (‫جزر القمر‬‎)", "km", "269" ], [ "Congo (DRC) (Jamhuri ya Kidemokrasia ya Kongo)", "cd", "243" ], [ "Congo (Republic) (Congo-Brazzaville)", "cg", "242" ], [ "Cook Islands", "ck", "682" ], [ "Costa Rica", "cr", "506" ], [ "Côte d’Ivoire", "ci", "225" ], [ "Croatia (Hrvatska)", "hr", "385" ], [ "Cuba", "cu", "53" ], [ "Curaçao", "cw", "599", 0 ], [ "Cyprus (Κύπρος)", "cy", "357" ], [ "Czech Republic (Česká republika)", "cz", "420" ], [ "Denmark (Danmark)", "dk", "45" ], [ "Djibouti", "dj", "253" ], [ "Dominica", "dm", "1767" ], [ "Dominican Republic (República Dominicana)", "do", "1", 2, [ "809", "829", "849" ] ], [ "Ecuador", "ec", "593" ], [ "Egypt (‫مصر‬‎)", "eg", "20" ], [ "El Salvador", "sv", "503" ], [ "Equatorial Guinea (Guinea Ecuatorial)", "gq", "240" ], [ "Eritrea", "er", "291" ], [ "Estonia (Eesti)", "ee", "372" ], [ "Ethiopia", "et", "251" ], [ "Falkland Islands (Islas Malvinas)", "fk", "500" ], [ "Faroe Islands (Føroyar)", "fo", "298" ], [ "Fiji", "fj", "679" ], [ "Finland (Suomi)", "fi", "358", 0 ], [ "France", "fr", "33" ], [ "French Guiana (Guyane française)", "gf", "594" ], [ "French Polynesia (Polynésie française)", "pf", "689" ], [ "Gabon", "ga", "241" ], [ "Gambia", "gm", "220" ], [ "Georgia (საქართველო)", "ge", "995" ], [ "Germany (Deutschland)", "de", "49" ], [ "Ghana (Gaana)", "gh", "233" ], [ "Gibraltar", "gi", "350" ], [ "Greece (Ελλάδα)", "gr", "30" ], [ "Greenland (Kalaallit Nunaat)", "gl", "299" ], [ "Grenada", "gd", "1473" ], [ "Guadeloupe", "gp", "590", 0 ], [ "Guam", "gu", "1671" ], [ "Guatemala", "gt", "502" ], [ "Guernsey", "gg", "44", 1 ], [ "Guinea (Guinée)", "gn", "224" ], [ "Guinea-Bissau (Guiné Bissau)", "gw", "245" ], [ "Guyana", "gy", "592" ], [ "Haiti", "ht", "509" ], [ "Honduras", "hn", "504" ], [ "Hong Kong (香港)", "hk", "852" ], [ "Hungary (Magyarország)", "hu", "36" ], [ "Iceland (Ísland)", "is", "354" ], [ "India (भारत)", "in", "91" ], [ "Indonesia", "id", "62" ], [ "Iran (‫ایران‬‎)", "ir", "98" ], [ "Iraq (‫العراق‬‎)", "iq", "964" ], [ "Ireland", "ie", "353" ], [ "Isle of Man", "im", "44", 2 ], [ "Israel (‫ישראל‬‎)", "il", "972" ], [ "Italy (Italia)", "it", "39", 0 ], [ "Jamaica", "jm", "1876" ], [ "Japan (日本)", "jp", "81" ], [ "Jersey", "je", "44", 3 ], [ "Jordan (‫الأردن‬‎)", "jo", "962" ], [ "Kazakhstan (Казахстан)", "kz", "7", 1 ], [ "Kenya", "ke", "254" ], [ "Kiribati", "ki", "686" ], [ "Kuwait (‫الكويت‬‎)", "kw", "965" ], [ "Kyrgyzstan (Кыргызстан)", "kg", "996" ], [ "Laos (ລາວ)", "la", "856" ], [ "Latvia (Latvija)", "lv", "371" ], [ "Lebanon (‫لبنان‬‎)", "lb", "961" ], [ "Lesotho", "ls", "266" ], [ "Liberia", "lr", "231" ], [ "Libya (‫ليبيا‬‎)", "ly", "218" ], [ "Liechtenstein", "li", "423" ], [ "Lithuania (Lietuva)", "lt", "370" ], [ "Luxembourg", "lu", "352" ], [ "Macau (澳門)", "mo", "853" ], [ "Macedonia (FYROM) (Македонија)", "mk", "389" ], [ "Madagascar (Madagasikara)", "mg", "261" ], [ "Malawi", "mw", "265" ], [ "Malaysia", "my", "60" ], [ "Maldives", "mv", "960" ], [ "Mali", "ml", "223" ], [ "Malta", "mt", "356" ], [ "Marshall Islands", "mh", "692" ], [ "Martinique", "mq", "596" ], [ "Mauritania (‫موريتانيا‬‎)", "mr", "222" ], [ "Mauritius (Moris)", "mu", "230" ], [ "Mayotte", "yt", "262", 1 ], [ "Mexico (México)", "mx", "52" ], [ "Micronesia", "fm", "691" ], [ "Moldova (Republica Moldova)", "md", "373" ], [ "Monaco", "mc", "377" ], [ "Mongolia (Монгол)", "mn", "976" ], [ "Montenegro (Crna Gora)", "me", "382" ], [ "Montserrat", "ms", "1664" ], [ "Morocco (‫المغرب‬‎)", "ma", "212", 0 ], [ "Mozambique (Moçambique)", "mz", "258" ], [ "Myanmar (Burma) (မြန်မာ)", "mm", "95" ], [ "Namibia (Namibië)", "na", "264" ], [ "Nauru", "nr", "674" ], [ "Nepal (नेपाल)", "np", "977" ], [ "Netherlands (Nederland)", "nl", "31" ], [ "New Caledonia (Nouvelle-Calédonie)", "nc", "687" ], [ "New Zealand", "nz", "64" ], [ "Nicaragua", "ni", "505" ], [ "Niger (Nijar)", "ne", "227" ], [ "Nigeria", "ng", "234" ], [ "Niue", "nu", "683" ], [ "Norfolk Island", "nf", "672" ], [ "North Korea (조선 민주주의 인민 공화국)", "kp", "850" ], [ "Northern Mariana Islands", "mp", "1670" ], [ "Norway (Norge)", "no", "47", 0 ], [ "Oman (‫عُمان‬‎)", "om", "968" ], [ "Pakistan (‫پاکستان‬‎)", "pk", "92" ], [ "Palau", "pw", "680" ], [ "Palestine (‫فلسطين‬‎)", "ps", "970" ], [ "Panama (Panamá)", "pa", "507" ], [ "Papua New Guinea", "pg", "675" ], [ "Paraguay", "py", "595" ], [ "Peru (Perú)", "pe", "51" ], [ "Philippines", "ph", "63" ], [ "Poland (Polska)", "pl", "48" ], [ "Portugal", "pt", "351" ], [ "Puerto Rico", "pr", "1", 3, [ "787", "939" ] ], [ "Qatar (‫قطر‬‎)", "qa", "974" ], [ "Réunion (La Réunion)", "re", "262", 0 ], [ "Romania (România)", "ro", "40" ], [ "Russia (Россия)", "ru", "7", 0 ], [ "Rwanda", "rw", "250" ], [ "Saint Barthélemy (Saint-Barthélemy)", "bl", "590", 1 ], [ "Saint Helena", "sh", "290" ], [ "Saint Kitts and Nevis", "kn", "1869" ], [ "Saint Lucia", "lc", "1758" ], [ "Saint Martin (Saint-Martin (partie française))", "mf", "590", 2 ], [ "Saint Pierre and Miquelon (Saint-Pierre-et-Miquelon)", "pm", "508" ], [ "Saint Vincent and the Grenadines", "vc", "1784" ], [ "Samoa", "ws", "685" ], [ "San Marino", "sm", "378" ], [ "São Tomé and Príncipe (São Tomé e Príncipe)", "st", "239" ], [ "Saudi Arabia (‫المملكة العربية السعودية‬‎)", "sa", "966" ], [ "Senegal (Sénégal)", "sn", "221" ], [ "Serbia (Србија)", "rs", "381" ], [ "Seychelles", "sc", "248" ], [ "Sierra Leone", "sl", "232" ], [ "Singapore", "sg", "65" ], [ "Sint Maarten", "sx", "1721" ], [ "Slovakia (Slovensko)", "sk", "421" ], [ "Slovenia (Slovenija)", "si", "386" ], [ "Solomon Islands", "sb", "677" ], [ "Somalia (Soomaaliya)", "so", "252" ], [ "South Africa", "za", "27" ], [ "South Korea (대한민국)", "kr", "82" ], [ "South Sudan (‫جنوب السودان‬‎)", "ss", "211" ], [ "Spain (España)", "es", "34" ], [ "Sri Lanka (ශ්‍රී ලංකාව)", "lk", "94" ], [ "Sudan (‫السودان‬‎)", "sd", "249" ], [ "Suriname", "sr", "597" ], [ "Svalbard and Jan Mayen", "sj", "47", 1 ], [ "Swaziland", "sz", "268" ], [ "Sweden (Sverige)", "se", "46" ], [ "Switzerland (Schweiz)", "ch", "41" ], [ "Syria (‫سوريا‬‎)", "sy", "963" ], [ "Taiwan (台灣)", "tw", "886" ], [ "Tajikistan", "tj", "992" ], [ "Tanzania", "tz", "255" ], [ "Thailand (ไทย)", "th", "66" ], [ "Timor-Leste", "tl", "670" ], [ "Togo", "tg", "228" ], [ "Tokelau", "tk", "690" ], [ "Tonga", "to", "676" ], [ "Trinidad and Tobago", "tt", "1868" ], [ "Tunisia (‫تونس‬‎)", "tn", "216" ], [ "Turkey (Türkiye)", "tr", "90" ], [ "Turkmenistan", "tm", "993" ], [ "Turks and Caicos Islands", "tc", "1649" ], [ "Tuvalu", "tv", "688" ], [ "U.S. Virgin Islands", "vi", "1340" ], [ "Uganda", "ug", "256" ], [ "Ukraine (Україна)", "ua", "380" ], [ "United Arab Emirates (‫الإمارات العربية المتحدة‬‎)", "ae", "971" ], [ "United Kingdom", "gb", "44", 0 ], [ "United States", "us", "1", 0 ], [ "Uruguay", "uy", "598" ], [ "Uzbekistan (Oʻzbekiston)", "uz", "998" ], [ "Vanuatu", "vu", "678" ], [ "Vatican City (Città del Vaticano)", "va", "39", 1 ], [ "Venezuela", "ve", "58" ], [ "Vietnam (Việt Nam)", "vn", "84" ], [ "Wallis and Futuna", "wf", "681" ], [ "Western Sahara (‫الصحراء الغربية‬‎)", "eh", "212", 1 ], [ "Yemen (‫اليمن‬‎)", "ye", "967" ], [ "Zambia", "zm", "260" ], [ "Zimbabwe", "zw", "263" ], [ "Åland Islands", "ax", "358", 1 ] ];
     // loop over all of the countries above
     for (var i = 0; i < allCountries.length; i++) {
         var c = allCountries[i];
@@ -1178,4 +1103,4 @@ JSON.stringify(result);
             areaCodes: c[4] || null
         };
     }
-});
+});