diff --git a/etemplate/js/et2_core_baseWidget.js b/etemplate/js/et2_core_baseWidget.js index 6a474c0967..e7d315f201 100644 --- a/etemplate/js/et2_core_baseWidget.js +++ b/etemplate/js/et2_core_baseWidget.js @@ -296,7 +296,7 @@ var et2_container = et2_baseWidget.extend({ /** * Container object for not-yet supported widgets */ -var et2_placeholder = et2_baseWidget.extend({ +var et2_placeholder = et2_baseWidget.extend([et2_IDetachedDOM],{ init: function() { this._super.apply(this, arguments); @@ -348,6 +348,18 @@ var et2_placeholder = et2_baseWidget.extend({ } this.setDOMNode(this.placeDiv[0]); + }, + + getDetachedAttributes: function(_attrs) { + _attrs.push("value"); + }, + + getDetachedNodes: function() { + return [this.placeDiv[0]]; + }, + + setDetachedAttributes: function(_nodes, _values) { + this.placeDiv = jQuery(_nodes[0]); } }); diff --git a/etemplate/js/et2_widget_date.js b/etemplate/js/et2_widget_date.js index b388a3fa1b..fc1369d716 100644 --- a/etemplate/js/et2_widget_date.js +++ b/etemplate/js/et2_widget_date.js @@ -649,7 +649,7 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM], { * by the calling code. */ getDetachedAttributes: function(_attrs) { - _attrs.push("value"); + _attrs.push("value", "class"); }, /** @@ -673,6 +673,12 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM], { setDetachedAttributes: function(_nodes, _values) { this.span = jQuery(_nodes[0]); this.set_value(_values["value"]); + + this._super.apply(this, arguments); + if(_values["class"]) + { + this.span.addClass(_values["class"]); + } } diff --git a/etemplate/js/et2_widget_image.js b/etemplate/js/et2_widget_image.js index 36120340e8..b64e720f9e 100644 --- a/etemplate/js/et2_widget_image.js +++ b/etemplate/js/et2_widget_image.js @@ -149,7 +149,7 @@ var et2_image = et2_baseWidget.extend(et2_IDetachedDOM, { */ getDetachedAttributes: function(_attrs) { - _attrs.push("src", "label"); + _attrs.push("src", "label", "href"); }, getDetachedNodes: function() { @@ -170,9 +170,12 @@ var et2_image = et2_baseWidget.extend(et2_IDetachedDOM, { { this.set_label(_values["label"]); } + if(_values["href"]) + { + this.image.addClass('et2_clickable'); + } } }); et2_register_widget(et2_image, ["image"]); -