mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-04-05 21:01:35 +08:00
#19385: Updating markdown editor to latest pagedown version.
Work Item: 19385 --HG-- branch : 1.x
This commit is contained in:
Nicholas Mayne
parent
0001302e42
commit
9701bc4760
@ -21,6 +21,10 @@
|
||||
</UpgradeBackupLocation>
|
||||
<TargetFrameworkProfile />
|
||||
<UseIISExpress>false</UseIISExpress>
|
||||
<IISExpressSSLPort />
|
||||
<IISExpressAnonymousAuthentication />
|
||||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@ -68,12 +72,15 @@
|
||||
<Content Include="Scripts\jquery.textarearesizer.min.js">
|
||||
<DependentUpon>jquery.textarearesizer.js</DependentUpon>
|
||||
</Content>
|
||||
<Content Include="Scripts\Markdown.Converter.js" />
|
||||
<Content Include="Scripts\Markdown.Converter.min.js">
|
||||
<DependentUpon>Markdown.Converter.js</DependentUpon>
|
||||
</Content>
|
||||
<Content Include="Scripts\Markdown.Editor.js" />
|
||||
<Content Include="Scripts\Markdown.Editor.min.js">
|
||||
<DependentUpon>Markdown.Editor.js</DependentUpon>
|
||||
</Content>
|
||||
<Content Include="Scripts\Markdown.Sanitizer.js" />
|
||||
<Content Include="Scripts\Markdown.Sanitizer.min.js">
|
||||
<DependentUpon>Markdown.Sanitizer.js</DependentUpon>
|
||||
</Content>
|
||||
@ -85,9 +92,6 @@
|
||||
<Content Include="Styles\admin-markdown.css" />
|
||||
<Content Include="Content\Admin\Images\wmd-buttons.png" />
|
||||
<Content Include="Module.txt" />
|
||||
<Content Include="Scripts\Markdown.Converter.js" />
|
||||
<Content Include="Scripts\Markdown.Editor.js" />
|
||||
<Content Include="Scripts\Markdown.Sanitizer.js" />
|
||||
<Content Include="Scripts\Web.config">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
@ -119,6 +123,11 @@
|
||||
<DependentUpon>jquery.textarearesizer.js</DependentUpon>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Scripts\orchard-markdown.min.js.map">
|
||||
<DependentUpon>orchard-markdown.js</DependentUpon>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Scripts\Markdown.Converter.min.js.map">
|
||||
<DependentUpon>Markdown.Converter.js</DependentUpon>
|
||||
@ -134,11 +143,6 @@
|
||||
<DependentUpon>Markdown.Sanitizer.js</DependentUpon>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Scripts\orchard-markdown.min.js.map">
|
||||
<DependentUpon>orchard-markdown.js</DependentUpon>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||
|
||||
@ -67,7 +67,11 @@ else
|
||||
if (original === identity)
|
||||
this[hookname] = func;
|
||||
else
|
||||
this[hookname] = function (x) { return func(original(x)); }
|
||||
this[hookname] = function (text) {
|
||||
var args = Array.prototype.slice.call(arguments, 0);
|
||||
args[0] = original.apply(null, args);
|
||||
return func.apply(null, args);
|
||||
};
|
||||
},
|
||||
set: function (hookname, func) {
|
||||
if (!this[hookname])
|
||||
@ -103,9 +107,28 @@ else
|
||||
|
||||
Markdown.Converter = function () {
|
||||
var pluginHooks = this.hooks = new HookCollection();
|
||||
pluginHooks.addNoop("plainLinkText"); // given a URL that was encountered by itself (without markup), should return the link text that's to be given to this link
|
||||
pluginHooks.addNoop("preConversion"); // called with the orignal text as given to makeHtml. The result of this plugin hook is the actual markdown source that will be cooked
|
||||
pluginHooks.addNoop("postConversion"); // called with the final cooked HTML code. The result of this plugin hook is the actual output of makeHtml
|
||||
|
||||
// given a URL that was encountered by itself (without markup), should return the link text that's to be given to this link
|
||||
pluginHooks.addNoop("plainLinkText");
|
||||
|
||||
// called with the orignal text as given to makeHtml. The result of this plugin hook is the actual markdown source that will be cooked
|
||||
pluginHooks.addNoop("preConversion");
|
||||
|
||||
// called with the text once all normalizations have been completed (tabs to spaces, line endings, etc.), but before any conversions have
|
||||
pluginHooks.addNoop("postNormalization");
|
||||
|
||||
// Called with the text before / after creating block elements like code blocks and lists. Note that this is called recursively
|
||||
// with inner content, e.g. it's called with the full text, and then only with the content of a blockquote. The inner
|
||||
// call will receive outdented text.
|
||||
pluginHooks.addNoop("preBlockGamut");
|
||||
pluginHooks.addNoop("postBlockGamut");
|
||||
|
||||
// called with the text of a single block element before / after the span-level conversions (bold, code spans, etc.) have been made
|
||||
pluginHooks.addNoop("preSpanGamut");
|
||||
pluginHooks.addNoop("postSpanGamut");
|
||||
|
||||
// called with the final cooked HTML code. The result of this plugin hook is the actual output of makeHtml
|
||||
pluginHooks.addNoop("postConversion");
|
||||
|
||||
//
|
||||
// Private state of the converter instance:
|
||||
@ -168,6 +191,8 @@ else
|
||||
// match consecutive blank lines with /\n+/ instead of something
|
||||
// contorted like /[ \t]*\n+/ .
|
||||
text = text.replace(/^[ \t]+$/mg, "");
|
||||
|
||||
text = pluginHooks.postNormalization(text);
|
||||
|
||||
// Turn block-level HTML blocks into hash entries
|
||||
text = _HashHTMLBlocks(text);
|
||||
@ -378,12 +403,17 @@ else
|
||||
|
||||
return blockText;
|
||||
}
|
||||
|
||||
var blockGamutHookCallback = function (t) { return _RunBlockGamut(t); }
|
||||
|
||||
function _RunBlockGamut(text, doNotUnhash) {
|
||||
//
|
||||
// These are all the transformations that form block-level
|
||||
// tags like paragraphs, headers, and list items.
|
||||
//
|
||||
|
||||
text = pluginHooks.preBlockGamut(text, blockGamutHookCallback);
|
||||
|
||||
text = _DoHeaders(text);
|
||||
|
||||
// Do Horizontal Rules:
|
||||
@ -395,6 +425,8 @@ else
|
||||
text = _DoLists(text);
|
||||
text = _DoCodeBlocks(text);
|
||||
text = _DoBlockQuotes(text);
|
||||
|
||||
text = pluginHooks.postBlockGamut(text, blockGamutHookCallback);
|
||||
|
||||
// We already ran _HashHTMLBlocks() before, in Markdown(), but that
|
||||
// was to escape raw HTML in the original Markdown source. This time,
|
||||
@ -412,6 +444,8 @@ else
|
||||
// tags like paragraphs, headers, and list items.
|
||||
//
|
||||
|
||||
text = pluginHooks.preSpanGamut(text);
|
||||
|
||||
text = _DoCodeSpans(text);
|
||||
text = _EscapeSpecialCharsWithinTagAttributes(text);
|
||||
text = _EncodeBackslashEscapes(text);
|
||||
@ -433,6 +467,8 @@ else
|
||||
|
||||
// Do hard breaks:
|
||||
text = text.replace(/ +\n/g, " <br>\n");
|
||||
|
||||
text = pluginHooks.postSpanGamut(text);
|
||||
|
||||
return text;
|
||||
}
|
||||
@ -515,7 +551,7 @@ else
|
||||
(?:
|
||||
\([^)]*\) // allow one level of (correctly nested) parens (think MSDN)
|
||||
|
|
||||
[^()]
|
||||
[^()\s]
|
||||
)*?
|
||||
)>?
|
||||
[ \t]*
|
||||
@ -530,7 +566,7 @@ else
|
||||
/g, writeAnchorTag);
|
||||
*/
|
||||
|
||||
text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?((?:\([^)]*\)|[^()])*?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g, writeAnchorTag);
|
||||
text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?((?:\([^)]*\)|[^()\s])*?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g, writeAnchorTag);
|
||||
|
||||
//
|
||||
// Last, handle reference-style shortcuts: [link text]
|
||||
@ -588,7 +624,7 @@ else
|
||||
var result = "<a href=\"" + url + "\"";
|
||||
|
||||
if (title != "") {
|
||||
title = title.replace(/"/g, """);
|
||||
title = attributeEncode(title);
|
||||
title = escapeCharacters(title, "*_");
|
||||
result += " title=\"" + title + "\"";
|
||||
}
|
||||
@ -656,6 +692,12 @@ else
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
function attributeEncode(text) {
|
||||
// unconditionally replace angle brackets here -- what ends up in an attribute (e.g. alt or title)
|
||||
// never makes sense to have verbatim HTML in it (and the sanitizer would totally break it)
|
||||
return text.replace(/>/g, ">").replace(/</g, "<").replace(/"/g, """);
|
||||
}
|
||||
|
||||
function writeImageTag(wholeMatch, m1, m2, m3, m4, m5, m6, m7) {
|
||||
var whole_match = m1;
|
||||
@ -683,8 +725,8 @@ else
|
||||
return whole_match;
|
||||
}
|
||||
}
|
||||
|
||||
alt_text = alt_text.replace(/"/g, """);
|
||||
|
||||
alt_text = escapeCharacters(attributeEncode(alt_text), "*_[]()");
|
||||
url = escapeCharacters(url, "*_");
|
||||
var result = "<img src=\"" + url + "\" alt=\"" + alt_text + "\"";
|
||||
|
||||
@ -692,7 +734,7 @@ else
|
||||
// Replicate this bug.
|
||||
|
||||
//if (title != "") {
|
||||
title = title.replace(/"/g, """);
|
||||
title = attributeEncode(title);
|
||||
title = escapeCharacters(title, "*_");
|
||||
result += " title=\"" + title + "\"";
|
||||
//}
|
||||
@ -748,7 +790,7 @@ else
|
||||
return text;
|
||||
}
|
||||
|
||||
function _DoLists(text) {
|
||||
function _DoLists(text, isInsideParagraphlessListItem) {
|
||||
//
|
||||
// Form HTML ordered (numbered) and unordered (bulleted) lists.
|
||||
//
|
||||
@ -788,7 +830,7 @@ else
|
||||
var list = m1;
|
||||
var list_type = (m2.search(/[*+-]/g) > -1) ? "ul" : "ol";
|
||||
|
||||
var result = _ProcessListItems(list, list_type);
|
||||
var result = _ProcessListItems(list, list_type, isInsideParagraphlessListItem);
|
||||
|
||||
// Trim any trailing whitespace, to put the closing `</$list_type>`
|
||||
// up on the preceding line, to get it past the current stupid
|
||||
@ -819,7 +861,7 @@ else
|
||||
|
||||
var _listItemMarkers = { ol: "\\d+[.]", ul: "[*+-]" };
|
||||
|
||||
function _ProcessListItems(list_str, list_type) {
|
||||
function _ProcessListItems(list_str, list_type, isInsideParagraphlessListItem) {
|
||||
//
|
||||
// Process the contents of a single ordered or unordered list, splitting it
|
||||
// into individual list items.
|
||||
@ -895,9 +937,10 @@ else
|
||||
}
|
||||
else {
|
||||
// Recursion for sub-lists:
|
||||
item = _DoLists(_Outdent(item));
|
||||
item = _DoLists(_Outdent(item), /* isInsideParagraphlessListItem= */ true);
|
||||
item = item.replace(/\n$/, ""); // chomp(item)
|
||||
item = _RunSpanGamut(item);
|
||||
if (!isInsideParagraphlessListItem) // only the outer-most item should run this, otherwise it's run multiple times for the inner ones
|
||||
item = _RunSpanGamut(item);
|
||||
}
|
||||
last_item_had_a_double_newline = ends_with_double_newline;
|
||||
return "<li>" + item + "</li>\n";
|
||||
@ -932,7 +975,7 @@ else
|
||||
// attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
|
||||
text += "~0";
|
||||
|
||||
text = text.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
|
||||
text = text.replace(/(?:\n\n|^\n?)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
|
||||
function (wholeMatch, m1, m2) {
|
||||
var codeblock = m1;
|
||||
var nextChar = m2;
|
||||
@ -1004,6 +1047,7 @@ else
|
||||
c = c.replace(/^([ \t]*)/g, ""); // leading whitespace
|
||||
c = c.replace(/[ \t]*$/g, ""); // trailing whitespace
|
||||
c = _EncodeCode(c);
|
||||
c = c.replace(/:\/\//g, "~P"); // to prevent auto-linking. Not necessary in code *blocks*, but in code spans. Will be converted back after the auto-linker runs.
|
||||
return m1 + "<code>" + c + "</code>";
|
||||
}
|
||||
);
|
||||
@ -1162,7 +1206,7 @@ else
|
||||
text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, "&");
|
||||
|
||||
// Encode naked <'s
|
||||
text = text.replace(/<(?![a-z\/?\$!])/gi, "<");
|
||||
text = text.replace(/<(?![a-z\/?!]|~D)/gi, "<");
|
||||
|
||||
return text;
|
||||
}
|
||||
@ -1188,14 +1232,57 @@ else
|
||||
return text;
|
||||
}
|
||||
|
||||
var charInsideUrl = "[-A-Z0-9+&@#/%?=~_|[\\]()!:,.;]",
|
||||
charEndingUrl = "[-A-Z0-9+&@#/%=~_|[\\])]",
|
||||
autoLinkRegex = new RegExp("(=\"|<)?\\b(https?|ftp)(://" + charInsideUrl + "*" + charEndingUrl + ")(?=$|\\W)", "gi"),
|
||||
endCharRegex = new RegExp(charEndingUrl, "i");
|
||||
|
||||
function handleTrailingParens(wholeMatch, lookbehind, protocol, link) {
|
||||
if (lookbehind)
|
||||
return wholeMatch;
|
||||
if (link.charAt(link.length - 1) !== ")")
|
||||
return "<" + protocol + link + ">";
|
||||
var parens = link.match(/[()]/g);
|
||||
var level = 0;
|
||||
for (var i = 0; i < parens.length; i++) {
|
||||
if (parens[i] === "(") {
|
||||
if (level <= 0)
|
||||
level = 1;
|
||||
else
|
||||
level++;
|
||||
}
|
||||
else {
|
||||
level--;
|
||||
}
|
||||
}
|
||||
var tail = "";
|
||||
if (level < 0) {
|
||||
var re = new RegExp("\\){1," + (-level) + "}$");
|
||||
link = link.replace(re, function (trailingParens) {
|
||||
tail = trailingParens;
|
||||
return "";
|
||||
});
|
||||
}
|
||||
if (tail) {
|
||||
var lastChar = link.charAt(link.length - 1);
|
||||
if (!endCharRegex.test(lastChar)) {
|
||||
tail = lastChar + tail;
|
||||
link = link.substr(0, link.length - 1);
|
||||
}
|
||||
}
|
||||
return "<" + protocol + link + ">" + tail;
|
||||
}
|
||||
|
||||
function _DoAutoLinks(text) {
|
||||
|
||||
// note that at this point, all other URL in the text are already hyperlinked as <a href=""></a>
|
||||
// *except* for the <http://www.foo.com> case
|
||||
|
||||
// automatically add < and > around unadorned raw hyperlinks
|
||||
// must be preceded by space/BOF and followed by non-word/EOF character
|
||||
text = text.replace(/(^|\s)(https?|ftp)(:\/\/[-A-Z0-9+&@#\/%?=~_|\[\]\(\)!:,\.;]*[-A-Z0-9+&@#\/%=~_|\[\]])($|\W)/gi, "$1<$2$3>$4");
|
||||
// must be preceded by a non-word character (and not by =" or <) and followed by non-word/EOF character
|
||||
// simulating the lookbehind in a consuming way is okay here, since a URL can neither and with a " nor
|
||||
// with a <, so there is no risk of overlapping matches.
|
||||
text = text.replace(autoLinkRegex, handleTrailingParens);
|
||||
|
||||
// autolink anything like <http://example.com>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// needs Markdown.Converter.js at the moment
|
||||
// needs Markdown.Converter.js at the moment
|
||||
|
||||
(function () {
|
||||
|
||||
@ -17,39 +17,90 @@
|
||||
isOpera: /opera/.test(nav.userAgent.toLowerCase())
|
||||
};
|
||||
|
||||
var defaultsStrings = {
|
||||
bold: "Strong <strong> Ctrl+B",
|
||||
boldexample: "strong text",
|
||||
|
||||
italic: "Emphasis <em> Ctrl+I",
|
||||
italicexample: "emphasized text",
|
||||
|
||||
link: "Hyperlink <a> Ctrl+L",
|
||||
linkdescription: "enter link description here",
|
||||
linkdialog: "<p><b>Insert Hyperlink</b></p><p>http://example.com/ \"optional title\"</p>",
|
||||
|
||||
quote: "Blockquote <blockquote> Ctrl+Q",
|
||||
quoteexample: "Blockquote",
|
||||
|
||||
code: "Code Sample <pre><code> Ctrl+K",
|
||||
codeexample: "enter code here",
|
||||
|
||||
image: "Image <img> Ctrl+G",
|
||||
imagedescription: "enter image description here",
|
||||
imagedialog: "<p><b>Insert Image</b></p><p>http://example.com/images/diagram.jpg \"optional title\"<br><br>Need <a href='http://www.google.com/search?q=free+image+hosting' target='_blank'>free image hosting?</a></p>",
|
||||
|
||||
olist: "Numbered List <ol> Ctrl+O",
|
||||
ulist: "Bulleted List <ul> Ctrl+U",
|
||||
litem: "List item",
|
||||
|
||||
heading: "Heading <h1>/<h2> Ctrl+H",
|
||||
headingexample: "Heading",
|
||||
|
||||
hr: "Horizontal Rule <hr> Ctrl+R",
|
||||
|
||||
undo: "Undo - Ctrl+Z",
|
||||
redo: "Redo - Ctrl+Y",
|
||||
redomac: "Redo - Ctrl+Shift+Z",
|
||||
|
||||
help: "Markdown Editing Help"
|
||||
};
|
||||
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
// YOUR CHANGES GO HERE
|
||||
//
|
||||
// I've tried to localize the things you are likely to change to
|
||||
// I've tried to localize the things you are likely to change to
|
||||
// this area.
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
// The text that appears on the upper part of the dialog box when
|
||||
// entering links.
|
||||
var linkDialogText = "<p><b>Insert Hyperlink</b></p><p>http://example.com/ \"optional title\"</p>";
|
||||
var imageDialogText = "<p><b>Insert Image</b></p><p>http://example.com/images/diagram.jpg \"optional title\"<br><br>Need <a href='http://www.google.com/search?q=free+image+hosting' target='_blank'>free image hosting?</a></p>";
|
||||
|
||||
// The default text that appears in the dialog input box when entering
|
||||
// links.
|
||||
var imageDefaultText = "http://";
|
||||
var linkDefaultText = "http://";
|
||||
|
||||
var defaultHelpHoverTitle = "Markdown Editing Help";
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
// END OF YOUR CHANGES
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
// help, if given, should have a property "handler", the click handler for the help button,
|
||||
// and can have an optional property "title" for the button's tooltip (defaults to "Markdown Editing Help").
|
||||
// If help isn't given, not help button is created.
|
||||
// options, if given, can have the following properties:
|
||||
// options.helpButton = { handler: yourEventHandler }
|
||||
// options.strings = { italicexample: "slanted text" }
|
||||
// `yourEventHandler` is the click handler for the help button.
|
||||
// If `options.helpButton` isn't given, not help button is created.
|
||||
// `options.strings` can have any or all of the same properties as
|
||||
// `defaultStrings` above, so you can just override some string displayed
|
||||
// to the user on a case-by-case basis, or translate all strings to
|
||||
// a different language.
|
||||
//
|
||||
// For backwards compatibility reasons, the `options` argument can also
|
||||
// be just the `helpButton` object, and `strings.help` can also be set via
|
||||
// `helpButton.title`. This should be considered legacy.
|
||||
//
|
||||
// The constructed editor object has the methods:
|
||||
// - getConverter() returns the markdown converter object that was passed to the constructor
|
||||
// - run() actually starts the editor; should be called after all necessary plugins are registered. Calling this more than once is a no-op.
|
||||
// - refreshPreview() forces the preview to be updated. This method is only available after run() was called.
|
||||
Markdown.Editor = function (markdownConverter, idPostfix, help) {
|
||||
Markdown.Editor = function (markdownConverter, idPostfix, options) {
|
||||
|
||||
options = options || {};
|
||||
|
||||
if (typeof options.handler === "function") { //backwards compatible behavior
|
||||
options = { helpButton: options };
|
||||
}
|
||||
options.strings = options.strings || {};
|
||||
if (options.helpButton) {
|
||||
options.strings.help = options.strings.help || options.helpButton.title;
|
||||
}
|
||||
var getString = function (identifier) { return options.strings[identifier] || defaultsStrings[identifier]; }
|
||||
|
||||
idPostfix = idPostfix || "";
|
||||
|
||||
@ -71,7 +122,7 @@
|
||||
return; // already initialized
|
||||
|
||||
panels = new PanelCollection(idPostfix);
|
||||
var commandManager = new CommandManager(hooks);
|
||||
var commandManager = new CommandManager(hooks, getString);
|
||||
var previewManager = new PreviewManager(markdownConverter, panels, function () { hooks.onPreviewRefresh(); });
|
||||
var undoManager, uiManager;
|
||||
|
||||
@ -81,9 +132,14 @@
|
||||
if (uiManager) // not available on the first call
|
||||
uiManager.setUndoRedoButtonStates();
|
||||
}, panels);
|
||||
this.textOperation = function (f) {
|
||||
undoManager.setCommandMode();
|
||||
f();
|
||||
that.refreshPreview();
|
||||
}
|
||||
}
|
||||
|
||||
uiManager = new UIManager(idPostfix, panels, undoManager, previewManager, commandManager, help);
|
||||
uiManager = new UIManager(idPostfix, panels, undoManager, previewManager, commandManager, options.helpButton, getString);
|
||||
uiManager.setUndoRedoButtonStates();
|
||||
|
||||
var forceRefresh = that.refreshPreview = function () { previewManager.refresh(true); };
|
||||
@ -155,7 +211,7 @@
|
||||
beforeReplacer = function (s) { that.before += s; return ""; }
|
||||
afterReplacer = function (s) { that.after = s + that.after; return ""; }
|
||||
}
|
||||
|
||||
|
||||
this.selection = this.selection.replace(/^(\s*)/, beforeReplacer).replace(/(\s*)$/, afterReplacer);
|
||||
};
|
||||
|
||||
@ -223,14 +279,14 @@
|
||||
}
|
||||
};
|
||||
|
||||
// end of Chunks
|
||||
// end of Chunks
|
||||
|
||||
// A collection of the important regions on the page.
|
||||
// Cached so we don't have to keep traversing the DOM.
|
||||
// Also holds ieCachedRange and ieCachedScrollTop, where necessary; working around
|
||||
// this issue:
|
||||
// Internet explorer has problems with CSS sprite buttons that use HTML
|
||||
// lists. When you click on the background image "button", IE will
|
||||
// lists. When you click on the background image "button", IE will
|
||||
// select the non-existent link text and discard the selection in the
|
||||
// textarea. The solution to this is to cache the textarea selection
|
||||
// on the button's mousedown event and set a flag. In the part of the
|
||||
@ -317,8 +373,10 @@
|
||||
var flags;
|
||||
|
||||
// Replace the flags with empty space and store them.
|
||||
pattern = pattern.replace(/\/([gim]*)$/, "");
|
||||
flags = re.$1;
|
||||
pattern = pattern.replace(/\/([gim]*)$/, function (wholeMatch, flagsPart) {
|
||||
flags = flagsPart;
|
||||
return "";
|
||||
});
|
||||
|
||||
// Remove the slash delimiters on the regular expression.
|
||||
pattern = pattern.replace(/(^\/|\/$)/g, "");
|
||||
@ -510,13 +568,13 @@
|
||||
|
||||
var handled = false;
|
||||
|
||||
if (event.ctrlKey || event.metaKey) {
|
||||
if ((event.ctrlKey || event.metaKey) && !event.altKey) {
|
||||
|
||||
// IE and Opera do not support charCode.
|
||||
var keyCode = event.charCode || event.keyCode;
|
||||
var keyCodeChar = String.fromCharCode(keyCode);
|
||||
|
||||
switch (keyCodeChar) {
|
||||
switch (keyCodeChar.toLowerCase()) {
|
||||
|
||||
case "y":
|
||||
undoObj.redo();
|
||||
@ -573,7 +631,7 @@
|
||||
setMode("escape");
|
||||
}
|
||||
else if ((keyCode < 16 || keyCode > 20) && keyCode != 91) {
|
||||
// 16-20 are shift, etc.
|
||||
// 16-20 are shift, etc.
|
||||
// 91: left window key
|
||||
// I think this might be a little messed up since there are
|
||||
// a lot of nonprinting keys above 20.
|
||||
@ -586,7 +644,7 @@
|
||||
util.addEvent(panels.input, "keypress", function (event) {
|
||||
// keyCode 89: y
|
||||
// keyCode 90: z
|
||||
if ((event.ctrlKey || event.metaKey) && (event.keyCode == 89 || event.keyCode == 90)) {
|
||||
if ((event.ctrlKey || event.metaKey) && !event.altKey && (event.keyCode == 89 || event.keyCode == 90)) {
|
||||
event.preventDefault();
|
||||
}
|
||||
});
|
||||
@ -717,7 +775,7 @@
|
||||
|
||||
if (panels.ieCachedRange)
|
||||
stateObj.scrollTop = panels.ieCachedScrollTop; // this is set alongside with ieCachedRange
|
||||
|
||||
|
||||
panels.ieCachedRange = null;
|
||||
|
||||
this.setInputAreaSelection();
|
||||
@ -963,9 +1021,11 @@
|
||||
// browser-specific hacks remain here.
|
||||
ui.createBackground = function () {
|
||||
|
||||
var background = doc.createElement("div");
|
||||
var background = doc.createElement("div"),
|
||||
style = background.style;
|
||||
|
||||
background.className = "wmd-prompt-background";
|
||||
style = background.style;
|
||||
|
||||
style.position = "absolute";
|
||||
style.top = "0";
|
||||
|
||||
@ -1035,13 +1095,9 @@
|
||||
}
|
||||
else {
|
||||
// Fixes common pasting errors.
|
||||
text = text.replace('http://http://', 'http://');
|
||||
text = text.replace('http://https://', 'https://');
|
||||
text = text.replace('http://ftp://', 'ftp://');
|
||||
|
||||
if (text.indexOf('http://') === -1 && text.indexOf('ftp://') === -1 && text.indexOf('https://') === -1) {
|
||||
text = text.replace(/^http:\/\/(https?|ftp):\/\//, '$1://');
|
||||
if (!/^(?:https?|ftp):\/\//.test(text))
|
||||
text = 'http://' + text;
|
||||
}
|
||||
}
|
||||
|
||||
dialog.parentNode.removeChild(dialog);
|
||||
@ -1070,9 +1126,9 @@
|
||||
dialog.appendChild(question);
|
||||
|
||||
// The web form container for the text box and buttons.
|
||||
var form = doc.createElement("form");
|
||||
var form = doc.createElement("form"),
|
||||
style = form.style;
|
||||
form.onsubmit = function () { return close(false); };
|
||||
style = form.style;
|
||||
style.padding = "0";
|
||||
style.margin = "0";
|
||||
style.cssFloat = "left";
|
||||
@ -1156,7 +1212,7 @@
|
||||
}, 0);
|
||||
};
|
||||
|
||||
function UIManager(postfix, panels, undoManager, previewManager, commandManager, helpOptions) {
|
||||
function UIManager(postfix, panels, undoManager, previewManager, commandManager, helpOptions, getString) {
|
||||
|
||||
var inputBox = panels.input,
|
||||
buttons = {}; // buttons.undo, buttons.link, etc. The actual DOM elements.
|
||||
@ -1171,7 +1227,7 @@
|
||||
util.addEvent(inputBox, keyEvent, function (key) {
|
||||
|
||||
// Check to see if we have a button key and, if so execute the callback.
|
||||
if ((key.ctrlKey || key.metaKey) && !key.altKey) {
|
||||
if ((key.ctrlKey || key.metaKey) && !key.altKey && !key.shiftKey) {
|
||||
|
||||
var keyCode = key.charCode || key.keyCode;
|
||||
var keyCodeStr = String.fromCharCode(keyCode).toLowerCase();
|
||||
@ -1239,7 +1295,7 @@
|
||||
var keyCode = key.charCode || key.keyCode;
|
||||
// Character 13 is Enter
|
||||
if (keyCode === 13) {
|
||||
fakeButton = {};
|
||||
var fakeButton = {};
|
||||
fakeButton.textOp = bindCommand("doAutoindent");
|
||||
doClick(fakeButton);
|
||||
}
|
||||
@ -1284,7 +1340,7 @@
|
||||
//
|
||||
// var link = CreateLinkDialog();
|
||||
// makeMarkdownLink(link);
|
||||
//
|
||||
//
|
||||
// Instead of this straightforward method of handling a
|
||||
// dialog I have to pass any code which would execute
|
||||
// after the dialog is dismissed (e.g. link creation)
|
||||
@ -1406,33 +1462,33 @@
|
||||
xPosition += 25;
|
||||
}
|
||||
|
||||
buttons.bold = makeButton("wmd-bold-button", "Strong <strong> Ctrl+B", "0px", bindCommand("doBold"));
|
||||
buttons.italic = makeButton("wmd-italic-button", "Emphasis <em> Ctrl+I", "-20px", bindCommand("doItalic"));
|
||||
buttons.bold = makeButton("wmd-bold-button", getString("bold"), "0px", bindCommand("doBold"));
|
||||
buttons.italic = makeButton("wmd-italic-button", getString("italic"), "-20px", bindCommand("doItalic"));
|
||||
makeSpacer(1);
|
||||
buttons.link = makeButton("wmd-link-button", "Hyperlink <a> Ctrl+L", "-40px", bindCommand(function (chunk, postProcessing) {
|
||||
buttons.link = makeButton("wmd-link-button", getString("link"), "-40px", bindCommand(function (chunk, postProcessing) {
|
||||
return this.doLinkOrImage(chunk, postProcessing, false);
|
||||
}));
|
||||
buttons.quote = makeButton("wmd-quote-button", "Blockquote <blockquote> Ctrl+Q", "-60px", bindCommand("doBlockquote"));
|
||||
buttons.code = makeButton("wmd-code-button", "Code Sample <pre><code> Ctrl+K", "-80px", bindCommand("doCode"));
|
||||
buttons.image = makeButton("wmd-image-button", "Image <img> Ctrl+G", "-100px", bindCommand(function (chunk, postProcessing) {
|
||||
buttons.quote = makeButton("wmd-quote-button", getString("quote"), "-60px", bindCommand("doBlockquote"));
|
||||
buttons.code = makeButton("wmd-code-button", getString("code"), "-80px", bindCommand("doCode"));
|
||||
buttons.image = makeButton("wmd-image-button", getString("image"), "-100px", bindCommand(function (chunk, postProcessing) {
|
||||
return this.doLinkOrImage(chunk, postProcessing, true);
|
||||
}));
|
||||
makeSpacer(2);
|
||||
buttons.olist = makeButton("wmd-olist-button", "Numbered List <ol> Ctrl+O", "-120px", bindCommand(function (chunk, postProcessing) {
|
||||
buttons.olist = makeButton("wmd-olist-button", getString("olist"), "-120px", bindCommand(function (chunk, postProcessing) {
|
||||
this.doList(chunk, postProcessing, true);
|
||||
}));
|
||||
buttons.ulist = makeButton("wmd-ulist-button", "Bulleted List <ul> Ctrl+U", "-140px", bindCommand(function (chunk, postProcessing) {
|
||||
buttons.ulist = makeButton("wmd-ulist-button", getString("ulist"), "-140px", bindCommand(function (chunk, postProcessing) {
|
||||
this.doList(chunk, postProcessing, false);
|
||||
}));
|
||||
buttons.heading = makeButton("wmd-heading-button", "Heading <h1>/<h2> Ctrl+H", "-160px", bindCommand("doHeading"));
|
||||
buttons.hr = makeButton("wmd-hr-button", "Horizontal Rule <hr> Ctrl+R", "-180px", bindCommand("doHorizontalRule"));
|
||||
buttons.heading = makeButton("wmd-heading-button", getString("heading"), "-160px", bindCommand("doHeading"));
|
||||
buttons.hr = makeButton("wmd-hr-button", getString("hr"), "-180px", bindCommand("doHorizontalRule"));
|
||||
makeSpacer(3);
|
||||
buttons.undo = makeButton("wmd-undo-button", "Undo - Ctrl+Z", "-200px", null);
|
||||
buttons.undo = makeButton("wmd-undo-button", getString("undo"), "-200px", null);
|
||||
buttons.undo.execute = function (manager) { if (manager) manager.undo(); };
|
||||
|
||||
var redoTitle = /win/.test(nav.platform.toLowerCase()) ?
|
||||
"Redo - Ctrl+Y" :
|
||||
"Redo - Ctrl+Shift+Z"; // mac and other non-Windows platforms
|
||||
getString("redo") :
|
||||
getString("redomac"); // mac and other non-Windows platforms
|
||||
|
||||
buttons.redo = makeButton("wmd-redo-button", redoTitle, "-220px", null);
|
||||
buttons.redo.execute = function (manager) { if (manager) manager.redo(); };
|
||||
@ -1446,7 +1502,7 @@
|
||||
helpButton.XShift = "-240px";
|
||||
helpButton.isHelp = true;
|
||||
helpButton.style.right = "0px";
|
||||
helpButton.title = helpOptions.title || defaultHelpHoverTitle;
|
||||
helpButton.title = getString("help");
|
||||
helpButton.onclick = helpOptions.handler;
|
||||
|
||||
setupButton(helpButton, true);
|
||||
@ -1468,8 +1524,9 @@
|
||||
|
||||
}
|
||||
|
||||
function CommandManager(pluginHooks) {
|
||||
function CommandManager(pluginHooks, getString) {
|
||||
this.hooks = pluginHooks;
|
||||
this.getString = getString;
|
||||
}
|
||||
|
||||
var commandProto = CommandManager.prototype;
|
||||
@ -1485,10 +1542,11 @@
|
||||
|
||||
commandProto.wrap = function (chunk, len) {
|
||||
this.unwrap(chunk);
|
||||
var regex = new re("(.{1," + len + "})( +|$\\n?)", "gm");
|
||||
var regex = new re("(.{1," + len + "})( +|$\\n?)", "gm"),
|
||||
that = this;
|
||||
|
||||
chunk.selection = chunk.selection.replace(regex, function (line, marked) {
|
||||
if (new re("^" + this.prefixes, "").test(line)) {
|
||||
if (new re("^" + that.prefixes, "").test(line)) {
|
||||
return line;
|
||||
}
|
||||
return marked + "\n";
|
||||
@ -1498,11 +1556,11 @@
|
||||
};
|
||||
|
||||
commandProto.doBold = function (chunk, postProcessing) {
|
||||
return this.doBorI(chunk, postProcessing, 2, "strong text");
|
||||
return this.doBorI(chunk, postProcessing, 2, this.getString("boldexample"));
|
||||
};
|
||||
|
||||
commandProto.doItalic = function (chunk, postProcessing) {
|
||||
return this.doBorI(chunk, postProcessing, 1, "emphasized text");
|
||||
return this.doBorI(chunk, postProcessing, 1, this.getString("italicexample"));
|
||||
};
|
||||
|
||||
// chunk: The selected region that will be enclosed with */**
|
||||
@ -1638,7 +1696,7 @@
|
||||
});
|
||||
if (title) {
|
||||
title = title.trim ? title.trim() : title.replace(/^\s*/, "").replace(/\s*$/, "");
|
||||
title = $.trim(title).replace(/"/g, "quot;").replace(/\(/g, "(").replace(/\)/g, ")").replace(/</g, "<").replace(/>/g, ">");
|
||||
title = title.replace(/"/g, "quot;").replace(/\(/g, "(").replace(/\)/g, ")").replace(/</g, "<").replace(/>/g, ">");
|
||||
}
|
||||
return title ? link + ' "' + title + '"' : link;
|
||||
});
|
||||
@ -1650,7 +1708,7 @@
|
||||
chunk.findTags(/\s*!?\[/, /\][ ]?(?:\n[ ]*)?(\[.*?\])?/);
|
||||
var background;
|
||||
|
||||
if (chunk.endTag.length > 1) {
|
||||
if (chunk.endTag.length > 1 && chunk.startTag.length > 0) {
|
||||
|
||||
chunk.startTag = chunk.startTag.replace(/!?\[/, "");
|
||||
chunk.endTag = "";
|
||||
@ -1658,6 +1716,12 @@
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
// We're moving start and end tag back into the selection, since (as we're in the else block) we're not
|
||||
// *removing* a link, but *adding* one, so whatever findTags() found is now back to being part of the
|
||||
// link text. linkEnteredCallback takes care of escaping any brackets.
|
||||
chunk.selection = chunk.startTag + chunk.selection + chunk.endTag;
|
||||
chunk.startTag = chunk.endTag = "";
|
||||
|
||||
if (/\n\n/.test(chunk.selection)) {
|
||||
this.addLinkDef(chunk, null);
|
||||
@ -1671,8 +1735,26 @@
|
||||
background.parentNode.removeChild(background);
|
||||
|
||||
if (link !== null) {
|
||||
|
||||
chunk.startTag = chunk.endTag = "";
|
||||
// ( $1
|
||||
// [^\\] anything that's not a backslash
|
||||
// (?:\\\\)* an even number (this includes zero) of backslashes
|
||||
// )
|
||||
// (?= followed by
|
||||
// [[\]] an opening or closing bracket
|
||||
// )
|
||||
//
|
||||
// In other words, a non-escaped bracket. These have to be escaped now to make sure they
|
||||
// don't count as the end of the link or similar.
|
||||
// Note that the actual bracket has to be a lookahead, because (in case of to subsequent brackets),
|
||||
// the bracket in one match may be the "not a backslash" character in the next match, so it
|
||||
// should not be consumed by the first match.
|
||||
// The "prepend a space and finally remove it" steps makes sure there is a "not a backslash" at the
|
||||
// start of the string, so this also works if the selection begins with a bracket. We cannot solve
|
||||
// this by anchoring with ^, because in the case that the selection starts with two brackets, this
|
||||
// would mean a zero-width match at the start. Since zero-width matches advance the string position,
|
||||
// the first bracket could then not act as the "not a backslash" for the second.
|
||||
chunk.selection = (" " + chunk.selection).replace(/([^\\](?:\\\\)*)(?=[[\]])/g, "$1\\").substr(1);
|
||||
|
||||
var linkDef = " [999]: " + properlyEncoded(link);
|
||||
|
||||
var num = that.addLinkDef(chunk, linkDef);
|
||||
@ -1681,10 +1763,10 @@
|
||||
|
||||
if (!chunk.selection) {
|
||||
if (isImage) {
|
||||
chunk.selection = "enter image description here";
|
||||
chunk.selection = that.getString("imagedescription");
|
||||
}
|
||||
else {
|
||||
chunk.selection = "enter link description here";
|
||||
chunk.selection = that.getString("linkdescription");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1695,10 +1777,10 @@
|
||||
|
||||
if (isImage) {
|
||||
if (!this.hooks.insertImageDialog(linkEnteredCallback))
|
||||
ui.prompt(imageDialogText, imageDefaultText, linkEnteredCallback);
|
||||
ui.prompt(this.getString("imagedialog"), imageDefaultText, linkEnteredCallback);
|
||||
}
|
||||
else {
|
||||
ui.prompt(linkDialogText, linkDefaultText, linkEnteredCallback);
|
||||
ui.prompt(this.getString("linkdialog"), linkDefaultText, linkEnteredCallback);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -1708,11 +1790,24 @@
|
||||
// at the current indent level.
|
||||
commandProto.doAutoindent = function (chunk, postProcessing) {
|
||||
|
||||
var commandMgr = this;
|
||||
var commandMgr = this,
|
||||
fakeSelection = false;
|
||||
|
||||
chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]*\n$/, "\n\n");
|
||||
chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}>[ \t]*\n$/, "\n\n");
|
||||
chunk.before = chunk.before.replace(/(\n|^)[ \t]+\n$/, "\n\n");
|
||||
|
||||
// There's no selection, end the cursor wasn't at the end of the line:
|
||||
// The user wants to split the current list item / code line / blockquote line
|
||||
// (for the latter it doesn't really matter) in two. Temporarily select the
|
||||
// (rest of the) line to achieve this.
|
||||
if (!chunk.selection && !/^[ \t]*(?:\n|$)/.test(chunk.after)) {
|
||||
chunk.after = chunk.after.replace(/^[^\n]*/, function (wholeMatch) {
|
||||
chunk.selection = wholeMatch;
|
||||
return "";
|
||||
});
|
||||
fakeSelection = true;
|
||||
}
|
||||
|
||||
if (/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]+.*\n$/.test(chunk.before)) {
|
||||
if (commandMgr.doList) {
|
||||
@ -1729,6 +1824,11 @@
|
||||
commandMgr.doCode(chunk);
|
||||
}
|
||||
}
|
||||
|
||||
if (fakeSelection) {
|
||||
chunk.after = chunk.selection + chunk.after;
|
||||
chunk.selection = "";
|
||||
}
|
||||
};
|
||||
|
||||
commandProto.doBlockquote = function (chunk, postProcessing) {
|
||||
@ -1747,7 +1847,7 @@
|
||||
});
|
||||
|
||||
chunk.selection = chunk.selection.replace(/^(\s|>)+$/, "");
|
||||
chunk.selection = chunk.selection || "Blockquote";
|
||||
chunk.selection = chunk.selection || this.getString("quoteexample");
|
||||
|
||||
// The original code uses a regular expression to find out how much of the
|
||||
// text *directly before* the selection already was a blockquote:
|
||||
@ -1893,7 +1993,7 @@
|
||||
var nLinesBack = 1;
|
||||
var nLinesForward = 1;
|
||||
|
||||
if (/\n(\t|[ ]{4,}).*\n$/.test(chunk.before)) {
|
||||
if (/(\n|^)(\t|[ ]{4,}).*\n$/.test(chunk.before)) {
|
||||
nLinesBack = 0;
|
||||
}
|
||||
if (/^\n(\t|[ ]{4,})/.test(chunk.after)) {
|
||||
@ -1904,14 +2004,17 @@
|
||||
|
||||
if (!chunk.selection) {
|
||||
chunk.startTag = " ";
|
||||
chunk.selection = "enter code here";
|
||||
chunk.selection = this.getString("codeexample");
|
||||
}
|
||||
else {
|
||||
if (/^[ ]{0,3}\S/m.test(chunk.selection)) {
|
||||
chunk.selection = chunk.selection.replace(/^/gm, " ");
|
||||
if (/\n/.test(chunk.selection))
|
||||
chunk.selection = chunk.selection.replace(/^/gm, " ");
|
||||
else // if it's not multiline, do not select the four added spaces; this is more consistent with the doList behavior
|
||||
chunk.before += " ";
|
||||
}
|
||||
else {
|
||||
chunk.selection = chunk.selection.replace(/^[ ]{4}/gm, "");
|
||||
chunk.selection = chunk.selection.replace(/^(?:[ ]{4}|[ ]{0,3}\t)/gm, "");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1924,7 +2027,7 @@
|
||||
if (!chunk.startTag && !chunk.endTag) {
|
||||
chunk.startTag = chunk.endTag = "`";
|
||||
if (!chunk.selection) {
|
||||
chunk.selection = "enter code here";
|
||||
chunk.selection = this.getString("codeexample");
|
||||
}
|
||||
}
|
||||
else if (chunk.endTag && !chunk.startTag) {
|
||||
@ -2018,7 +2121,7 @@
|
||||
});
|
||||
|
||||
if (!chunk.selection) {
|
||||
chunk.selection = "List item";
|
||||
chunk.selection = this.getString("litem");
|
||||
}
|
||||
|
||||
var prefix = getItemPrefix();
|
||||
@ -2050,7 +2153,7 @@
|
||||
// make a level 2 hash header around some default text.
|
||||
if (!chunk.selection) {
|
||||
chunk.startTag = "## ";
|
||||
chunk.selection = "Heading";
|
||||
chunk.selection = this.getString("headingexample");
|
||||
chunk.endTag = " ##";
|
||||
return;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user