deac/chosen
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #141 from aziz/master

Browse source 
closes #139 and #140
This commit is contained in:
Patrick Filler 2011-08-03 09:00:40 -07:00
parent 0812bc3d64 8b223ec328
commit b7a531f211
7 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
chosen/chosen.css
View file

@ -60,7 +60,6 @@ select.chzn-select {
white-space: nowrap; white-space: nowrap;
-o-text-overflow: ellipsis; -o-text-overflow: ellipsis;
-ms-text-overflow: ellipsis; -ms-text-overflow: ellipsis;
-moz-binding: url('/xml/ellipsis.xml#ellipsis');
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.chzn-container-single .chzn-single div { .chzn-container-single .chzn-single div {

2
chosen/chosen.jquery.js
View file

@ -55,7 +55,7 @@
this.default_text = this.form_field_jq.data('placeholder') ? this.form_field_jq.data('placeholder') : this.default_text_default; this.default_text = this.form_field_jq.data('placeholder') ? this.form_field_jq.data('placeholder') : this.default_text_default;
container_div = $("<div />", { container_div = $("<div />", {
id: this.container_id, id: this.container_id,
"class": "chzn-container " + (this.is_rtl ? ' chzn-rtl' : void 0), "class": "chzn-container " + (this.is_rtl ? 'chzn-rtl' : ''),
style: 'width: ' + this.f_width + 'px;' style: 'width: ' + this.f_width + 'px;'
}); });
if (this.is_multiple) { if (this.is_multiple) {

2
chosen/chosen.jquery.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
chosen/chosen.proto.js
View file

@ -46,7 +46,7 @@
this.f_width = this.form_field.getStyle("width") ? parseInt(this.form_field.getStyle("width"), 10) : this.form_field.getWidth(); this.f_width = this.form_field.getStyle("width") ? parseInt(this.form_field.getStyle("width"), 10) : this.form_field.getWidth();
container_props = { container_props = {
'id': this.container_id, 'id': this.container_id,
'class': "chzn-container " + (this.is_rtl ? ' chzn-rtl' : void 0), 'class': "chzn-container " + (this.is_rtl ? 'chzn-rtl' : ''),
'style': 'width: ' + this.f_width + 'px' 'style': 'width: ' + this.f_width + 'px'
}; };
this.default_text = this.form_field.readAttribute('data-placeholder') ? this.form_field.readAttribute('data-placeholder') : this.default_text_default; this.default_text = this.form_field.readAttribute('data-placeholder') ? this.form_field.readAttribute('data-placeholder') : this.default_text_default;

2
chosen/chosen.proto.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
coffee/chosen.jquery.coffee
View file

@ -48,7 +48,7 @@ class Chosen
container_div = ($ "<div />", { container_div = ($ "<div />", {
id: @container_id id: @container_id
class: "chzn-container #{' chzn-rtl' if @is_rtl}" class: "chzn-container #{ if @is_rtl then 'chzn-rtl' else '' }"
style: 'width: ' + (@f_width) + 'px;' #use parens around @f_width so coffeescript doesn't think + ' px' is a function parameter style: 'width: ' + (@f_width) + 'px;' #use parens around @f_width so coffeescript doesn't think + ' px' is a function parameter
}) })

2
coffee/chosen.proto.coffee
View file

@ -44,7 +44,7 @@ class Chosen
container_props = container_props =
'id': @container_id 'id': @container_id
'class': "chzn-container #{' chzn-rtl' if @is_rtl}" 'class': "chzn-container #{ if @is_rtl then 'chzn-rtl' else '' }"
'style': 'width: ' + (@f_width) + 'px' #use parens around @f_width so coffeescript doesn't think + ' px' is a function parameter 'style': 'width: ' + (@f_width) + 'px' #use parens around @f_width so coffeescript doesn't think + ' px' is a function parameter
@default_text = if @form_field.readAttribute 'data-placeholder' then @form_field.readAttribute 'data-placeholder' else @default_text_default @default_text = if @form_field.readAttribute 'data-placeholder' then @form_field.readAttribute 'data-placeholder' else @default_text_default