From 7f9bbe99a3091a1f19f4b07b2f77e10516e18675 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 13 Oct 2011 16:06:56 +0000 Subject: [PATCH] Fix attribute defaults getting changed, options no longer get copied across selectboxes --- etemplate/js/et2_widget_selectbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js index 4de68ebe2e..b656648ebf 100644 --- a/etemplate/js/et2_widget_selectbox.js +++ b/etemplate/js/et2_widget_selectbox.js @@ -82,7 +82,7 @@ var et2_selectbox = et2_inputWidget.extend({ var content_options = this.getArrayMgr("sel_options").getEntry(this.id); 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) { _attrs["select_options"] = content_options; }