H2 Console: HTML and XML documents can now be edited in an updatable result set.…

H2 Console: HTML and XML documents can now be edited in an updatable result set. There is (limited) support for editing multi-line documents.

h2/src/docsrc/html/changelog.html

@@ -30,7 +30,8 @@ Change Log
 </li><li>When opening a remote session, don't open a temporary file if the trace level is set to zero
 </li><li>Use HMAC for authenticating remote LOB id's, removing the need for maintaining a cache, and removing the limit
     on the number of LOBs per result set.
-</li><li>Fix editing of XML documents in web console
+</li><li>H2 Console: HTML and XML documents can now be edited in an updatable result set.
+    There is (limited) support for editing multi-line documents.
 </li></ul>
 
 <h2>Version 1.3.167 (2012-05-23)</h2>

h2/src/main/org/h2/server/web/res/table.js

@@ -59,17 +59,26 @@ function editRow(row, session, write, undo) {
     for(i=1; i<cells.length; i++) {
         var cell = cells[i];
         var text = getInnerText(cell);
-        // escape stuff so we can edit data that contains HTML special characters
-        text = text.replace(/&/g, '&amp;') /* This MUST be the 1st replacement. */
-            .replace(/'/g, '&apos;') /* The 4 other predefined entities, required. */
-            .replace(/"/g, '&quot;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;');
-        var newHTML = '<input type="text" name="$rowName" value="$t" size="$size" onkeydown="return editKeyDown($row, this, event)" />';
+        // escape so we can edit data that contains HTML special characters
+        // '&' needs to be replaced first
+        text = text.replace(/&/g, '&amp;').
+            replace(/'/g, '&apos;').
+            replace(/"/g, '&quot;').
+            replace(/</g, '&lt;').
+            replace(/>/g, '&gt;');
+        var size;
+        var newHTML;
+        if (text.indexOf('\n') >= 0) {  
+            size = 40;
+            newHTML = '<textarea name="$rowName" cols="$size" onkeydown="return editKeyDown($row, this, event)">$t</textarea/>';
+        } else {
+            size = text.length+5;
+            newHTML = '<input type="text" name="$rowName" value="$t" size="$size" onkeydown="return editKeyDown($row, this, event)" />';
+        }
         newHTML = newHTML.replace('$rowName', 'r' + row + 'c' + i);
         newHTML = newHTML.replace('$row', row);
         newHTML = newHTML.replace('$t', text);
-        newHTML = newHTML.replace('$size', text.length+5);
+        newHTML = newHTML.replace('$size', size);
         cell.innerHTML = newHTML;
     }
 }
@@ -95,8 +104,10 @@ function editKeyDown(row, object, event) {
         object.value = 'null';
         return false;
     } else if(key == 13) {
-        editOk(row);
-        return false;
+        if (!event.ctrlKey && !event.shiftKey && !event.altKey) {
+            editOk(row);
+            return false;
+        }
     } else if(key == 27) {
         editCancel(row);
         return false;