Fix expandable selectbox button missing icon

This commit is contained in:
Nathan Gray 2015-10-13 20:43:49 +00:00
parent ea0f039a37
commit 025550402a
2 changed files with 17 additions and 2 deletions

View File

@ -213,6 +213,17 @@ var et2_selectbox = et2_inputWidget.extend(
this._appendOptionElement('', this.options.empty_label); this._appendOptionElement('', this.options.empty_label);
} }
} }
if(this.expand_button)
{
if(_multiple)
{
this.expand_button.addClass('ui-icon-minus').removeClass('ui-icon-plus');
}
else
{
this.expand_button.removeClass('ui-icon-minus').addClass('ui-icon-plus');
}
}
} }
}, },
@ -571,15 +582,18 @@ var et2_selectbox = et2_inputWidget.extend(
if (!this.expand_button) if (!this.expand_button)
{ {
var button_id = this.getInstanceManager().uniqueId+'_'+this.id.replace(/\./g, '-') + "_expand"; var button_id = this.getInstanceManager().uniqueId+'_'+this.id.replace(/\./g, '-') + "_expand";
this.expand_button = $j("<button class='et2_button et2_button_icon et2_selectbox_expand' id='" + button_id + "'/>") this.expand_button = $j("<button class='et2_button et2_button_icon et2_selectbox_expand ui-icon' id='" + button_id + "'/>")
.addClass(this.options.multiple ? 'ui-icon-minus' : 'ui-icon-plus')
.on("click", jQuery.proxy(function(e) { .on("click", jQuery.proxy(function(e) {
if(typeof this.input.attr('size') !== 'undefined' && this.input.attr('size') != 1) if(typeof this.input.attr('size') !== 'undefined' && this.input.attr('size') != 1)
{ {
this.set_multiple(false, 1); this.set_multiple(false, 1);
this.expand_button.removeClass('ui-icon-minus').addClass('ui-icon-plus');
} }
else else
{ {
this.set_multiple(true, this.options.expand_multiple_rows); this.set_multiple(true, this.options.expand_multiple_rows);
this.expand_button.addClass('ui-icon-minus').removeClass('ui-icon-plus');
} }
},this)); },this));
} }

View File

@ -207,7 +207,7 @@ input[type=button] {
} }
.et2_button_icon { .et2_button_icon {
border: none; border: none;
background: transparent; background-color: transparent;
padding: 0px; padding: 0px;
} }
button.et2_button_text:hover, button.et2_button_text:hover,
@ -304,6 +304,7 @@ button#cancel {
*/ */
.et2_selectbox_expand { .et2_selectbox_expand {
width: 16px; width: 16px;
display: inline-block;
} }
.et2_selectbox .ui-widget-header { .et2_selectbox .ui-widget-header {
padding: 0px 6px 0px 6px; padding: 0px 6px 0px 6px;