Merge pull request #26 from asmallwebfirm/latest-upstreams

Update to jquery.addressfield v0.2.1.
asmallwebfirm · Sep 27, 2014 · abaae37 · abaae37
2 parents c68e6c0 + f4112dd
commit abaae37
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/js/jquery.addressfield/jquery.addressfield.js b/js/jquery.addressfield/jquery.addressfield.js
@@ -1,4 +1,4 @@
-/*! Address Field - v0.2.0 - 2014-08-26
+/*! Address Field - v0.2.1 - 2014-09-26
 * https://github.com/tableau-mkt/jquery.addressfield
 * Copyright (c) 2014 Eric Peterson; Licensed GPL-2.0 */
 (function ($) {
@@ -187,12 +187,18 @@
    * Copies select HTML attributes from a given element to the supplied element.
    */
   $.fn.addressfield.copyAttrsTo = function($to) {
-    var attributes = ['class', 'id', 'name'],
+    var attributes = ['class', 'id', 'name', 'propdescname'],
         $this = $(this);
 
     $.each($this[0].attributes, function () {
       if ($.inArray(this.name, attributes) !== -1) {
-        $to.attr(this.name, this.value);
+        // Compatibility for IE8.
+        if (this.name === 'propdescname') {
+          $to.attr('name', this.value);
+        }
+        else {
+          $to.attr(this.name, this.value);
+        }
       }
     });
   };

diff --git a/js/jquery.addressfield/jquery.addressfield.min.js b/js/jquery.addressfield/jquery.addressfield.min.js
diff --git a/scale_addressfield.module b/scale_addressfield.module
@@ -63,7 +63,7 @@ function scale_addressfield_library() {
   $path = drupal_get_path('module', 'scale_addressfield');
   $items['jquery.addressfield'] = array(
     'title' => 'jquery.addressfield',
-    'version' => '0.1.2',
+    'version' => '0.2.1',
     'js' => array(
        $path . '/js/jquery.addressfield/jquery.addressfield.min.js' => array(
          'group' => JS_LIBRARY,