Don't overwrite options passed into constructor, merge them

This commit is contained in:
Nathan Gray 2011-10-12 19:55:33 +00:00
parent 5b26a5faed
commit cc8891820c

View File

@ -79,7 +79,8 @@ var et2_selectbox = et2_inputWidget.extend({
// Try to find the options inside the "sel-options" array
if(this.getArrayMgr("sel_options"))
{
_attrs["select_options"] = this.getArrayMgr("sel_options").getEntry(this.id);
var content_options = this.getArrayMgr("sel_options").getEntry(this.id);
if(content_options) _attrs["select_options"] = jQuery.merge(_attrs["select_options"],content_options);
}
// Check whether the options entry was found, if not read it from the