Changeset 29978 for main/trunk/greenstone3
- Timestamp:
- 2015-06-11T02:21:52+12:00 (9 years ago)
- Location:
- main/trunk/greenstone3/web/interfaces/default
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js
r29931 r29978 1089 1089 function addEditableState(editable,stateArray) 1090 1090 { 1091 if(editable.tagName == 'TEXTAREA') 1092 { 1093 nodeText = editable.value; 1094 } 1095 else 1096 { 1097 nodeText = editable.innerHTML; 1098 } 1099 1091 1100 stateArray.push({ 1092 1101 editableNode : editable, 1093 initHTML : editable.innerHTML1102 initHTML : nodeText 1094 1103 }); 1095 1104 } … … 1099 1108 editableLastStates = []; 1100 1109 $(".sectionText").each(function(){addEditableState(this,editableLastStates);}); 1101 $(".metaTableCell ").each(function(){addEditableState(this,editableLastStates);});1110 $(".metaTableCellArea").each(function(){addEditableState(this,editableLastStates);}); 1102 1111 1103 1112 } -
main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js
r29861 r29978 296 296 var name = nameCell.innerHTML; 297 297 var valueCell = cells[1]; 298 var value = valueCell. innerHTML;298 var value = valueCell.getElementsByTagName("TEXTAREA")[0].value; 299 299 metadataChanges.push({type:'delete', docID:docID, name:name, value:value}); 300 300 removeFromParent(currentRow); … … 308 308 { 309 309 var changedElem = changes[i]; 310 311 310 //Save metadata 312 if(gs.functions.hasClass(changedElem, "metaTableCell "))311 if(gs.functions.hasClass(changedElem, "metaTableCellArea")) 313 312 { 314 313 //Get document ID … … 318 317 319 318 //Get metadata name 320 var row = changedElem.parentNode ;319 var row = changedElem.parentNode.parentNode; 321 320 var cells = row.getElementsByTagName("TD"); 322 321 var nameCell = cells[0]; 323 322 var name = nameCell.innerHTML; 324 var value = changedElem. innerHTML;323 var value = changedElem.value; 325 324 value = value.replace(/ /g, " "); 326 325 … … 330 329 } 331 330 metadataChanges.push({collection:collection, docID:docID, name:name, value:value, orig:orig}); 332 changedElem.originalValue = changedElem. innerHTML;331 changedElem.originalValue = changedElem.value; 333 332 addCollectionToBuild(collection); 334 333 } … … 720 719 { 721 720 //This registering can cause a sizeable delay so we'll thread it (effectively) so the browser is not paused 722 cell.originalValue = cell. innerHTML;721 cell.originalValue = cell.value; 723 722 setTimeout(function(){addEditableState(cell, editableInitStates)}, 0); 724 723 } … … 793 792 } 794 793 795 asyncRegisterEditSection(cells[1] );794 asyncRegisterEditSection(cells[1].getElementsByTagName("textarea")[0]); 796 795 addRemoveLinkToRow(this); 797 796 }); … … 812 811 } 813 812 814 var newRow = $("<tr>" );813 var newRow = $("<tr>", {"style": "display: table-row;"}); 815 814 var nameCell = $("<td>" + name + "</td>"); 816 815 nameCell.attr("class", "metaTableCellName"); 817 var valueCell = $("<td>", {"class": "metaTableCell"}); 818 va lueCell.attr("contenteditable","true");819 816 var valueCell = $("<td>", {"class": "metaTableCell"}); 817 var textValue = $("<textarea>", {"class": "metaTableCellArea"}); 818 valueCell.append(textValue); 820 819 newRow.append(nameCell); 821 820 newRow.append(valueCell); -
main/trunk/greenstone3/web/interfaces/default/style/core.css
r28544 r29978 489 489 #resultsTable .shelf>a { background-image: url('../images/bookshelf.png'); } 490 490 491 .metaTableCell { border: 1;} 492 .metaTableCellArea { 493 border: none; 494 resize: none; 495 outline: none; 496 overflow: auto; 497 width: 400px; 498 -webkit-box-sizing: border-box; 499 -moz-box-sizing: border-box; 500 box-sizing: border-box; 501 } 491 502 /* corners of the banner */ 492 503 /* -
main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl
r29861 r29978 207 207 <tr> 208 208 <td class="metaTableCellName"><xsl:value-of select="@name"/></td> 209 <td class="metaTableCell" contenteditable="true"><xsl:value-of select="."/></td>209 <td class="metaTableCell"> <textarea autocomplete="off" class="metaTableCellArea"><xsl:value-of select="."/></textarea></td> 210 210 </tr> 211 211 </xsl:if>
Note:
See TracChangeset
for help on using the changeset viewer.