From: <hn...@us...> - 2014-07-23 12:54:10
|
Author: hnategh Date: Wed Jul 23 14:54:02 2014 New Revision: 47866 URL: http://svn.stylite.de/viewvc/egroupware?rev=47866&view=rev Log: Backport commit 47853 by ng, Fix detached date label Modified: branches/14.1/etemplate/js/et2_widget_date.js Modified: branches/14.1/etemplate/js/et2_widget_date.js URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/etemplate/js/et2_widget_date.js?rev=47866&r1=47865&r2=47866&view=diff ============================================================================== --- branches/14.1/etemplate/js/et2_widget_date.js (original) +++ branches/14.1/etemplate/js/et2_widget_date.js Wed Jul 23 14:54:02 2014 @@ -610,14 +610,14 @@ */ init: function() { this._super.apply(this, arguments); - this.label_node = $j(document.createElement("label")) + this._labelContainer = $j(document.createElement("label")) .addClass("et2_label"); this.value = ""; this.span = $j(document.createElement(this._type == "date-since" || this._type == "date-time_today" ? "span" : "time")) .addClass("et2_date_ro et2_label") - .appendTo(this.label_node); - - this.setDOMNode(this.label_node[0]); + .appendTo(this._labelContainer); + + this.setDOMNode(this._labelContainer[0]); }, set_value: function(_value) { @@ -707,6 +707,18 @@ this.span.attr("datetime", date("Y-m-d H:i:s",this.date)).text(display); }, + set_label: function(label) + { + // Remove current label + this._labelContainer.contents() + .filter(function(){ return this.nodeType == 3; }).remove(); + + var parts = et2_csvSplit(label, 2, "%s"); + this._labelContainer.prepend(parts[0]); + this._labelContainer.append(parts[1]); + this.label = label; + }, + /** * Creates a list of attributes which can be set when working in the * "detached" mode. The result is stored in the _attrs array which is provided @@ -725,7 +737,7 @@ * @return {array} */ getDetachedNodes: function() { - return [this.label_node[0], this.span[0]]; + return [this._labelContainer[0], this.span[0]]; }, /** @@ -739,7 +751,7 @@ * given values. */ setDetachedAttributes: function(_nodes, _values) { - this.label_node = jQuery(_nodes[0]); + this._labelContainer = jQuery(_nodes[0]); this.span = jQuery(_nodes[1]); this.set_value(_values["value"]); |