summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/locales/en.json1
-rw-r--r--src/node/handler/ExportHandler.js21
-rw-r--r--src/node/hooks/express/importexport.js2
-rw-r--r--src/node/utils/ExportDokuWiki.js350
-rw-r--r--src/static/css/pad.css3
-rw-r--r--src/static/js/pad_impexp.js1
-rw-r--r--src/templates/pad.html1
-rw-r--r--src/templates/timeslider.html1
8 files changed, 1 insertions, 379 deletions
diff --git a/src/locales/en.json b/src/locales/en.json
index 9a25b18c..9a5fe45f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -49,7 +49,6 @@
"pad.importExport.exportword": "Microsoft Word",
"pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (Open Document Format)",
- "pad.importExport.exportdokuwiki": "DokuWiki",
"pad.importExport.abiword.innerHTML": "You only can import from plain text or HTML formats. For more advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
"pad.modals.connected": "Connected.",
diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js
index 5bedcce2..bc03f532 100644
--- a/src/node/handler/ExportHandler.js
+++ b/src/node/handler/ExportHandler.js
@@ -21,7 +21,6 @@
var ERR = require("async-stacktrace");
var exporthtml = require("../utils/ExportHtml");
var exporttxt = require("../utils/ExportTxt");
-var exportdokuwiki = require("../utils/ExportDokuWiki");
var padManager = require("../db/PadManager");
var async = require("async");
var fs = require("fs");
@@ -129,26 +128,6 @@ exports.doExport = function(req, res, padId, type)
if(err && err != "stop") ERR(err);
})
}
- else if(type == 'dokuwiki')
- {
- var randNum;
- var srcFile, destFile;
-
- async.series([
- //render the dokuwiki document
- function(callback)
- {
- exportdokuwiki.getPadDokuWikiDocument(padId, req.params.rev, function(err, dokuwiki)
- {
- res.send(dokuwiki);
- callback("stop");
- });
- },
- ], function(err)
- {
- if(err && err != "stop") throw err;
- });
- }
else
{
var html;
diff --git a/src/node/hooks/express/importexport.js b/src/node/hooks/express/importexport.js
index f5a3e5a1..378e8865 100644
--- a/src/node/hooks/express/importexport.js
+++ b/src/node/hooks/express/importexport.js
@@ -5,7 +5,7 @@ var importHandler = require('../../handler/ImportHandler');
exports.expressCreateServer = function (hook_name, args, cb) {
args.app.get('/p/:pad/:rev?/export/:type', function(req, res, next) {
- var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"];
+ var types = ["pdf", "doc", "txt", "html", "odt"];
//send a 404 if we don't support this filetype
if (types.indexOf(req.params.type) == -1) {
next();
diff --git a/src/node/utils/ExportDokuWiki.js b/src/node/utils/ExportDokuWiki.js
deleted file mode 100644
index f5d2d177..00000000
--- a/src/node/utils/ExportDokuWiki.js
+++ /dev/null
@@ -1,350 +0,0 @@
-/**
- * Copyright 2011 Adrian Lang
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var async = require("async");
-
-var Changeset = require("ep_etherpad-lite/static/js/Changeset");
-var padManager = require("../db/PadManager");
-
-function getPadDokuWiki(pad, revNum, callback)
-{
- var atext = pad.atext;
- var dokuwiki;
- async.waterfall([
- // fetch revision atext
-
-
- function (callback)
- {
- if (revNum != undefined)
- {
- pad.getInternalRevisionAText(revNum, function (err, revisionAtext)
- {
- atext = revisionAtext;
- callback(err);
- });
- }
- else
- {
- callback(null);
- }
- },
-
- // convert atext to dokuwiki text
-
- function (callback)
- {
- dokuwiki = getDokuWikiFromAtext(pad, atext);
- callback(null);
- }],
- // run final callback
-
-
- function (err)
- {
- callback(err, dokuwiki);
- });
-}
-
-function getDokuWikiFromAtext(pad, atext)
-{
- var apool = pad.apool();
- var textLines = atext.text.slice(0, -1).split('\n');
- var attribLines = Changeset.splitAttributionLines(atext.attribs, atext.text);
-
- var tags = ['======', '=====', '**', '//', '__', 'del>'];
- var props = ['heading1', 'heading2', 'bold', 'italic', 'underline', 'strikethrough'];
- var anumMap = {};
-
- props.forEach(function (propName, i)
- {
- var propTrueNum = apool.putAttrib([propName, true], true);
- if (propTrueNum >= 0)
- {
- anumMap[propTrueNum] = i;
- }
- });
-
- function getLineDokuWiki(text, attribs)
- {
- var propVals = [false, false, false];
- var ENTER = 1;
- var STAY = 2;
- var LEAVE = 0;
-
- // Use order of tags (b/i/u) as order of nesting, for simplicity
- // and decent nesting. For example,
- // <b>Just bold<b> <b><i>Bold and italics</i></b> <i>Just italics</i>
- // becomes
- // <b>Just bold <i>Bold and italics</i></b> <i>Just italics</i>
- var taker = Changeset.stringIterator(text);
- var assem = Changeset.stringAssembler();
-
- function emitOpenTag(i)
- {
- if (tags[i].indexOf('>') !== -1) {
- assem.append('<');
- }
- assem.append(tags[i]);
- }
-
- function emitCloseTag(i)
- {
- if (tags[i].indexOf('>') !== -1) {
- assem.append('</');
- }
- assem.append(tags[i]);
- }
-
- var urls = _findURLs(text);
-
- var idx = 0;
-
- function processNextChars(numChars)
- {
- if (numChars <= 0)
- {
- return;
- }
-
- var iter = Changeset.opIterator(Changeset.subattribution(attribs, idx, idx + numChars));
- idx += numChars;
-
- while (iter.hasNext())
- {
- var o = iter.next();
- var propChanged = false;
- Changeset.eachAttribNumber(o.attribs, function (a)
- {
- if (a in anumMap)
- {
- var i = anumMap[a]; // i = 0 => bold, etc.
- if (!propVals[i])
- {
- propVals[i] = ENTER;
- propChanged = true;
- }
- else
- {
- propVals[i] = STAY;
- }
- }
- });
- for (var i = 0; i < propVals.length; i++)
- {
- if (propVals[i] === true)
- {
- propVals[i] = LEAVE;
- propChanged = true;
- }
- else if (propVals[i] === STAY)
- {
- propVals[i] = true; // set it back
- }
- }
- // now each member of propVal is in {false,LEAVE,ENTER,true}
- // according to what happens at start of span
- if (propChanged)
- {
- // leaving bold (e.g.) also leaves italics, etc.
- var left = false;
- for (var i = 0; i < propVals.length; i++)
- {
- var v = propVals[i];
- if (!left)
- {
- if (v === LEAVE)
- {
- left = true;
- }
- }
- else
- {
- if (v === true)
- {
- propVals[i] = STAY; // tag will be closed and re-opened
- }
- }
- }
-
- for (var i = propVals.length - 1; i >= 0; i--)
- {
- if (propVals[i] === LEAVE)
- {
- emitCloseTag(i);
- propVals[i] = false;
- }
- else if (propVals[i] === STAY)
- {
- emitCloseTag(i);
- }
- }
- for (var i = 0; i < propVals.length; i++)
- {
- if (propVals[i] === ENTER || propVals[i] === STAY)
- {
- emitOpenTag(i);
- propVals[i] = true;
- }
- }
- // propVals is now all {true,false} again
- } // end if (propChanged)
- var chars = o.chars;
- if (o.lines)
- {
- chars--; // exclude newline at end of line, if present
- }
- var s = taker.take(chars);
-
- assem.append(_escapeDokuWiki(s));
- } // end iteration over spans in line
- for (var i = propVals.length - 1; i >= 0; i--)
- {
- if (propVals[i])
- {
- emitCloseTag(i);
- propVals[i] = false;
- }
- }
- } // end processNextChars
- if (urls)
- {
- urls.forEach(function (urlData)
- {
- var startIndex = urlData[0];
- var url = urlData[1];
- var urlLength = url.length;
- processNextChars(startIndex - idx);
- assem.append('[[');
-
- // Do not use processNextChars since a link does not contain syntax and
- // needs no escaping
- var iter = Changeset.opIterator(Changeset.subattribution(attribs, idx, idx + urlLength));
- idx += urlLength;
- assem.append(taker.take(iter.next().chars));
-
- assem.append(']]');
- });
- }
- processNextChars(text.length - idx);
-
- return assem.toString() + "\n";
- } // end getLineDokuWiki
- var pieces = [];
-
- for (var i = 0; i < textLines.length; i++)
- {
- var line = _analyzeLine(textLines[i], attribLines[i], apool);
- var lineContent = getLineDokuWiki(line.text, line.aline);
-
- if (line.listLevel && lineContent)
- {
- if (line.listTypeName == "number")
- {
- pieces.push(new Array(line.listLevel + 1).join(' ') + ' - ');
- } else {
- pieces.push(new Array(line.listLevel + 1).join(' ') + '* ');
- }
- }
- pieces.push(lineContent);
- }
-
- return pieces.join('');
-}
-
-function _analyzeLine(text, aline, apool)
-{
- var line = {};
-
- // identify list
- var lineMarker = 0;
- line.listLevel = 0;
- if (aline)
- {
- var opIter = Changeset.opIterator(aline);
- if (opIter.hasNext())
- {
- var listType = Changeset.opAttributeValue(opIter.next(), 'list', apool);
- if (listType)
- {
- lineMarker = 1;
- listType = /([a-z]+)([12345678])/.exec(listType);
- if (listType)
- {
- line.listTypeName = listType[1];
- line.listLevel = Number(listType[2]);
- }
- }
- }
- }
- if (lineMarker)
- {
- line.text = text.substring(1);
- line.aline = Changeset.subattribution(aline, 1);
- }
- else
- {
- line.text = text;
- line.aline = aline;
- }
-
- return line;
-}
-
-exports.getPadDokuWikiDocument = function (padId, revNum, callback)
-{
- padManager.getPad(padId, function (err, pad)
- {
- if (err)
- {
- callback(err);
- return;
- }
-
- getPadDokuWiki(pad, revNum, callback);
- });
-};
-
-function _escapeDokuWiki(s)
-{
- s = s.replace(/(\/\/|\*\*|__)/g, '%%$1%%');
- return s;
-}
-
-// copied from ACE
-var _REGEX_WORDCHAR = /[\u0030-\u0039\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u1FFF\u3040-\u9FFF\uF900-\uFDFF\uFE70-\uFEFE\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFDC]/;
-var _REGEX_SPACE = /\s/;
-var _REGEX_URLCHAR = new RegExp('(' + /[-:@a-zA-Z0-9_.,~%+\/\\?=&#;()$]/.source + '|' + _REGEX_WORDCHAR.source + ')');
-var _REGEX_URL = new RegExp(/(?:(?:https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt):\/\/|mailto:)/.source + _REGEX_URLCHAR.source + '*(?![:.,;])' + _REGEX_URLCHAR.source, 'g');
-
-// returns null if no URLs, or [[startIndex1, url1], [startIndex2, url2], ...]
-
-
-function _findURLs(text)
-{
- _REGEX_URL.lastIndex = 0;
- var urls = null;
- var execResult;
- while ((execResult = _REGEX_URL.exec(text)))
- {
- urls = (urls || []);
- var startIndex = execResult.index;
- var url = execResult[0];
- urls.push([startIndex, url]);
- }
-
- return urls;
-}
diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index ba066f18..c1035e8d 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -692,9 +692,6 @@ table#otheruserstable {
#exportopena:before {
content: "\e805";
}
-#exportdokuwikia:before {
- content: "\e805";
-}
/* hidden element */
#importstatusball,
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 1454bb31..20cae2a0 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -199,7 +199,6 @@ var padimpexp = (function()
// build the export links
$("#exporthtmla").attr("href", pad_root_path + "/export/html");
$("#exportplaina").attr("href", pad_root_path + "/export/txt");
- $("#exportdokuwikia").attr("href", pad_root_path + "/export/dokuwiki");
// activate action to import in the form
$("#importform").attr('action', pad_root_url + "/import");
diff --git a/src/templates/pad.html b/src/templates/pad.html
index c20530ef..2dd66aa9 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -208,7 +208,6 @@
<a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword" data-l10n-id="pad.importExport.exportword"></div></a>
<a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf" data-l10n-id="pad.importExport.exportpdf"></div></a>
<a id="exportopena" target="_blank" class="exportlink"><div class="exporttype" id="exportopen" data-l10n-id="pad.importExport.exportopen"></div></a>
- <a id="exportdokuwikia" target="_blank" class="exportlink"><div class="exporttype" id="exportdokuwiki" data-l10n-id="pad.importExport.exportdokuwiki"></div></a>
<% e.end_block(); %>
</div>
</div>
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 1fab0279..a619c702 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -186,7 +186,6 @@
<a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword" data-l10n-id="pad.importExport.exportword"></div></a>
<a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf" data-l10n-id="pad.importExport.exportpdf"></div></a>
<a id="exportopena" target="_blank" class="exportlink"><div class="exporttype" id="exportopen" data-l10n-id="pad.importExport.exportopen"></div></a>
- <a id="exportdokuwikia" target="_blank" class="exportlink"><div class="exporttype" id="exportdokuwiki" data-l10n-id="pad.importExport.exportdokuwiki"></div></a>
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 11:28:02 +0000