Changeset 29978

Timestamp:

2015-06-11T02:21:52+12:00 (9 years ago)

Author:

Georgiy Litvinov

Message:

Fix for web editor. Moved to textarea for metadata fields.

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/document_scripts.js (modified) (2 diffs)
• js/documentmaker_scripts_util.js (modified) (7 diffs)
• style/core.css (modified) (1 diff)
• transform/pages/document.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

@@ -1089 +1089 @@
 function addEditableState(editable,stateArray)
 {
+    if(editable.tagName == 'TEXTAREA')
+    {
+        nodeText = editable.value;
+    }  
+    else 
+    {
+        nodeText = editable.innerHTML;
+    }
+
         stateArray.push({
                 editableNode : editable,
-                initHTML : editable.innerHTML
+                initHTML : nodeText
         });
 }
@@ -1099 +1108 @@
     editableLastStates = [];
         $(".sectionText").each(function(){addEditableState(this,editableLastStates);});
-        $(".metaTableCell").each(function(){addEditableState(this,editableLastStates);});
+        $(".metaTableCellArea").each(function(){addEditableState(this,editableLastStates);});
 
 }

main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js

@@ -296 +296 @@
       var name = nameCell.innerHTML;
       var valueCell = cells[1];
-      var value = valueCell.innerHTML;
+      var value = valueCell.getElementsByTagName("TEXTAREA")[0].value;
       metadataChanges.push({type:'delete', docID:docID, name:name, value:value});
       removeFromParent(currentRow);
@@ -308 +308 @@
     {
         var changedElem = changes[i];
-        
         //Save metadata     
-        if(gs.functions.hasClass(changedElem, "metaTableCell")) 
+        if(gs.functions.hasClass(changedElem, "metaTableCellArea")) 
         {
             //Get document ID
@@ -318 +317 @@
 
             //Get metadata name
-            var row = changedElem.parentNode;
+            var row = changedElem.parentNode.parentNode;
             var cells = row.getElementsByTagName("TD");
             var nameCell = cells[0];
             var name = nameCell.innerHTML;
-            var value = changedElem.innerHTML;
+            var value = changedElem.value;
             value = value.replace(/ /g, " ");
 
@@ -330 +329 @@
             }
             metadataChanges.push({collection:collection, docID:docID, name:name, value:value, orig:orig});
-            changedElem.originalValue = changedElem.innerHTML;
+            changedElem.originalValue = changedElem.value;
             addCollectionToBuild(collection);
         }
@@ -720 +719 @@
 {
     //This registering can cause a sizeable delay so we'll thread it (effectively) so the browser is not paused
-    cell.originalValue = cell.innerHTML;
+    cell.originalValue = cell.value;
     setTimeout(function(){addEditableState(cell, editableInitStates)}, 0);
 }
@@ -793 +792 @@
         }
             
-        asyncRegisterEditSection(cells[1]);
+        asyncRegisterEditSection(cells[1].getElementsByTagName("textarea")[0]);
         addRemoveLinkToRow(this);
     });
@@ -812 +811 @@
         }
         
-        var newRow = $("<tr>");
+        var newRow = $("<tr>", {"style": "display: table-row;"});
         var nameCell = $("<td>" + name + "</td>");
         nameCell.attr("class", "metaTableCellName");
-        var valueCell = $("<td>", {"class": "metaTableCell"});
-        valueCell.attr("contenteditable","true");
-        
+        var valueCell = $("<td>", {"class": "metaTableCell"});  
+        var textValue = $("<textarea>", {"class": "metaTableCellArea"}); 
+        valueCell.append(textValue);
         newRow.append(nameCell);
         newRow.append(valueCell);

main/trunk/greenstone3/web/interfaces/default/style/core.css

@@ -489 +489 @@
 #resultsTable .shelf>a { background-image: url('../images/bookshelf.png'); }
 
+.metaTableCell { border: 1;}
+.metaTableCellArea {
+    border: none; 
+    resize: none; 
+    outline: none; 
+    overflow: auto; 
+    width: 400px; 
+    -webkit-box-sizing: border-box; 
+    -moz-box-sizing: border-box; 
+    box-sizing: border-box; 
+}
 /* corners of the banner */
 /*

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -207 +207 @@
                             <tr>
                                 <td class="metaTableCellName"><xsl:value-of select="@name"/></td>
-                                <td class="metaTableCell" contenteditable="true"><xsl:value-of select="."/></td>
+                                <td class="metaTableCell"> <textarea autocomplete="off" class="metaTableCellArea"><xsl:value-of select="."/></textarea></td>
                             </tr>
                         </xsl:if>