Convert et2_widget_file, et2_widget_vfs and fixes couple of definitions in other widgets

api/js/etemplate/et2_core_DOMWidget.js

@@ -698,6 +698,9 @@ var et2_surroundingsMgr = /** @class */ (function (_super) {
         // Return the widget container
         return this._widgetContainer;
     };
+    et2_surroundingsMgr.prototype.getWidgetSurroundings = function () {
+        return this._widgetSurroundings;
+    };
     return et2_surroundingsMgr;
 }(et2_core_inheritance_1.ClassWithAttributes));
 /**

api/js/etemplate/et2_core_DOMWidget.ts

@@ -875,6 +875,11 @@ class et2_surroundingsMgr extends ClassWithAttributes
 		// Return the widget container
 		return this._widgetContainer;
 	}
+
+	getWidgetSurroundings() : HTMLElement []
+	{
+		return this._widgetSurroundings;
+	}
 }
 
 /**

api/js/etemplate/et2_types.d.ts

@@ -191,4 +191,7 @@ declare function nm_open_popup(_action, _selected) : void;
 declare function nm_submit_popup(button) : void;
 declare function nm_hide_popup(element, div_id) : false;
 declare function nm_activate_link(_action, _senders) : void;
-declare function egw_seperateJavaScript(_html) : void;
+declare function egw_seperateJavaScript(_html) : void;
+declare class Resumable {
+	constructor(asyncOptions: any);
+}

api/js/etemplate/et2_widget_description.js

@@ -352,5 +352,6 @@ var et2_description = /** @class */ (function (_super) {
     };
     return et2_description;
 }(et2_core_baseWidget_1.et2_baseWidget));
+exports.et2_description = et2_description;
 et2_core_widget_1.et2_register_widget(et2_description, ["description", "label"]);
 //# sourceMappingURL=et2_widget_description.js.map

api/js/etemplate/et2_widget_description.ts

@@ -24,7 +24,7 @@ import './et2_types';
 /**
  * Class which implements the "description" XET-Tag
  */
