From e674c5aa5bf9c9f6fe16f7f3d536fda34c3c9331 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 7 Oct 2014 21:16:18 +0000 Subject: [PATCH] Partially revert r48812, seems it didn't help entry widgets but it did cause problems with preferences --- etemplate/js/et2_core_widget.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/etemplate/js/et2_core_widget.js b/etemplate/js/et2_core_widget.js index 9473d6d05d..cc1fdf5fcf 100644 --- a/etemplate/js/et2_core_widget.js +++ b/etemplate/js/et2_core_widget.js @@ -666,8 +666,7 @@ var et2_widget = ClassWithAttributes.extend( } if(entry && entry.type) { - _nodeName = entry.type; - _node.setAttribute("type", entry.type); + _nodeName = attributes["type"] = entry.type; } entry = null; } @@ -676,8 +675,7 @@ var et2_widget = ClassWithAttributes.extend( // we need to expand it now as it defines the constructor and by that attributes parsed via parseXMLAttrs! if (_nodeName.charAt(0) == '@' || _nodeName.indexOf('$') >= 0) { - _nodeName = this.getArrayMgr('content').expandName(_nodeName); - _node.setAttribute("type", _nodeName); + _nodeName = attributes["type"] = this.getArrayMgr('content').expandName(_nodeName); } // Get the constructor - if the widget is readonly, use the special "_ro"