From 788483043d61cccdd53861d9679ee730ae5873cf Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 21 Oct 2013 17:28:08 +0000 Subject: [PATCH] Set activeFilters to match value in left/right header when binding to change so favorites pick up header values set by server --- etemplate/js/et2_extension_nextmatch.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js index a316dc55ba..c96b307ea5 100644 --- a/etemplate/js/et2_extension_nextmatch.js +++ b/etemplate/js/et2_extension_nextmatch.js @@ -1836,11 +1836,11 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader, var value = child.get_value(); // Split up indexes - var indexes = child.id.replace('[','[').split('['); + var indexes = child.id.replace(/[/g,'[').split('['); for(var i = 0; i < indexes.length; i++) { - indexes[i] = indexes[i].replace(']','').replace(']',''); + indexes[i] = indexes[i].replace(/]/g,'').replace(']',''); if (i < indexes.length-1) { if(typeof target[indexes[i]] == "undefined") target[indexes[i]] = {}; @@ -1906,7 +1906,11 @@ var et2_nextmatch_header_bar = et2_DOMWidget.extend(et2_INextmatchHeader, }; // Set activeFilters to current value - //self.nextmatch.activeFilters[_widget.id] = _widget.getValue(); + // Use an array mgr to hande non-simple IDs + var value = {}; + value[_widget.id] = _widget.getValue(); + var mgr = new et2_arrayMgr(value); + jQuery.extend(this.nextmatch.activeFilters,mgr.data); }, this, et2_inputWidget); } });