From 4a172125768e3b33c30e725e8550454a9d26c5c4 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sat, 25 Oct 2014 10:09:17 +0100
Subject: [PATCH] Enhance height control for edit-text widget

Added the option to disable automatic resizing, and the ability to
specify the minimum height.
---
 core/modules/widgets/edit-text.js                   | 13 +++++++++----
 .../tw5.com/tiddlers/widgets/EditTextWidget.tid     |  8 +++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/core/modules/widgets/edit-text.js b/core/modules/widgets/edit-text.js
index 45c8a9138..f328feda5 100644
--- a/core/modules/widgets/edit-text.js
+++ b/core/modules/widgets/edit-text.js
@@ -12,7 +12,7 @@ Edit-text widget
 /*global $tw: false */
 "use strict";
 
-var MIN_TEXT_AREA_HEIGHT = 100; // Minimum height of textareas in pixels
+var DEFAULT_MIN_TEXT_AREA_HEIGHT = "100px"; // Minimum height of textareas in pixels
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
@@ -137,6 +137,8 @@ EditTextWidget.prototype.execute = function() {
 	this.editClass = this.getAttribute("class");
 	this.editPlaceholder = this.getAttribute("placeholder");
 	this.editSize = this.getAttribute("size");
+	this.editAutoHeight = this.getAttribute("autoHeight","yes") === "yes";
+	this.editMinHeight = this.getAttribute("minHeight",DEFAULT_MIN_TEXT_AREA_HEIGHT)
 	this.editFocusPopup = this.getAttribute("focusPopup");
 	// Get the editor element tag and type
 	var tag,type;
@@ -164,7 +166,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 EditTextWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// Completely rerender if any of our attributes have changed
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup) {
 		this.refreshSelf();
 		return true;
 	} else if(changedTiddlers[this.editTitle]) {
@@ -203,15 +205,18 @@ Fix the height of textareas to fit their content
 EditTextWidget.prototype.fixHeight = function() {
 	var self = this,
 		domNode = this.domNodes[0];
-	if(domNode && !domNode.isTiddlyWikiFakeDom && this.editTag === "textarea") {
+	if(this.editAutoHeight && domNode && !domNode.isTiddlyWikiFakeDom && this.editTag === "textarea") {
 		$tw.utils.nextTick(function() {
 			// Resize the textarea to fit its content, preserving scroll position
 			var scrollPosition = $tw.utils.getScrollPosition(),
 				scrollTop = scrollPosition.y;
+			// Measure the specified minimum height
+			domNode.style.height = self.editMinHeight;
+			var minHeight = domNode.offsetHeight;
 			// Set its height to auto so that it snaps to the correct height
 			domNode.style.height = "auto";
 			// Calculate the revised height
-			var newHeight = Math.max(domNode.scrollHeight + domNode.offsetHeight - domNode.clientHeight,MIN_TEXT_AREA_HEIGHT);
+			var newHeight = Math.max(domNode.scrollHeight + domNode.offsetHeight - domNode.clientHeight,minHeight);
 			// Only try to change the height if it has changed
 			if(newHeight !== domNode.offsetHeight) {
 				domNode.style.height =  newHeight + "px";
diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
index 6ff14fba1..563182bb9 100644
--- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
@@ -1,6 +1,6 @@
 title: EditTextWidget
 created: 201310241419
-modified: 201407250837
+modified: 20141025085449609
 tags: Widgets
 caption: edit-text
 
@@ -22,9 +22,11 @@ The content of the `<$edit-text>` widget is ignored.
 |class |A CSS class to be assigned to the generated HTML editing element |
 |placeholder |Placeholder text to be displayed when the edit field is empty |
 |focusPopup |Title of a state tiddler for a popup that is displayed when the editing element has focus  |
-|tag |Overrides the generated HTML editing element tag |
-|size |The size of the input field (in characters) |
+|tag |Overrides the generated HTML editing element tag. Use `textarea` for a multi-line editor |
 |type |Overrides the generated HTML editing element `type` attribute |
+|size |The size of the input field (in characters) |
+|autoHeight |Either "yes" or "no" to specify whether to automatically resize `textarea` editors to fit their content (defaults to "yes") |
+|minHeight |Minimum height for automatically resized `textarea` editors, specified in CSS length units such as "px", "em" or "%" |
 
 ! Notes