-class et2_description extends et2_baseWidget implements et2_IDetachedDOM
+export class et2_description extends et2_baseWidget implements et2_IDetachedDOM
 {
 	static readonly _attributes : any = {
 		"label": {

api/js/etemplate/et2_widget_dialog.js

@@ -799,5 +799,6 @@ var et2_dialog = /** @class */ (function (_super) {
     et2_dialog.NO_BUTTON = 3;
     return et2_dialog;
 }(et2_core_widget_2.et2_widget));
+exports.et2_dialog = et2_dialog;
 et2_core_widget_1.et2_register_widget(et2_dialog, ["dialog"]);
 //# sourceMappingURL=et2_widget_dialog.js.map

api/js/etemplate/et2_widget_dialog.ts

@@ -93,7 +93,7 @@ import {et2_DOMWidget} from "./et2_core_DOMWidget";
  * @augments et2_widget
  * @see http://api.jqueryui.com/dialog/
  */
-class et2_dialog extends et2_widget {
+export class et2_dialog extends et2_widget {
     static readonly _attributes: any = {
         callback: {
             name: "Callback",

api/js/etemplate/et2_widget_file.ts

@@ -0,0 +1,740 @@
+/**
+ * EGroupware eTemplate2 - JS Number object
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage api
+ * @link http://www.egroupware.org
+ * @author Nathan Gray
+ * @copyright Nathan Gray 2011
+ * @version $Id$
+ */
+
+/*egw:uses
+	et2_core_inputWidget;
+	phpgwapi.Resumable.resumable;
+*/
+
+import {et2_inputWidget} from "./et2_core_inputWidget";
+import {et2_register_widget, WidgetConfig} from "./et2_core_widget";
+import {ClassWithAttributes} from "./et2_core_inheritance";
+
+/**
+ * Class which implements file upload
+ *
+ * @augments et2_inputWidget
+ */
+export class et2_file extends et2_inputWidget
+{
+	static readonly _attributes : any = {
+		"multiple": {
+			"name": "Multiple files",
+			"type": "boolean",
+			"default": false,
+			"description": "Allow the user to select more than one file to upload at a time.  Subject to browser support."
+		},
+		"max_file_size": {
+			"name": "Maximum file size",
+			"type": "integer",
+			"default":0,
+			"description": "Largest file accepted, in bytes.  Subject to server limitations.  8MB = 8388608"
+		},
+		"mime": {
+			"name": "Allowed file types",
+			"type": "string",
+			"default": et2_no_init,
+			"description": "Mime type (eg: image/png) or regex (eg: /^text\//i) for allowed file types"
+		},
+		"blur": {
+			"name": "Placeholder",
+			"type": "string",
+			"default": "",
+			"description": "This text get displayed if an input-field is empty and does not have the input-focus (blur). It can be used to show a default value or a kind of help-text."
+		},
+		"progress": {
+			"name": "Progress node",
+			"type": "string",
+			"default": et2_no_init,
+			"description": "The ID of an alternate node (div) to display progress and results.  The Node is fetched with et2 getWidgetById so you MUST use the id assigned in XET-File (it may not be available at creation time, so we (re)check on createStatus time)"
+		},
+		"onStart": {
+			"name": "Start event handler",
+			"type": "any",
+			"default": et2_no_init,
+			"description": "A (js) function called when an upload starts.  Return true to continue with upload, false to cancel."
+		},
+		"onFinish": {
+			"name": "Finish event handler",
+			"type": "any",
+			"default": et2_no_init,
+			"description": "A (js) function called when all files to be uploaded are finished."
+		},
+		drop_target: {
+			"name": "Optional, additional drop target for HTML5 uploads",
+			"type": "string",
+			"default": et2_no_init,
+			"description": "The ID of an additional drop target for HTML5 drag-n-drop file uploads"
+		},
+		label: {
+			"name": "Label of file upload",
+			"type": "string",
+			"default": "Choose file...",
+			"description": "String caption to be displayed on file upload span"
+		},
+		progress_dropdownlist: {
+			"name": "List on files in progress like dropdown",
+			"type": "boolean",
+			"default": false,
+			"description": "Style list of files in uploading progress like dropdown list with a total upload progress indicator"
+		},
+		onFinishOne: {
+			"name": "Finish event handler for each one",
+			"type": "any",
+			"default": et2_no_init,
+			"description": "A (js) function called when a file to be uploaded is finished."
+		},
+		accept: {
+			"name": "Acceptable extensions",
+			"type": "string",
+			"default": '',
+			"description": "Define types of files that the server accepts. Multiple types can be seperated by comma and the default is to accept everything."
+		},
+		chunk_size: {
+			"name": "Chunk size",
+			"type": "integer",
+			"default": 1024*1024,
+			"description": "Max chunk size, gets set from server-side PHP (max_upload_size-1M)/2"	// last chunk can be up to 2*chunk_size!
+		}
+	};
+
+	asyncOptions : any = {};
+	input : JQuery = null;
+	progress : JQuery = null;
+	span : JQuery = null;
+	disabled_buttons : JQuery;
+	resumable : any;
+
+	/**
+	 * Constructor
+	 *
+	 * @memberOf et2_file
+	 */
+	constructor(_parent, _attrs? : WidgetConfig, _child? : object)
+	{
+		// Call the inherited constructor
+		super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_file._attributes, _child || {}));
+
+		this.node = null;
+		this.input = null;
+		this.progress = null;
+		this.span = null;
+		// Contains all submit buttons need to be disabled during upload process
+		this.disabled_buttons = jQuery("input[type='submit'], button");
+		if(!this.options.value) this.options.value = {};
+
+		if(!this.options.id) {
+			console.warn("File widget needs an ID.  Used 'file_widget'.");
+			this.options.id = "file_widget";
+		}
+
+		// Legacy - id ending in [] means multiple
+		if(this.options.id.substr(-2) == "[]")
+		{
+			this.options.multiple = true;
+		}
+		// If ID ends in /, it's a directory - allow multiple
+		else if (this.options.id.substr(-1) === "/")
+		{
+			this.options.multiple = true;
+			_attrs.multiple = true;
+		}
+
+		// Set up the URL to have the request ID & the widget ID
+		var instance = this.getInstanceManager();
+
+		let self = this;
+
+		this.asyncOptions = jQuery.extend({
+			// Callbacks
+			onStart: function(event, file_count) {
+				return self.onStart(event, file_count);
+			},
+			onFinish: function(event, file_count) {
+				self.onFinish.apply(self, [event, file_count])
+			},
+			onStartOne: function(event, file_name, index, file_count) {
+
+			},
+			onFinishOne: function(event, response, name, number, total) { return self.finishUpload(event,response,name,number,total);},
+			onProgress: function(event, progress, name, number, total) { return self.onProgress(event,progress,name,number,total);},
+			onError: function(event, name, error) { return self.onError(event,name,error);},
+			beforeSend: function(form) { return self.beforeSend(form);},
+
+			chunkSize: this.options.chunk_size || 1024*1024,
+
+			target: egw.ajaxUrl("EGroupware\\Api\\Etemplate\\Widget\\File::ajax_upload"),
+			query: function(file) {return self.beforeSend(file);},
+			// Disable checking for already uploaded chunks
+			testChunks: false
+		},this.asyncOptions);
+		this.asyncOptions.fieldName = this.options.id;
+		this.createInputWidget();
+		this.set_readonly(this.options.readonly);
+	}
+
+	destroy()
+	{
+		super.destroy();
+		this.set_drop_target(null);
+		this.node = null;
+		this.input = null;
+		this.span = null;
+		this.progress = null;
+	}
+
+	createInputWidget()
+	{
+		this.node = <HTMLElement><unknown>jQuery(document.createElement("div")).addClass("et2_file");
+		this.span = jQuery(document.createElement("span"))
+			.addClass('et2_file_span et2_button')
+			.appendTo (this.node);
+		if (this.options.label != '') this.span.addClass('et2_button_text');
+		let span = this.span;
+		this.input = jQuery(document.createElement("input"))
+			.attr("type", "file").attr("placeholder", this.options.blur)
+			.addClass ("et2_file_upload")
+			.appendTo(this.node)
+			.hover(function() {
+				jQuery(span)
+					.toggleClass('et2_file_spanHover');
+			})
+			.on({
+				mousedown:function (){
+					jQuery(span).addClass('et2_file_spanActive');
+				},
+				mouseup:function (){
+					jQuery(span).removeClass('et2_file_spanActive');
+				}
+			});
+		if (this.options.accept) this.input.attr('accept', this.options.accept);
+		let self = this;
+		// trigger native input upload file
+		if (!this.options.readonly) this.span.click(function(){self.input.click()});
+		// Check for File interface, should fall back to normal form submit if missing
+		if(typeof File != "undefined" && typeof (new XMLHttpRequest()).upload != "undefined")
+		{
+			this.resumable = new Resumable(this.asyncOptions);
+			this.resumable.assignBrowse(this.input);
+			this.resumable.on('fileAdded', jQuery.proxy(this._fileAdded, this));
+			this.resumable.on('fileProgress', jQuery.proxy(this._fileProgress, this));
+			this.resumable.on('fileSuccess', jQuery.proxy(this.finishUpload, this));
+			this.resumable.on('complete', jQuery.proxy(this.onFinish, this));
+		}
+		else
+		{
+			// This may be a problem submitting via ajax
+		}
+		if(this.options.progress)
+		{
+			let widget = this.getRoot().getWidgetById(this.options.progress);
+			if(widget)
+			{
+				//may be not available at createInputWidget time
+				this.progress = jQuery(widget.getDOMNode());
+			}
+		}
+		if(!this.progress)
+		{
+			this.progress = jQuery(document.createElement("div")).appendTo(this.node);
+		}
+		this.progress.addClass("progress");
+
+		if(this.options.multiple)
+		{
+			this.input.attr("multiple","multiple");
+		}
+
+		this.setDOMNode(this.node[0]);
+	}
+
+	/**
+	 * Set a widget or DOM node as a HTML5 file drop target
+	 *
+	 * @param {string} new_target widget ID or DOM node ID to be used as a new target
+	 */
+	set_drop_target(new_target : string)
+	{
+		// Cancel old drop target
+		if(this.options.drop_target)
+		{
+			let widget = this.getRoot().getWidgetById(this.options.drop_target);
+			let drop_target = widget && widget.getDOMNode() || document.getElementById(this.options.drop_target);
+			if(drop_target)
+			{
+				this.resumable.unAssignDrop(drop_target);
+			}
+		}
+
+		this.options.drop_target = new_target;
+
+		if(!this.options.drop_target) return;
+
+		// Set up new drop target
+		let widget = this.getRoot().getWidgetById(this.options.drop_target);
+		let drop_target = widget && widget.getDOMNode() || document.getElementById(this.options.drop_target);
+		if(drop_target)
+		{
+			this.resumable.assignDrop([drop_target]);
+		}
+		else
+		{
+			this.egw().debug("warn", "Did not find file drop target %s", this.options.drop_target);
+		}
+
+	}
+
+	attachToDOM()
+	{
+		let res = super.attachToDOM();
+		// Override parent's change, file widget will fire change when finished uploading
+		this.input.unbind("change.et2_inputWidget");
+		return res;
+	}
+
+	getValue()
+	{
+		return this.options.value ? this.options.value : this.input.val();
+	}
+
+	/**
+	 * Set the value of the file widget.
+	 *
+	 * If you pass a FileList or list of files, it will trigger the async upload
+	 *
+	 * @param {FileList|File[]|false} value List of files to be uploaded, or false to reset.
+	 * @param {Event} event Most browsers require the user to initiate file transfers in some way.
+	 *	Pass the event in, if you have it.
+	 */
+	set_value(value, event?) : boolean
+	{
+		if (!value || typeof value == "undefined") {
+			value = {};
+		}
+		if (jQuery.isEmptyObject(value)) {
+			this.options.value = {};
+			if (this.resumable.progress() == 1) this.progress.empty();
+
+			// Reset the HTML element
+			this.input.wrap('<form>').closest('form').get(0).reset();
+			this.input.unwrap();
+
+			return;
+		}
+
+		let addFile = jQuery.proxy(function (i, file) {
+			this.resumable.addFile(file, event);
+		}, this);
+		if (typeof value == 'object' && value.length && typeof value[0] == 'object' && value[0].name) {
+			try {
+				this.input[0].files = value;
+
+				jQuery.each(value, addFile);
+			} catch (e) {
+				var self = this;
+				var args = arguments;
+				jQuery.each(value, addFile);
+			}
+		}
+	}
+
+	/**
+	 * Set the value for label
+	 * The label is used as caption for span tag which customize the HTML file upload styling
+	 *
+	 * @param {string} value text value of label
+	 */
+	set_label(value)
+	{
+		if (this.span != null && value != null)
+		{
+			this.span.text(value);
+		}
+	}
+
+	getInputNode()
+	{
+		if (typeof this.input == 'undefined') return <HTMLElement><unknown>false;
+		return this.input[0];
+	}
+
+
+	set_mime(mime)
+	{
+		if(!mime)
+		{
+			this.options.mime = null;
+		}
+		if(mime.indexOf("/") != 0)
+		{
+			// Lower case it now, if it's not a regex
+			this.options.mime = mime.toLowerCase();
+		}
+		else
+		{
+			// Convert into a js regex
+			var parts = mime.substr(1).match(/(.*)\/([igm]?)$/);
+			this.options.mime = new RegExp(parts[1],parts.length > 2 ? parts[2] : "");
+		}
+	}
+
+	set_multiple(_multiple)
+	{
+		this.options.multiple = _multiple;
+		if(_multiple)
+		{
+			return this.input.attr("multiple", "multiple");
+		}
+		return this.input.removeAttr("multiple");
+	}
+
+	/**
+	 * Check to see if the provided file's mimetype matches
+	 *
+	 * @param f File object
+	 * @return boolean
+	 */
+	checkMime(f)
+	{
+		// If missing, let the server handle it
+		if(!this.options.mime || !f.type) return true;
+
+		var is_preg = (typeof this.options.mime == "object");
+		if(!is_preg && f.type.toLowerCase() == this.options.mime || is_preg && this.options.mime.test(f.type))
+		{
+			return true;
+		}
+
+		// Not right mime
+		return false;
+	}
+
+	private _fileAdded(file,event)
+	{
+		// Manual additions have no event
+		if(typeof event == 'undefined')
+		{
+			event = {};
+		}
+		// Trigger start of uploading, calls callback
+		if(!this.resumable.isUploading())
+		{
+			if (!(this.onStart(event,this.resumable.files.length))) return;
+		}
+
+		// Here 'this' is the input
+		if(this.checkMime(file.file))
+		{
+			if(this.createStatus(event,file))
+			{
+
+				// Disable buttons
+				this.disabled_buttons
+					.not("[disabled]")
+					.attr("disabled", true)
+					.addClass('et2_button_ro')
+					.removeClass('et2_clickable')
+					.css('cursor', 'default');
+
+				// Actually start uploading
+				this.resumable.upload();
+			}
+		}
+		else
+		{
+			// Wrong mime type - show in the list of files
+			return this.createStatus(
+				this.egw().lang("File is of wrong type (%1 != %2)!", file.file.type, this.options.mime),
+				file
+			);
+		}
+
+	}
+
+	/**
+	 * Add in the request id
+	 */
+	beforeSend(form) {
+		var instance = this.getInstanceManager();
+
+		return {
+			request_id: instance.etemplate_exec_id,
+			widget_id: this.id
+		};
+	}
+
+	/**
+	 * Disables submit buttons while uploading
+	 */
+	onStart(event, file_count) {
+		// Hide any previous errors
+		this.hideMessage();
+
+
+		event.data = this;
+
+		//Add dropdown_progress
+		if (this.options.progress_dropdownlist)
+		{
+			this._build_progressDropDownList();
+		}
+
+		// Callback
+		if(this.options.onStart) return et2_call(this.options.onStart, event, file_count);
+		return true;
+	}
+
+	/**
+	 * Re-enables submit buttons when done
+	 */
+	onFinish() {
+		this.disabled_buttons.attr("disabled", 0).css('cursor','pointer').removeClass('et2_button_ro');
+
+		var file_count = this.resumable.files.length;
+
+		// Remove files from list
+		while(this.resumable.files.length > 0)
+		{
+			this.resumable.removeFile(this.resumable.files[this.resumable.files.length -1]);
+		}
+
+		var event = jQuery.Event('upload');
+
+		event.data = this;
+
+		var result = false;
+
+		//Remove progress_dropDown_fileList class and unbind the click handler from body
+		if (this.options.progress_dropdownlist)
+		{
+			this.progress.removeClass("progress_dropDown_fileList");
+			jQuery(this.node).find('span').removeClass('totalProgress_loader');
+			jQuery('body').off('click');
+		}
+
+		if(this.options.onFinish && !jQuery.isEmptyObject(this.getValue()))
+		{
+			result =  et2_call(this.options.onFinish, event, file_count);
+		}
+		else
+		{
+			result = (file_count == 0 || !jQuery.isEmptyObject(this.getValue()));
+		}
+		if(result)
+		{
+			// Fire legacy change action when done
+			this.change(this.input);
+		}
+	}
+
+	/**
+	 * Build up dropdown progress with total count indicator
+	 *
+	 * @todo Implement totalProgress bar instead of ajax-loader, in order to show how much percent of uploading is completed
+	 */
+	private _build_progressDropDownList()
+	{
+		this.progress.addClass("progress_dropDown_fileList");
+
+		//Add uploading indicator and bind hover handler on it
+		jQuery(this.node).find('span').addClass('totalProgress_loader');
+
+		jQuery(this.node).find('span.et2_file_span').hover(function(){
+			jQuery('.progress_dropDown_fileList').show();
+		});
+		//Bind click handler to dismiss the dropdown while uploading
+		jQuery('body').on('click', function(event){
+			if (event.target.className != 'remove')
+			{
+				jQuery('.progress_dropDown_fileList').hide();
+			}
+		});
+
+	}
+
+	/**
+	 * Creates the elements used for displaying the file, and it's upload status, and
+	 * attaches them to the DOM
+	 *
+	 * @param _event Either the event, or an error message
+	 */
+	createStatus(_event, file)
+	{
+		var error = (typeof _event == "object" ? "" : _event);
+
+		if(this.options.max_file_size && file.size > this.options.max_file_size) {
+			error = this.egw().lang("File too large.  Maximum %1", et2_vfsSize.prototype.human_size(this.options.max_file_size));
+		}
+
+		if(this.options.progress)
+		{
+			var widget = this.getRoot().getWidgetById(this.options.progress);
+			if(widget)
+			{
+				this.progress = jQuery(widget.getDOMNode());
+				this.progress.addClass("progress");
+			}
+		}
+		if(this.progress)
+		{
+			var fileName = file.fileName || 'file';
+			var status = jQuery("<li data-file='"+fileName.replace(/'/g, '&quot')+"'>"+fileName
+				+"<div class='remove'/><span class='progressBar'><p/></span></li>")
+				.appendTo(this.progress);
+			jQuery("div.remove",status).on('click', file, jQuery.proxy(this.cancel,this));
+			if(error != "")
+			{
+				status.addClass("message ui-state-error");
+				status.append("<div>"+error+"</diff>");
+				jQuery(".progressBar",status).css("display", "none");
+			}
+		}
+		return error == "";
+	}
+
+	private _fileProgress(file)
+	{
+		if(this.progress)
+		{
+			jQuery("li[data-file='"+file.fileName.replace(/'/g, '&quot')+"'] > span.progressBar > p").css("width", Math.ceil(file.progress()*100)+"%");
+
+		}
+		return true;
+	}
+
+	onError(event, name, error)
+	{
+		console.warn(event,name,error);
+	}
+
+	/**
+	 * A file upload is finished, update the UI
+	 */
+	finishUpload(file, response)
+	{
+		var name = file.fileName || 'file';
+
+		if(typeof response == 'string') response = jQuery.parseJSON(response);
+		if(response.response[0] && typeof response.response[0].data.length == 'undefined') {
+			if(typeof this.options.value !== 'object' || !this.options.multiple)
+			{
+				this.set_value({});
+			}
+			for(var key in response.response[0].data) {
+				if(typeof response.response[0].data[key] == "string")
+				{
+					// Message from server - probably error
+					jQuery("[data-file='"+name.replace(/'/g, '&quot')+"']",this.progress)
+						.addClass("error")
+						.css("display", "block")
+						.text(response.response[0].data[key]);
+				}
+				else
+				{
+					this.options.value[key] = response.response[0].data[key];
+					// If not multiple, we already destroyed the status, so re-create it
+					if(!this.options.multiple)
+					{
+						this.createStatus({}, file);
+					}
+					if(this.progress)
+					{
+						jQuery("[data-file='"+name.replace(/'/g, '&quot')+"']",this.progress).addClass("message success");
+					}
+				}
+			}
+		}
+		else if (this.progress)
+		{
+			jQuery("[data-file='"+name.replace(/'/g, '&quot')+"']",this.progress)
+				.addClass("ui-state-error")
+				.css("display", "block")
+				.text(this.egw().lang("Server error"));
+		}
+		var event = jQuery.Event('upload');
+
+		event.data = this;
+
+		// Callback
+		if(this.options.onFinishOne)
+		{
+			return et2_call(this.options.onFinishOne,event,response,name);
+		}
+		return true;
+	}
+
+	/**
+	 * Remove a file from the list of values
+	 *
+	 * @param {File|string} File object, or file name, to remove
+	 */
+	remove_file(file)
+	{
+		//console.info(filename);
+		if(typeof file == 'string')
+		{
+			file = {fileName: file};
+		}
+		for(var key in this.options.value)
+		{
+			if(this.options.value[key].name == file.fileName)
+			{
+				delete this.options.value[key];
+				jQuery('[data-file="'+file.fileName.replace(/'/g, '&quot')+'"]',this.node).remove();
+				return;
+			}
+		}
+		if(file.isComplete && !file.isComplete() && file.cancel) file.cancel();
+	}
+
+	/**
+	 * Cancel a file - event callback
+	 */
+	cancel(e)
+	{
+		e.preventDefault();
+		// Look for file name in list
+		var target = jQuery(e.target).parents("li");
+
+		this.remove_file(e.data);
+
+		// In case it didn't make it to the list (error)
+		target.remove();
+		jQuery(e.target).remove();
+	}
+
+	/**
+	 * Set readonly
+	 *
+	 * @param {boolean} _ro boolean readonly state, true means readonly
+	 */
+	set_readonly(_ro)
+	{
+		if (typeof _ro != "undefined")
+		{
+			this.options.readonly = _ro;
+			this.span.toggleClass('et2_file_ro',_ro);
+			if (this.options.readonly)
+			{
+				this.span.unbind('click');
+			}
+			else
+			{
+				var self = this;
+				this.span.off().bind('click',function(){self.input.click()});
+			}
+		}
+	}
+}
+et2_register_widget(et2_file, ["file"]);
+
+

api/js/etemplate/et2_widget_selectAccount.js

@@ -35,6 +35,7 @@ var et2_core_widget_1 = require("./et2_core_widget");
 var et2_core_inheritance_1 = require("./et2_core_inheritance");
 var et2_widget_link_1 = require("./et2_widget_link");
 var et2_widget_dialog_1 = require("./et2_widget_dialog");
+var et2_widget_link_2 = require("./et2_widget_link");
 /**
  * Account selection widget
  * Changes according to the user's account_selection preference
@@ -719,7 +720,7 @@ var et2_selectAccount_ro = /** @class */ (function (_super) {
         }
     };
     return et2_selectAccount_ro;
-}(et2_link_string));
+}(et2_widget_link_2.et2_link_string));
 exports.et2_selectAccount_ro = et2_selectAccount_ro;
 et2_core_widget_1.et2_register_widget(et2_selectAccount_ro, ["select-account_ro"]);
 //# sourceMappingURL=et2_widget_selectAccount.js.map

api/js/etemplate/et2_widget_selectAccount.ts

@@ -18,10 +18,11 @@
 */
 
 import {et2_selectbox} from "./et2_widget_selectbox";
-import {et2_register_widget, WidgetConfig} from "./et2_core_widget";
+import {et2_register_widget, WidgetConfig, et2_widget} from "./et2_core_widget";
 import {ClassWithAttributes} from "./et2_core_inheritance";
 import {et2_link_entry} from "./et2_widget_link";
 import {et2_dialog} from "./et2_widget_dialog";
+import {et2_link_string} from "./et2_widget_link";
 
 /**
  * Account selection widget
@@ -788,7 +789,7 @@ export class et2_selectAccount_ro extends et2_link_string
 		// Legacy options could have row count or empty label in first slot
 		if(typeof this.options.empty_label == "string")
 		{
-			if(isNaN(this.options.empty_label))
+			if(isNaN(<number><unknown>this.options.empty_label))
 			{
 				this.options.empty_label = this.egw().lang(this.options.empty_label);
 			}

api/js/etemplate/et2_widget_textbox.js

@@ -383,6 +383,7 @@ var et2_textbox_ro = /** @class */ (function (_super) {
     };
     return et2_textbox_ro;
 }(et2_core_valueWidget_1.et2_valueWidget));
+exports.et2_textbox_ro = et2_textbox_ro;
 et2_core_widget_1.et2_register_widget(et2_textbox_ro, ["textbox_ro"]);
 /**
  * et2_searchbox is a widget which provides a collapsable input search

api/js/etemplate/et2_widget_textbox.ts

@@ -321,7 +321,7 @@ et2_register_widget(et2_textbox, ["textbox", "passwd", "hidden"]);
  *
  * @augments et2_valueWidget
  */
-class et2_textbox_ro extends et2_valueWidget implements et2_IDetachedDOM
+export class et2_textbox_ro extends et2_valueWidget implements et2_IDetachedDOM
 {
 	/**
 	 * Ignore all more advanced attributes.

api/js/jsapi/egw_global.d.ts

@@ -459,9 +459,9 @@ declare interface IegwGlobal
 	 *
 	 * @param {string} application Name of application, or common
 	 * @param {string} key
-	 * @param {string} value
+	 * @param {string | array} value
 	 */
-	setSessionItem(application : string, key : string, value : string) : void;
+	setSessionItem(application : string, key : string, value : string[]) : void;
 	/**
 	 * Remove a value from session storage
 	 * @param {string} application