From ead75ceea9a7b3c5ecb3b165ee1bbe0d20cd7577 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Aug 2020 19:05:33 +0200 Subject: [PATCH] new markitup version --- styles/bootstrap/markitup/jquery.markitup.js | 32 +++++++++++------- .../markitup/sets/default/images/bold.png | Bin .../markitup/sets/default/images/clean.png | Bin .../markitup/sets/default/images/image.png | Bin .../markitup/sets/default/images/italic.png | Bin .../markitup/sets/default/images/link.png | Bin .../sets/default/images/list-bullet.png | Bin .../sets/default/images/list-numeric.png | Bin .../markitup/sets/default/images/picture.png | Bin .../markitup/sets/default/images/preview.png | Bin .../markitup/sets/default/images/stroke.png | Bin styles/bootstrap/markitup/sets/default/set.js | 4 +-- .../bootstrap/markitup/sets/default/style.css | 0 .../skins/markitup/images/bg-container.png | Bin .../markitup/images/bg-editor-bbcode.png | Bin .../markitup/images/bg-editor-dotclear.png | Bin .../skins/markitup/images/bg-editor-html.png | Bin .../skins/markitup/images/bg-editor-json.png | Bin .../markitup/images/bg-editor-markdown.png | Bin .../markitup/images/bg-editor-textile.png | Bin .../skins/markitup/images/bg-editor-wiki.png | Bin .../skins/markitup/images/bg-editor-xml.png | Bin .../skins/markitup/images/bg-editor.png | Bin .../markitup/skins/markitup/images/handle.png | Bin .../markitup/skins/markitup/images/menu.png | Bin .../skins/markitup/images/submenu.png | Bin .../markitup/skins/markitup/style.css | 0 .../markitup/skins/simple/images/handle.png | Bin .../markitup/skins/simple/images/menu.png | Bin .../markitup/skins/simple/images/submenu.png | Bin .../bootstrap/markitup/skins/simple/style.css | 8 ++--- .../bootstrap/markitup/templates/preview.css | 0 .../bootstrap/markitup/templates/preview.html | 0 33 files changed, 26 insertions(+), 18 deletions(-) mode change 100644 => 100755 styles/bootstrap/markitup/jquery.markitup.js mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/bold.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/clean.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/image.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/italic.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/link.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/list-bullet.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/list-numeric.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/picture.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/preview.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/images/stroke.png mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/set.js mode change 100644 => 100755 styles/bootstrap/markitup/sets/default/style.css mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-container.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-bbcode.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-dotclear.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-html.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-json.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-markdown.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-textile.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-wiki.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor-xml.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/bg-editor.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/handle.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/menu.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/images/submenu.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/markitup/style.css mode change 100644 => 100755 styles/bootstrap/markitup/skins/simple/images/handle.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/simple/images/menu.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/simple/images/submenu.png mode change 100644 => 100755 styles/bootstrap/markitup/skins/simple/style.css mode change 100644 => 100755 styles/bootstrap/markitup/templates/preview.css mode change 100644 => 100755 styles/bootstrap/markitup/templates/preview.html diff --git a/styles/bootstrap/markitup/jquery.markitup.js b/styles/bootstrap/markitup/jquery.markitup.js old mode 100644 new mode 100755 index b7e2d0395..4ea585c38 --- a/styles/bootstrap/markitup/jquery.markitup.js +++ b/styles/bootstrap/markitup/jquery.markitup.js @@ -45,6 +45,7 @@ previewParser: false, previewParserPath: '', previewParserVar: 'data', + previewParserAjaxType: 'POST', resizeHandle: true, beforeInsert: '', afterInsert: '', @@ -59,7 +60,7 @@ // compute markItUp! path if (!options.root) { $('script').each(function(a, tag) { - miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/); + var miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/); if (miuScript !== null) { options.root = miuScript[1]; } @@ -202,7 +203,7 @@ $('li:hover > ul', ul).css('display', 'block'); $.each(markupSet, function() { var button = this, t = '', title, li, j; - title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||''); + button.title ? title = (button.key) ? (button.title||'')+' [Ctrl+'+button.key+']' : (button.title||'') : title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||''); key = (button.key) ? 'accesskey="'+button.key+'"' : ''; if (button.separator) { li = $('
  • '+(button.separator||'')+'
    • ').appendTo(ul); @@ -211,16 +212,16 @@ for (j = levels.length -1; j >= 0; j--) { t += levels[j]+"-"; } - li = $('
  • '+(button.name||'')+'
    • ') + li = $('
  • '+(button.name||'')+'
    • ') .bind("contextmenu.markItUp", function() { // prevent contextmenu on mac and allow ctrl+click return false; }).bind('click.markItUp', function(e) { e.preventDefault(); }).bind("focusin.markItUp", function(){ $$.focus(); - }).bind('mouseup', function() { + }).bind('mouseup', function(e) { if (button.call) { - eval(button.call)(); + eval(button.call)(e); // Pass the mouseup event to custom delegate } setTimeout(function() { markup(button) },1); return false; @@ -537,18 +538,19 @@ function renderPreview() { var phtml; + var parsedData = $$.val(); + if (options.previewParser && typeof options.previewParser === 'function') { + parsedData = options.previewParser(parsedData); + } if (options.previewHandler && typeof options.previewHandler === 'function') { - options.previewHandler( $$.val() ); - } else if (options.previewParser && typeof options.previewParser === 'function') { - var data = options.previewParser( $$.val() ); - writeInPreview(localize(data, 1) ); + options.previewHandler(parsedData); } else if (options.previewParserPath !== '') { $.ajax({ - type: 'POST', + type: options.previewParserAjaxType, dataType: 'text', global: false, url: options.previewParserPath, - data: options.previewParserVar+'='+encodeURIComponent($$.val()), + data: options.previewParserVar+'='+encodeURIComponent(parsedData), success: function(data) { writeInPreview( localize(data, 1) ); } @@ -560,7 +562,7 @@ dataType: 'text', global: false, success: function(data) { - writeInPreview( localize(data, 1).replace(//g, $$.val()) ); + writeInPreview( localize(data, 1).replace(//g, parsedData) ); } }); } @@ -636,6 +638,12 @@ function remove() { $$.unbind(".markItUp").removeClass('markItUpEditor'); $$.parent('div').parent('div.markItUp').parent('div').replaceWith($$); + + var relativeRef = $$.parent('div').parent('div.markItUp').parent('div'); + if (relativeRef.length) { + relativeRef.replaceWith($$); + } + $$.data('markItUp', null); } diff --git a/styles/bootstrap/markitup/sets/default/images/bold.png b/styles/bootstrap/markitup/sets/default/images/bold.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/clean.png b/styles/bootstrap/markitup/sets/default/images/clean.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/image.png b/styles/bootstrap/markitup/sets/default/images/image.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/italic.png b/styles/bootstrap/markitup/sets/default/images/italic.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/link.png b/styles/bootstrap/markitup/sets/default/images/link.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/list-bullet.png b/styles/bootstrap/markitup/sets/default/images/list-bullet.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/list-numeric.png b/styles/bootstrap/markitup/sets/default/images/list-numeric.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/picture.png b/styles/bootstrap/markitup/sets/default/images/picture.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/preview.png b/styles/bootstrap/markitup/sets/default/images/preview.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/images/stroke.png b/styles/bootstrap/markitup/sets/default/images/stroke.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/sets/default/set.js b/styles/bootstrap/markitup/sets/default/set.js old mode 100644 new mode 100755 index c1fbde920..b7fdf8182 --- a/styles/bootstrap/markitup/sets/default/set.js +++ b/styles/bootstrap/markitup/sets/default/set.js @@ -24,7 +24,7 @@ var mySettings = { {name:'Picture', key:'P', replaceWith:'[![Alternative text]!]' }, {name:'Link', key:'L', openWith:'', closeWith:'', placeHolder:'Your text to link...' }, {separator:'---------------' }, - {name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } }/*, - {name:'Preview', className:'preview', call:'preview'}*/ + {name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } }, + {name:'Preview', className:'preview', call:'preview'} ] } diff --git a/styles/bootstrap/markitup/sets/default/style.css b/styles/bootstrap/markitup/sets/default/style.css old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-container.png b/styles/bootstrap/markitup/skins/markitup/images/bg-container.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-bbcode.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-bbcode.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-dotclear.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-dotclear.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-html.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-html.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-json.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-json.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-markdown.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-markdown.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-textile.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-textile.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-wiki.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-wiki.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor-xml.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor-xml.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/bg-editor.png b/styles/bootstrap/markitup/skins/markitup/images/bg-editor.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/handle.png b/styles/bootstrap/markitup/skins/markitup/images/handle.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/menu.png b/styles/bootstrap/markitup/skins/markitup/images/menu.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/images/submenu.png b/styles/bootstrap/markitup/skins/markitup/images/submenu.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/markitup/style.css b/styles/bootstrap/markitup/skins/markitup/style.css old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/simple/images/handle.png b/styles/bootstrap/markitup/skins/simple/images/handle.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/simple/images/menu.png b/styles/bootstrap/markitup/skins/simple/images/menu.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/simple/images/submenu.png b/styles/bootstrap/markitup/skins/simple/images/submenu.png old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/skins/simple/style.css b/styles/bootstrap/markitup/skins/simple/style.css old mode 100644 new mode 100755 index 2a0c89d5d..fe3753c02 --- a/styles/bootstrap/markitup/skins/simple/style.css +++ b/styles/bootstrap/markitup/skins/simple/style.css @@ -12,7 +12,7 @@ text-decoration:none; } .markItUp { - width:100%; + width:700px; margin:5px 0 5px 0; } .markItUpContainer { @@ -20,9 +20,9 @@ } .markItUpEditor { font:12px 'Courier New', Courier, monospace; - padding:0px; - width:100%; - _height:320px; + padding:5px; + width:690px; + height:320px; clear:both; line-height:18px; overflow:auto; diff --git a/styles/bootstrap/markitup/templates/preview.css b/styles/bootstrap/markitup/templates/preview.css old mode 100644 new mode 100755 diff --git a/styles/bootstrap/markitup/templates/preview.html b/styles/bootstrap/markitup/templates/preview.html old mode 100644 new mode 100755