Merge remote branch 'harvesthq/master'

koenpunt · Apr 3, 2012 · 3f6fe59 · 3f6fe59
2 parents 2c0fdc5 + b577535
commit 3f6fe59
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/chosen/chosen.css b/chosen/chosen.css
@@ -52,7 +52,7 @@
   text-decoration: none;
 }
 .chzn-container-single .chzn-default {
-	color: #999;
+  color: #999;
 }
 .chzn-container-single .chzn-single span {
   margin-right: 26px;
@@ -71,7 +71,7 @@
   width: 12px;
   height: 13px;
   font-size: 1px;
-  background: url(chosen-sprite.png) right top no-repeat;
+  background: url('chosen-sprite.png') right top no-repeat;
 }
 .chzn-container-single .chzn-single abbr:hover {
   background-position: right -11px;
@@ -209,7 +209,7 @@
   width: 12px;
   height: 13px;
   font-size: 1px;
-  background: url(chosen-sprite.png) right top no-repeat;
+  background: url('chosen-sprite.png') right top no-repeat;
 }
 .chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
   background-position: right -11px;

diff --git a/chosen/chosen.jquery.js b/chosen/chosen.jquery.js
@@ -246,7 +246,7 @@ Copyright (c) 2011 by Harvest
 
     AbstractChosen.prototype.generate_random_char = function() {
       var chars, newchar, rand;
-      chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ";
+      chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
       rand = Math.floor(Math.random() * chars.length);
       return newchar = chars.substring(rand, rand + 1);
     };
@@ -303,7 +303,7 @@ Copyright (c) 2011 by Harvest
 
     Chosen.prototype.set_up_html = function() {
       var container_div, dd_top, dd_width, sf_width;
-      this.container_id = this.form_field.id.length ? this.form_field.id.replace(/(:|\.)/g, '_') : this.generate_field_id();
+      this.container_id = this.form_field.id.length ? this.form_field.id.replace(/[^\w]/g, '_') : this.generate_field_id();
       this.container_id += "_chzn";
       this.f_width = this.form_field_jq.outerWidth();
       this.default_text = this.form_field_jq.data('placeholder') ? this.form_field_jq.data('placeholder') : this.default_text_default;

diff --git a/chosen/chosen.jquery.min.js b/chosen/chosen.jquery.min.js
diff --git a/chosen/chosen.proto.js b/chosen/chosen.proto.js
@@ -246,7 +246,7 @@ Copyright (c) 2011 by Harvest
 
     AbstractChosen.prototype.generate_random_char = function() {
       var chars, newchar, rand;
-      chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ";
+      chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
       rand = Math.floor(Math.random() * chars.length);
       return newchar = chars.substring(rand, rand + 1);
     };
@@ -299,7 +299,7 @@ Copyright (c) 2011 by Harvest
 
     Chosen.prototype.set_up_html = function() {
       var base_template, container_props, dd_top, dd_width, sf_width;
-      this.container_id = this.form_field.identify().replace(/(:|\.)/g, '_') + "_chzn";
+      this.container_id = this.form_field.identify().replace(/[^\w]/g, '_') + "_chzn";
       this.f_width = this.form_field.getStyle("width") ? parseInt(this.form_field.getStyle("width"), 10) : this.form_field.getWidth();
       container_props = {
         'id': this.container_id,

diff --git a/chosen/chosen.proto.min.js b/chosen/chosen.proto.min.js
diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee
@@ -24,7 +24,7 @@ class Chosen extends AbstractChosen
     @form_field_jq.addClass "chzn-done"
 
   set_up_html: ->
-    @container_id = if @form_field.id.length then @form_field.id.replace(/(:|\.)/g, '_') else this.generate_field_id()
+    @container_id = if @form_field.id.length then @form_field.id.replace(/[^\w]/g, '_') else this.generate_field_id()
     @container_id += "_chzn"
 
     @f_width = @form_field_jq.outerWidth()

diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee
@@ -25,7 +25,7 @@ class Chosen extends AbstractChosen
 
 
   set_up_html: ->
-    @container_id = @form_field.identify().replace(/(:|\.)/g, '_') + "_chzn"
+    @container_id = @form_field.identify().replace(/[^\w]/g, '_') + "_chzn"
 
     @f_width = if @form_field.getStyle("width") then parseInt @form_field.getStyle("width"), 10 else @form_field.getWidth()
 

diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee
@@ -109,7 +109,7 @@ class AbstractChosen
     new_id
 
   generate_random_char: ->
-    chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ"
+    chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     rand = Math.floor(Math.random() * chars.length)
     newchar = chars.substring rand, rand+1
 

diff --git a/example.jquery.html b/example.jquery.html
@@ -809,7 +809,7 @@ <h2>Multiple Select</h2>
       </div>
       <div>
         <em>Into This</em>        
-        <select data-placeholder="Choose a Country..." class="chzn-select" multiple style="width:350px;" tabindex="4">
+        <select data-placeholder="Choose a Country..." class="chzn-select" id="2873829*&@#$*&![]" multiple style="width:350px;" tabindex="4">
           <option value=""></option> 
           <option value="United States">United States</option> 
           <option value="United Kingdom">United Kingdom</option>