merge

.gitignore

@@ -1,11 +1,13 @@
 /bower_components/
 /node_modules/
 /lib/*
-!/lib/libphonenumber 
+!/lib/libphonenumber
 /.bower_cache/
 /.sass-cache/
 /.grunt/
 /tmp/
+/.idea/
+*.iml
 .DS_Store
 
 # these files are now auto-generated

README.md

@@ -334,10 +334,7 @@ The dropdown should automatically appear above/below the input depending on the
 In order to get the automatic country-specific placeholders, simply omit the placeholder attribute on the `<input>`.
 
 **Bootstrap input groups**  
-Simply add this line to get [input groups](http://getbootstrap.com/components/#input-groups) working properly.
-```css
-.intl-tel-input {display: table-cell;}
-```
+A couple of CSS fixes are required to get the plugin to play nice with Bootstrap [input groups](http://getbootstrap.com/components/#input-groups). You can see a Codepen [here](http://codepen.io/jackocnr/pen/EyPXed).  
 _Note: there is currently [a bug](https://bugs.webkit.org/show_bug.cgi?id=141822) in Mobile Safari which causes a crash when you click the dropdown arrow (a CSS triangle) inside an input group. The simplest workaround is to remove the CSS triangle with this line: `.intl-tel-input .iti-flag .arrow {border: none;}`_
 
 ## Contributing

build/js/intlTelInput.js

@@ -61,7 +61,7 @@
         TAB: 9
     };
     // keep track of if the window.load event has fired as impossible to check after the fact
-    $(window).load(function() {
+    $(window).on("load", function() {
         // UPDATE: use a public static field so we can fudge it in the tests
         $.fn[pluginName].windowLoaded = true;
     });
@@ -371,7 +371,7 @@
                     $.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() {
+                    $(window).on("load", function() {
                         $.fn[pluginName].loadUtils(that.options.utilsScript, that.utilsScriptDeferred);
                     });
                 }