mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Tinymce table plugin

Browse Source
This commit is contained in:
Cameron
2012-11-24 16:28:08 -08:00
parent 0c44cdd49b
commit baccd0861b
4 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/tinymce/plugins/table/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

9
e107_plugins/tinymce/plugins/table/editor_plugin_src.js
View File

@@ -566,6 +566,10 @@
}; };
function pasteRows(rows, before) { function pasteRows(rows, before) {
// If we don't have any rows in the clipboard, return immediately
if(!rows)
return;
var selectedRows = getSelectedRows(), var selectedRows = getSelectedRows(),
targetRow = selectedRows[before ? 0 : selectedRows.length - 1], targetRow = selectedRows[before ? 0 : selectedRows.length - 1],
targetCellCount = targetRow.cells.length; targetCellCount = targetRow.cells.length;
@@ -1294,7 +1298,10 @@
/** /**
* Fixes bug in Gecko where shift-enter in table cell does not place caret on new line * Fixes bug in Gecko where shift-enter in table cell does not place caret on new line
*
* Removed: Since the new enter logic seems to fix this one.
*/ */
/*
if (tinymce.isGecko) { if (tinymce.isGecko) {
ed.onKeyDown.add(function(ed, e) { ed.onKeyDown.add(function(ed, e) {
if (e.keyCode === tinymce.VK.ENTER && e.shiftKey) { if (e.keyCode === tinymce.VK.ENTER && e.shiftKey) {
@@ -1307,7 +1314,7 @@
} }
}); });
} }
*/
fixTableCaretPos(); fixTableCaretPos();
ed.startContent = ed.getContent({format : 'raw'}); ed.startContent = ed.getContent({format : 'raw'});

17
e107_plugins/tinymce/plugins/table/js/row.js
View File

@@ -25,6 +25,7 @@ function init() {
var dir = dom.getAttrib(trElm, 'dir'); var dir = dom.getAttrib(trElm, 'dir');
selectByValue(formObj, 'rowtype', rowtype); selectByValue(formObj, 'rowtype', rowtype);
setActionforRowType(formObj, rowtype);
// Any cells selected // Any cells selected
if (dom.select('td.mceSelected,th.mceSelected', trElm).length == 0) { if (dom.select('td.mceSelected,th.mceSelected', trElm).length == 0) {
@@ -234,4 +235,20 @@ function changedColor() {
formObj.style.value = dom.serializeStyle(st); formObj.style.value = dom.serializeStyle(st);
} }
function changedRowType() {
var formObj = document.forms[0];
var rowtype = getSelectValue(formObj, 'rowtype');
setActionforRowType(formObj, rowtype);
}
function setActionforRowType(formObj, rowtype) {
if (rowtype === "tbody") {
formObj.action.disabled = false;
} else {
selectByValue(formObj, 'action', "row");
formObj.action.disabled = true;
}
}
tinyMCEPopup.onInit.add(init); tinyMCEPopup.onInit.add(init);

2
e107_plugins/tinymce/plugins/table/row.htm
View File

@@ -28,7 +28,7 @@
<tr> <tr>
<td><label for="rowtype">{#table_dlg.rowtype}</label></td> <td><label for="rowtype">{#table_dlg.rowtype}</label></td>
<td class="col2"> <td class="col2">
<select id="rowtype" name="rowtype" class="mceFocus"> <select id="rowtype" name="rowtype" class="mceFocus" onChange="changedRowType();">
<option value="thead">{#table_dlg.thead}</option> <option value="thead">{#table_dlg.thead}</option>
<option value="tbody">{#table_dlg.tbody}</option> <option value="tbody">{#table_dlg.tbody}</option>
<option value="tfoot">{#table_dlg.tfoot}</option> <option value="tfoot">{#table_dlg.tfoot}</option>