From 764bde5bffa0ed608a80e6604c15fe80b4a693e8 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 7 Oct 2013 10:10:54 +0000 Subject: [PATCH] Fix broken set_value() to properly accept strings as value, fix broken adding of free entries --- etemplate/js/et2_widget_taglist.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etemplate/js/et2_widget_taglist.js b/etemplate/js/et2_widget_taglist.js index 268cd39209..559e818e46 100644 --- a/etemplate/js/et2_widget_taglist.js +++ b/etemplate/js/et2_widget_taglist.js @@ -279,9 +279,9 @@ var et2_taglist = et2_selectbox.extend( */ set_value: function(value) { + var values = jQuery.isArray(value) ? value : [value]; if (value && this.options.allowFreeEntries) { - var values = jQuery.isArray(value) ? value : [value]; var need_setdata = false; for(var i=0; i < values.length; ++i) { @@ -292,11 +292,11 @@ var et2_taglist = et2_selectbox.extend( need_setdata = true; } } - if (this.taglist && need_setdata) this.taglist.setData(this._options2data(this.select_options)); + if (this.taglist && need_setdata) this.taglist.setData(this._options2data(this.options.select_options)); } if(this.taglist == null) return; this.taglist.clear(true); - this.taglist.setValue(value); + this.taglist.setValue(values); }, getValue: function()