extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix attribute defaults getting changed, options no longer get copied across selectboxes

Browse Source
This commit is contained in:
Nathan Gray 2011-10-13 16:06:56 +00:00
parent 01e92100c4
commit 7f9bbe99a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/js/et2_widget_selectbox.js
View File

@ -82,7 +82,7 @@ var et2_selectbox = et2_inputWidget.extend({
var content_options = this.getArrayMgr("sel_options").getEntry(this.id); var content_options = this.getArrayMgr("sel_options").getEntry(this.id);
if(_attrs["select_options"] && content_options) if(_attrs["select_options"] && content_options)
{ {
_attrs["select_options"] = jQuery.merge(_attrs["select_options"],content_options); _attrs["select_options"] = jQuery.extend({},_attrs["select_options"],content_options);
} else if (content_options) { } else if (content_options) {
_attrs["select_options"] = content_options; _attrs["select_options"] = content_options;
} }