upgrade xooki version: better handling of eol
git-svn-id: https://svn.apache.org/repos/asf/incubator/ivy/core/trunk/doc/xooki@544444 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/xooki.js b/xooki.js
index 41cd8cd..12f3aa5 100644
--- a/xooki.js
+++ b/xooki.js
@@ -648,7 +648,7 @@
// xooki.c.shortcuts.<any shortcut>.url = base url of the shortcut.
// ex: xooki.c.shortcuts.svn.url = https://xooki.svn.sourceforge.net/svnroot/xooki/trunk/
return input.replace(new RegExp("\\[\\[([^:]+):([^\\]]+)\\]\\]", "g"), function (str, prefix, code, offset, s) {
- if (typeof xooki.c.shortcuts[prefix] == "undefined") {
+ if (typeof xooki.c.shortcuts == "undefined" || typeof xooki.c.shortcuts[prefix] == "undefined") {
return str;
}
var index = code.indexOf(' ');
diff --git a/xookiEdit.js b/xookiEdit.js
index b6daf63..52306bd 100644
--- a/xookiEdit.js
+++ b/xookiEdit.js
@@ -68,6 +68,12 @@
return(true);
}
+// fix EOL characters in text to use native characters
+xooki.io.fixEOL = function(text) {
+ var nativeEOL = navigator.platform.indexOf('Win') != -1 ? '\r\n' : '\n';
+ return text.replace(/\r?\n/g, nativeEOL);
+}
+
if (typeof xooki.string == "undefined") {
xooki.string = {};
@@ -257,7 +263,7 @@
xooki.input.source() +
original.substr(posClosingArea);
- save = xooki.io.saveFile(localPath,revised);
+ save = xooki.io.saveFile(localPath,xooki.io.fixEOL(revised));
} catch (e) {
xooki.error(e);
}
@@ -340,7 +346,7 @@
var save;
try {
// Save new file
- save = xooki.io.saveFile(localPath,revised);
+ save = xooki.io.saveFile(localPath,xooki.io.fixEOL(revised));
} catch (e) {
xooki.error(e);
}
@@ -360,7 +366,7 @@
var save;
var tocPath = xooki.io.getLocalPath(cu("toc"));
try {
- save = xooki.io.saveFile(tocPath, revised);
+ save = xooki.io.saveFile(tocPath, xooki.io.fixEOL(revised));
} catch (e) {
xooki.error(e);
}
