Skip to content

Commit

Permalink
Item14288: make insert-table work
Browse files Browse the repository at this point in the history 
- implemented insert method in codemirror
- implemented insert table in tinymce
- first try replacing %IMAGE with <img /> back and forth
- enabling textpattern in tinymce engine
- disabled TopicInteractionPlugin uploader for now
- removed %EDITTABLE from table dialog
- jslint fixes
  • Loading branch information
@MichaelDaum
MichaelDaum committed Mar 29, 2017
1 parent 5077adc commit 35b3c2e
Show file tree
Hide file tree
Showing 11 changed files with 297 additions and 167 deletions.
153 changes: 111 additions & 42 deletions NatEditPlugin/pub/System/NatEditPlugin/engine/base/engine.uncompressed.js
View file
@@ -1,21 +1,24 @@
/*
* jQuery NatEdit: base engine
*
* Copyright (c) 2015-2016 Michael Daum http://michaeldaumconsulting.com
* Copyright (c) 2015-2017 Michael Daum http://michaeldaumconsulting.com
*
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
*/
'use strict';
"use strict";

/* export */
var BaseEngine;

(function($) {

/*****************************************************************************
* constructor
*/
window.BaseEngine = function BaseEngine() {
BaseEngine = function() {
var self = this;

if (typeof(self.opts) === 'undefined') {
Expand Down Expand Up @@ -81,9 +84,7 @@ BaseEngine.prototype.setSize = function(width, height) {
/*************************************************************************
* called during save process
*/
BaseEngine.prototype.beforeSubmit = function(action) {
var self = this;

BaseEngine.prototype.beforeSubmit = function() {
return $.Deferred().resolve().promise();
};

Expand All @@ -104,15 +105,15 @@ BaseEngine.prototype.log = function() {
var self = this;

if (console && self.opts.debug) {
console.log.apply(console, arguments);
console && console.log.apply(console, arguments); // eslint-disable-line no-console
}
};

/*************************************************************************
* insert stuff at the given cursor position
*/
BaseEngine.prototype.insert = function(newText) {
var self = this;
BaseEngine.prototype.insert = function(/* text */) {
/*var self = this;*/

throw("not implemented: insert()");
};
Expand All @@ -121,7 +122,7 @@ BaseEngine.prototype.insert = function(newText) {
* remove the selected substring
*/
BaseEngine.prototype.remove = function() {
var self = this;
/*var self = this;*/

throw("not implemented: remove()");
};
Expand All @@ -130,7 +131,7 @@ BaseEngine.prototype.remove = function() {
* returns the current selection
*/
BaseEngine.prototype.getSelection = function() {
var self = this;
/*var self = this;*/

throw("not implemented: getSelection()");
};
Expand All @@ -139,16 +140,16 @@ BaseEngine.prototype.getSelection = function() {
* returns the currently selected lines
*/
BaseEngine.prototype.getSelectionLines = function() {
var self = this;
/*var self = this;*/

throw("not implemented: getSelectionLines()");
};

/*************************************************************************
* set the selection
*/
BaseEngine.prototype.setSelectionRange = function(start, end) {
var self = this;
BaseEngine.prototype.setSelectionRange = function(/*start, end*/) {
/*var self = this;*/

throw("not implemented: setSelectionRange()");
};
Expand All @@ -157,8 +158,8 @@ BaseEngine.prototype.setSelectionRange = function(start, end) {
* set the caret position to a specific position. thats done by setting
* the selection range to a single char at the given position
*/
BaseEngine.prototype.setCaretPosition = function(caretPos) {
var self = this;
BaseEngine.prototype.setCaretPosition = function(/*caretPos*/) {
/*var self = this;*/

throw("not implemented: setCaretPosition()");
};
Expand All @@ -167,7 +168,7 @@ BaseEngine.prototype.setCaretPosition = function(caretPos) {
* get the caret position
*/
BaseEngine.prototype.getCaretPosition = function() {
var self = this;
/*var self = this;*/

throw("not implemented: getCaretPosition()");
};
Expand All @@ -176,7 +177,7 @@ BaseEngine.prototype.getCaretPosition = function() {
* undo recent change
*/
BaseEngine.prototype.undo = function() {
var self = this;
/*var self = this;*/

throw("not implemented: undo()");
};
Expand All @@ -185,7 +186,7 @@ BaseEngine.prototype.undo = function() {
* redo recent change
*/
BaseEngine.prototype.redo = function() {
var self = this;
/*var self = this;*/

throw("not implemented: redo()");
};
Expand All @@ -204,17 +205,17 @@ BaseEngine.prototype.handleToolbarAction = function(ui) {
* if there is no selection, select the entire current line
* if there is a selection, select the entire line for each line selected
*/
BaseEngine.prototype.insertLineTag = function(markup) {
var self = this;
BaseEngine.prototype.insertLineTag = function(/*markup*/) {
/*var self = this;*/

throw("not implemented: insertLineTag()");
};

/*************************************************************************
* insert a topic markup tag
*/
BaseEngine.prototype.insertTag = function(markup) {
var self = this;
BaseEngine.prototype.insertTag = function(/*markup*/) {
/*var self = this;*/

throw("not implemented: insertTag()");
};
Expand All @@ -226,11 +227,10 @@ BaseEngine.prototype.insertTag = function(markup) {
* heads: integer, // number of header rows
* rows: integer, // number of rows
* cols: integer, // number of columns
* editable: boolean, // add %EDITTABLE markup
* }
*/
BaseEngine.prototype.insertTable = function(opts) {
var self = this, output = [], editTableLine, i, j, line;
var self = this, table;

if (typeof(opts.heads) === 'undefined') {
opts.heads = 0;
Expand All @@ -242,40 +242,109 @@ BaseEngine.prototype.insertTable = function(opts) {
opts.cols = 0;
}

if (opts.editable) {
editTableLine = '%EDITTABLE{format="';
opts.init = self.getTableSelection();
table = self.generateTMLTable(opts);

for (i = 0; i < opts.cols; i++) {
editTableLine += '| text,20';
}
self.remove();
self.insert(table);
};

/*****************************************************************************
* parse the current selection into a two-dimensional array
* to be used initializing a table. rows are separated by \n, columns by whitespace
*/
BaseEngine.prototype.getTableSelection = function() {
var self = this,
selection = self.getSelection().replace(/^\s+|\s+$/g, ""),
result = [],
rows = selection.split(/\n/),
i;

editTableLine += '|"}%';
output.push(editTableLine);
for (i = 0; i < rows.length; i++) {
result.push(rows[i].split(/\s+/));
}

return result;
};

/*****************************************************************************
* generate a tml table
* opts:
* {
* heads: integer, // number of header rows
* rows: integer, // number of rows
* cols: integer, // number of columns
* init: two-dim array of initial content
* }
*/
BaseEngine.prototype.generateTMLTable = function(opts) {
var result = "", i, j, cell;

for (i = 0; i < opts.heads; i++) {
line = '|';
result += '|';
for (j = 0; j < opts.cols; j++) {
line += ' *head* |';
result += ' *head* |';
}
output.push(line);
result += "\n";
}
for (i = 0; i < opts.rows; i++) {
line = '|';
result += '|';
for (j = 0; j < opts.cols; j++) {
line += ' data |';
if (typeof(opts.init) !== 'undefined' && typeof(opts.init[i]) !== 'undefined') {
cell = opts.init[i][j];
}
cell = cell || 'data';
result += ' '+cell+' |';
}
output.push(line);
result += "\n";
}
self.remove();
self.insertTag(['', output.join("\n")+"\n", '']);

return result;
};

/*****************************************************************************
* generate an html table, see generateTMLTable
*/
BaseEngine.prototype.generateHTMLTable = function(opts) {
var result = "", i, j, cell;

result += "<table>";

if (opts.heads) {
result += "<thead>";
for (i = 0; i < opts.heads; i++) {
result += "<tr>";
for (j = 0; j < opts.cols; j++) {
result += "<th>head</th>";
}
result += "</tr>";
}
result += "</thead>";
}

result += "<tbody>";
for (i = 0; i < opts.rows; i++) {
result += "<tr>";
for (j = 0; j < opts.cols; j++) {
if (typeof(opts.init) !== 'undefined' && typeof(opts.init[i]) !== 'undefined') {
cell = opts.init[i][j];
}
cell = cell || 'data';
result += '<td>'+cell+'</td>';
}
result += "</tr>";
}

result += "</table>";

return result;
};

/*****************************************************************************
* search & replace a term in the textarea
*/
BaseEngine.prototype.searchReplace = function(term, text, ignoreCase) {
var self = this;
BaseEngine.prototype.searchReplace = function(/*term, text, ignoreCase*/) {
/*var self = this;*/

throw("not implemented: searchReplace()");
};
Expand Down
21 changes: 12 additions & 9 deletions NatEditPlugin/pub/System/NatEditPlugin/engine/codemirror/engine.uncompressed.js
View file
Expand Up @@ -181,15 +181,6 @@ CodemirrorEngine.prototype.on = function(eventName, func) {
return self.cm;
};

/*************************************************************************
* insert stuff at the given cursor position
*/
CodemirrorEngine.prototype.insert = function(newText) {
/*var self = this;*/

throw("not implemented: insert()",newText);
};

/*************************************************************************
* replace specific elements with widgets to display them
*/
Expand Down Expand Up @@ -307,6 +298,18 @@ CodemirrorEngine.prototype.redo = function() {
return self.cm.redo();
};

/*************************************************************************
* insert stuff at the given cursor position
*/
CodemirrorEngine.prototype.insert = function(text) {
var self = this,
doc = self.cm.getDoc(),
start = doc.getCursor();

doc.replaceRange(text, start);
};


/*************************************************************************
* used for line oriented tags - like bulleted lists
* if you have a multiline selection, the tagOpen/tagClose is added to each line
Expand Down
1 change: 0 additions & 1 deletion NatEditPlugin/pub/System/NatEditPlugin/engine/prosemirror/engine.uncompressed.js
View file
Expand Up @@ -211,7 +211,6 @@ ProsemirrorEngine.prototype.insertTag = function(markup) {
* heads: integer, // number of header rows
* rows: integer, // number of rows
* cols: integer, // number of columns
* editable: boolean, // add %EDITTABLE markup
* }
*/
ProsemirrorEngine.prototype.insertTable = function(opts) {
Expand Down
6 changes: 6 additions & 0 deletions NatEditPlugin/pub/System/NatEditPlugin/engine/raw/Makefile
View file
Expand Up @@ -2,7 +2,13 @@ FOSWIKI_ROOT?=~/foswiki/core
TARGET= engine.js
SOURCE = textareastate.uncompressed.js undomanager.uncompressed.js rawengine.uncompressed.js


-include $(FOSWIKI_ROOT)/pub/System/JQueryPlugin/Makefile.include

engine.uncompressed.js: $(SOURCE)
@echo creating $@; echo "/* WARNING: this file is auto-created from $^ */" > $@; $(CAT) $^ >> $@; \

jslint_src: $(SOURCE:.uncompressed.js=.jslint)
@echo -n ""

jslint: jslint_src

0 comments on commit 35b3c2e

Please sign in to comment.