From 2a0df92594da0c90e19a73a0a8bb7b4feb9889ba Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 2 May 2012 19:45:35 +0000 Subject: [PATCH] Use set_select_options() to set options read from template to make sure everything is done the same --- etemplate/js/et2_widget_selectbox.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js index d50a9f9681..f984fa76b3 100644 --- a/etemplate/js/et2_widget_selectbox.js +++ b/etemplate/js/et2_widget_selectbox.js @@ -337,12 +337,12 @@ var et2_selectbox = et2_inputWidget.extend({ var options = et2_directChildrenByTagName(_node, "options"); for (var i = 0; i < options.length; i++) { - this._appendOptionElement( - et2_readAttrWithDefault(options[i], "value", options[i].textContent), - options[i].textContent, - et2_readAttrWithDefault(options[i], "title", "") - ); + this.options.select_options[et2_readAttrWithDefault(options[i], "value", options[i].textContent)] = { + "label": options[i].textContent, + "title": et2_readAttrWithDefault(options[i], "title", "") + }; } + this.set_select_options(this.options.select_options); }, set_value: function(_value) { @@ -430,7 +430,7 @@ var et2_selectbox = et2_inputWidget.extend({ this.multiOptions.empty(); } // Re-add empty, it's usually not there - if(this.options.empty_label && typeof _options[''] == 'undefined') + if(this.options.empty_label) { _options[''] = this.options.empty_label; }