<\/p>/gi, '');
if (htmls[i] != '')
@@ -3146,14 +3637,19 @@
}
}
- html = R('
\s*
', 'gi', '');
- html = R('
([^<]+)', 'gi', "
$1
");
- html = R('
\s*(]*>)\s*
', 'gi', "$1");
- html = R("
(", 'gi', "$1");
- html = R('
\s*(]*>)', 'gi', "$1");
+ html = R('
', 'gi', '
');
+ html = R('
', 'gi', '');
- html = R('(]*>)\s*', 'gi', "$1");
- html = R('(]*>)\s* ', 'gi', "$1");
+ html = R('
\s?
', 'gi', '');
+
+ html = R('
([^<]+)', 'gi', "
$1
");
+
+ html = R('
(]*>)
', 'gi', "$1");
+ html = R("
(", 'gi', "$1");
+ html = R('
\s?(]*>)', 'gi', "$1");
+
+ html = R('(]*>)\s?
', 'gi', "$1");
+ html = R('(]*>)\s? ', 'gi', "$1");
html = R(' (\s*]*>)', 'gi', '$1');
html = R("\n
", 'gi', '');
@@ -3161,7 +3657,7 @@
html = R('', 'gi', '');
html = R('
', 'gi', '');
//html = R('
(.*?)', 'gi', '');
- /* html = R('
', 'gi', ''); */
+ // html = R('
', 'gi', '');
html = R('
\t?\n?
', 'gi', '
');
html = R('
', 'gi', '');
html = R('
', 'gi', '');
@@ -3194,14 +3690,10 @@
if (this.opts.italicTag === 'em') html = html.replace(/([\w\W]*?)<\/i>/gi, '$1');
else html = html.replace(/([\w\W]*?)<\/em>/gi, '$1');
- if (set !== true)
- {
- html = html.replace(/([\w\W]*?)<\/strike>/gi, '$1');
- }
- else
- {
- html = html.replace(/([\w\W]*?)<\/del>/gi, '$1');
- }
+ html = html.replace(/([\w\W]*?)<\/span>/gi, '$1');
+
+ if (set !== true) html = html.replace(/([\w\W]*?)<\/strike>/gi, '$1');
+ else html = html.replace(/([\w\W]*?)<\/del>/gi, '$1');
return html;
},
@@ -3273,9 +3765,23 @@
this.removeEmptyAttr(s, 'style');
}, this));
+ var $elem2 = this.$editor.find('b, strong, i, em, u, strike, del');
+ $elem2.css('font-size', '');
+
+ $.each($elem2, $.proxy(function(i,s)
+ {
+ this.removeEmptyAttr(s, 'style');
+ }, this));
+
// When we paste text in Safari is wrapping inserted div (remove it)
this.$editor.find('div[style="text-align: -webkit-auto;"]').contents().unwrap();
+
+ // Remove all styles in ul, ol, li
+ this.$editor.find('ul, ol, li').removeAttr('style');
},
+
+
+ // TEXTAREA CODE FORMATTING
cleanHtml: function(code)
{
var i = 0,
@@ -3385,7 +3891,7 @@
}
}
- return this.cleanFinish( out );
+ return this.cleanFinish(out);
},
cleanGetTabs: function()
{
@@ -3399,10 +3905,10 @@
},
cleanFinish: function(code)
{
- code = code.replace( /\n\s*\n/g, '\n' );
- code = code.replace( /^[\s\n]*/, '' );
- code = code.replace( /[\s\n]*$/, '' );
- code = code.replace( /\n<\/script>/gi, '' );
+ code = code.replace(/\n\s*\n/g, '\n');
+ code = code.replace(/^[\s\n]*/, '');
+ code = code.replace(/[\s\n]*$/, '');
+ code = code.replace(/\n<\/script>/gi, '');
this.cleanlevel = 0;
@@ -3491,6 +3997,11 @@
},
formatBlocks: function(tag)
{
+ if (this.browser('mozilla') && this.isFocused())
+ {
+ this.$editor.focus();
+ }
+
this.bufferSet();
var nodes = this.getBlocks();
@@ -3513,7 +4024,14 @@
this.formatQuote();
return;
}
- else if (this.opts.linebreaks) return;
+ else if (this.opts.linebreaks)
+ {
+ if (node && node.tagName.search(/H[1-6]/) == 0)
+ {
+ $(node).replaceWith(node.innerHTML + ' ');
+ }
+ else return;
+ }
else
{
this.formatBlock(tag, node);
@@ -3533,9 +4051,9 @@
formatBlock: function(tag, block)
{
if (block === false) block = this.getBlock();
- if (block === false)
+ if (block === false && this.opts.linebreaks === true)
{
- if (this.opts.linebreaks === true) this.execCommand('formatblock', tag);
+ this.execCommand('formatblock', tag);
return true;
}
@@ -3588,6 +4106,11 @@
// QUOTE
formatQuote: function()
{
+ if (this.browser('mozilla') && this.isFocused())
+ {
+ this.$editor.focus();
+ }
+
this.bufferSet();
// paragraphy
@@ -3748,7 +4271,6 @@
});
var blocksElems = this.opts.blockLevelElements;
- blocksElems.push('td');
$.each(blocksElems, function(i,s)
{
html = html.replace(new RegExp('<' + s + '(.*?)>', 'gi'), '');
@@ -3828,7 +4350,6 @@
this.selectionRestore();
this.sync();
},
-
inlineSetClass: function(className)
{
var current = this.getCurrent();
@@ -4014,13 +4535,14 @@
$(el).replaceWith($(el).contents());
},
+
// INSERT
insertHtml: function (html, sync)
{
var current = this.getCurrent();
var parent = current.parentNode;
- this.$editor.focus();
+ this.focusWithSaveScroll();
this.bufferSet();
@@ -4031,7 +4553,6 @@
// Update value
$html = $('
').append($.parseHTML(html));
-
var currBlock = this.getBlock();
if ($html.contents().length == 1)
@@ -4041,11 +4562,16 @@
// If the inserted and received text tags match
if (htmlTagName != 'P' && htmlTagName == currBlock.tagName || htmlTagName == 'PRE')
{
- html = $html.text();
+ //html = $html.html();
$html = $('
<\/div>/gi, ' ');
+ }
+
+ // strip tags
+ html = this.cleanStripTags(html);
if (this.currentOrParentIs('LI'))
{
html = html.replace(/
([\w\W]*?)<\/p>/gi, '$1 ');
}
- else
+ else if (tablePaste === false)
{
html = this.cleanParagraphy(html);
}
@@ -4408,7 +5052,7 @@
// remove empty
html = html.replace(//gi, '');
- html = html.replace(/<[^\/>][^>][^img|param|source]*>(\s*|\t*|\n*| | )<\/[^>]+>/gi, '');
+ html = html.replace(/<[^\/>][^>][^img|param|source|td][^<]*>(\s*|\t*|\n*| | )<\/[^>]+>/gi, '');
html = html.replace(/\n{3,}/gi, '\n');
@@ -4425,7 +5069,7 @@
}
// remove empty finally
- html = html.replace(/<[^\/>][^>][^img|param|source]*>(\s*|\t*|\n*| | )<\/[^>]+>/gi, '');
+ html = html.replace(/<[^\/>][^>][^img|param|source|td][^<]*>(\s*|\t*|\n*| | )<\/[^>]+>/gi, '');
// remove safari local images
html = html.replace(//gi, '');
@@ -4434,8 +5078,11 @@
html = html.replace(/(\s*|\t*|\n*)
([\w\W]*?)<\/p>(\s*|\t*|\n*)<\/td>/gi, '$3
');
// remove divs
- html = html.replace(/([\w\W]*?)<\/div>/gi, '$2');
- html = html.replace(/([\w\W]*?)<\/div>/gi, '$2');
+ if (this.opts.convertDivs)
+ {
+ html = html.replace(/([\w\W]*?)<\/div>/gi, '$2');
+ html = html.replace(/([\w\W]*?)<\/div>/gi, '$2');
+ }
// FF specific
this.pasteClipboardMozilla = false;
@@ -4466,18 +5113,29 @@
html = html.replace(/
•([\w\W]*?)<\/p>/gi, '
$1
');
// ie inserts a blank font tags when pasting
- while (/([\w\W]*?)<\/font>/gi.test(html))
+ if (this.browser('msie'))
{
- html = html.replace(/([\w\W]*?)<\/font>/gi, '$1');
+ while (/([\w\W]*?)<\/font>/gi.test(html))
+ {
+ html = html.replace(/([\w\W]*?)<\/font>/gi, '$1');
+ }
}
- // ms word lists breakline
- html = html.replace(/
\n?
/gi, '
');
- if (this.browser('msie') && !this.isIe11())
+ // remove table paragraphs
+ if (tablePaste === false)
{
- html = html.replace(/\n/g, '');
+ html = html.replace(/([\w\W]*?)([\w\W]*?)<\/td>/gi, '$2$4
');
+ html = html.replace(/([\w\W]*?)<\/p>([\w\W]*?)<\/td>/gi, '$2$3');
+ html = html.replace(/([\w\W]*?)([\w\W]*?)<\/td>/gi, '$2$4');
+ html = html.replace(/([\w\W]*?)<\/p>([\w\W]*?)<\/td>/gi, '$2$3');
}
+ // ms word break lines
+ html = html.replace(/\n/g, ' ');
+
+ // ms word lists break lines
+ html = html.replace(/
\n?
/gi, '
');
+
this.pasteInsert(html);
},
@@ -4491,19 +5149,22 @@
},
pasteInsert: function(html)
{
- if (this.selectall)
- {
- if (!this.opts.linebreaks) this.$editor.html(this.opts.emptyHtml);
- else this.$editor.html('');
-
- this.$editor.focus();
- }
-
html = this.callback('pasteAfter', false, html);
- this.insertHtml(html);
+ if (this.selectall)
+ {
+ this.$editor.html(html);
+ this.selectionRemove();
+ this.focusEnd();
+ this.sync();
+ }
+ else
+ {
+ this.insertHtml(html);
+ }
this.selectall = false;
+
setTimeout($.proxy(function()
{
this.rtePaste = false;
@@ -4520,8 +5181,29 @@
}, this), 100);
- if (this.opts.autoresize && this.fullscreen !== true) $(this.document.body).scrollTop(this.saveScroll);
- else this.$editor.scrollTop(this.saveScroll);
+ if (this.opts.autoresize && this.fullscreen !== true)
+ {
+ $(this.document.body).scrollTop(this.saveScroll);
+ }
+ else
+ {
+ this.$editor.scrollTop(this.saveScroll);
+ }
+ },
+ pasteClipboardAppendFields: function(postData)
+ {
+ // append hidden fields
+ if (this.opts.uploadFields !== false && typeof this.opts.uploadFields === 'object')
+ {
+ $.each(this.opts.uploadFields, $.proxy(function(k, v)
+ {
+ if (v != null && v.toString().indexOf('#') === 0) v = $(v).val();
+ postData[k] = v;
+
+ }, this));
+ }
+
+ return postData;
},
pasteClipboardUploadMozilla: function()
{
@@ -4530,13 +5212,15 @@
{
var $s = $(s);
var arr = s.src.split(",");
- var data = arr[1]; // raw base64
- var contentType = arr[0].split(";")[0].split(":")[1];
+ var postData = {
+ 'contentType': arr[0].split(";")[0].split(":")[1],
+ 'data': arr[1] // raw base64
+ };
- $.post(this.opts.clipboardUploadUrl, {
- contentType: contentType,
- data: data
- },
+ // append hidden fields
+ postData = this.pasteClipboardAppendFields(postData);
+
+ $.post(this.opts.clipboardUploadUrl, postData,
$.proxy(function(data)
{
var json = (typeof data === 'string' ? $.parseJSON(data) : data);
@@ -4556,15 +5240,18 @@
{
var result = e.target.result;
var arr = result.split(",");
- var data = arr[1]; // raw base64
- var contentType = arr[0].split(";")[0].split(":")[1];
+ var postData = {
+ 'contentType': arr[0].split(";")[0].split(":")[1],
+ 'data': arr[1] // raw base64
+ };
+
if (this.opts.clipboardUpload)
{
- $.post(this.opts.clipboardUploadUrl, {
- contentType: contentType,
- data: data
- },
+ // append hidden fields
+ postData = this.pasteClipboardAppendFields(postData);
+
+ $.post(this.opts.clipboardUploadUrl, postData,
$.proxy(function(data)
{
var json = (typeof data === 'string' ? $.parseJSON(data) : data);
@@ -4595,21 +5282,26 @@
},
// BUFFER
- bufferSet: function(html)
+ bufferSet: function(selectionSave)
{
- if (html !== undefined) this.opts.buffer.push(html);
- else
+ if (selectionSave !== false)
{
this.selectionSave();
- this.opts.buffer.push(this.$editor.html());
+ }
+
+ this.opts.buffer.push(this.$editor.html());
+
+ if (selectionSave !== false)
+ {
this.selectionRemoveMarkers('buffer');
}
+
},
bufferUndo: function()
{
if (this.opts.buffer.length === 0)
{
- this.$editor.focus();
+ this.focusWithSaveScroll();
return;
}
@@ -4627,7 +5319,7 @@
{
if (this.opts.rebuffer.length === 0)
{
- this.$editor.focus();
+ this.focusWithSaveScroll();
return false;
}
@@ -4651,11 +5343,13 @@
observeLinks: function()
{
this.$editor.find('a').on('click', $.proxy(this.linkObserver, this));
+
this.$editor.on('click.redactor', $.proxy(function(e)
{
this.linkObserverTooltipClose(e);
}, this));
+
$(document).on('click.redactor', $.proxy(function(e)
{
this.linkObserverTooltipClose(e);
@@ -4669,13 +5363,31 @@
this.$editor.find('img').each($.proxy(function(i, elem)
{
if (this.browser('msie')) $(elem).attr('unselectable', 'on');
- this.imageResize(elem);
+
+ var parent = $(elem).parent();
+ if (!parent.hasClass('royalSlider') && !parent.hasClass('fotorama'))
+ {
+ this.imageResize(elem);
+ }
}, this));
+
+ // royalSlider and fotorama
+ this.$editor.find('.fotorama, .royalSlider').on('click', $.proxy(this.editGallery, this));
+
},
linkObserver: function(e)
{
var $link = $(e.target);
+
+ var parent = $(e.target).parent();
+ if (parent.hasClass('royalSlider') || parent.hasClass('fotorama'))
+ {
+ return;
+ }
+
+ if ($link.size() == 0 || $link[0].tagName !== 'A') return;
+
var pos = $link.offset();
if (this.opts.iframe)
{
@@ -4687,7 +5399,12 @@
var tooltip = $('');
var href = $link.attr('href');
- if (href.length > 24) href = href.substring(0,24) + '...';
+ if (href === undefined)
+ {
+ href = '';
+ }
+
+ if (href.length > 24) href = href.substring(0, 24) + '...';
var aLink = $('' + href + '').on('click', $.proxy(function(e)
{
@@ -4778,6 +5495,19 @@
var sel = this.getSelection();
if (!sel) return;
+ if (orgn.tagName == 'P' && orgn.innerHTML == '')
+ {
+ orgn.innerHTML = this.opts.invisibleSpace;
+ }
+
+ if (orgn.tagName == 'BR' && this.opts.linebreaks === false)
+ {
+ var par = $(this.opts.emptyHtml)[0];
+ $(orgn).replaceWith(par);
+ orgn = par;
+ focn = orgn;
+ }
+
var range = this.getRange();
range.setStart(orgn, orgo);
range.setEnd(focn, foco );
@@ -4881,6 +5611,33 @@
sel.removeAllRanges();
sel.addRange( range );
},
+ setCaretAfter: function(node)
+ {
+ this.$editor.focus();
+
+ node = node[0] || node;
+
+ var range = this.document.createRange()
+
+ var start = 1;
+ var end = -1;
+
+ range.setStart(node, start)
+ range.setEnd(node, end + 2)
+
+
+ var selection = this.window.getSelection()
+ var cursorRange = this.document.createRange()
+
+ var emptyElement = this.document.createTextNode('\u200B')
+ $(node).after(emptyElement)
+
+ cursorRange.setStartAfter(emptyElement)
+
+ selection.removeAllRanges()
+ selection.addRange(cursorRange)
+ $(emptyElement).remove();
+ },
getTextNodesIn: function (node)
{
var textNodes = [];
@@ -4904,7 +5661,11 @@
var el = false;
var sel = this.getSelection();
- if (sel && sel.rangeCount > 0) el = sel.getRangeAt(0).startContainer;
+ if (sel && sel.rangeCount > 0)
+ {
+ el = sel.getRangeAt(0).startContainer;
+ //el = sel.getRangeAt(0).commonAncestorContainer;
+ }
return this.isParentRedactor(el);
},
@@ -4952,6 +5713,12 @@
return newnodes;
},
+ isInlineNode: function(node)
+ {
+ if (node.nodeType != 1) return false;
+
+ return !this.rTestBlock.test(node.nodeName);
+ },
nodeTestBlocks: function(node)
{
return node.nodeType == 1 && this.rTestBlock.test(node.nodeName);
@@ -5105,7 +5872,10 @@
// SAVE & RESTORE
selectionSave: function()
{
- if (!this.isFocused()) this.$editor.focus();
+ if (!this.isFocused())
+ {
+ this.focusWithSaveScroll();
+ }
if (!this.opts.rangy)
{
@@ -5142,10 +5912,19 @@
{
var boundaryRange = range.cloneRange();
- boundaryRange.collapse(type);
+ try {
+ boundaryRange.collapse(type);
+ boundaryRange.insertNode(node);
+ boundaryRange.detach();
+ }
+ catch (e)
+ {
+ var html = this.opts.emptyHtml;
+ if (this.opts.linebreaks) html = ' ';
- boundaryRange.insertNode(node);
- boundaryRange.detach();
+ this.$editor.prepend(html);
+ this.focus();
+ }
},
selectionRestore: function(replace, remove)
{
@@ -5165,7 +5944,7 @@
}
else if (!this.isFocused())
{
- this.$editor.focus();
+ this.focusWithSaveScroll();
}
if (node1.length != 0 && node2.length != 0)
@@ -5232,6 +6011,8 @@
},
tableInsert: function()
{
+ this.bufferSet(false);
+
var rows = $('#redactor_table_rows').val(),
columns = $('#redactor_table_columns').val(),
$table_box = $(''),
@@ -5248,7 +6029,10 @@
$column = $('
' + this.opts.invisibleSpace + '
');
// set the focus to the first td
- if (i === 0 && z === 0) $column.append('' + this.opts.invisibleSpace + '');
+ if (i === 0 && z === 0)
+ {
+ $column.append('' + this.opts.invisibleSpace + '');
+ }
$($row).append($column);
}
@@ -5259,20 +6043,36 @@
$table_box.append($table);
var html = $table_box.html();
+ if (this.opts.linebreaks === false && this.browser('mozilla'))
+ {
+ html += '
' + this.opts.invisibleSpace + '
';
+ }
+
this.modalClose();
this.selectionRestore();
var current = this.getBlock() || this.getCurrent();
- if (current && current.tagName != 'BODY') $(current).after(html)
- else this.insertHtmlAdvanced(html, false);
+ if (current && current.tagName != 'BODY')
+ {
+ if (current.tagName == 'LI')
+ {
+ var current = $(current).closest('ul, ol');
+ }
+
+ $(current).after(html)
+ }
+ else
+ {
+ this.insertHtmlAdvanced(html, false);
+ }
this.selectionRestore();
var table = this.$editor.find('#table' + tableId);
this.buttonActiveObserver();
- table.find('span#selection-marker-1').remove();
+ table.find('span#selection-marker-1, inline#selection-marker-1').remove();
table.removeAttr('id');
this.sync();
@@ -5290,13 +6090,16 @@
},
tableDeleteRow: function()
{
- var $table = $(this.getParent()).closest('table');
+ var parent = this.getParent();
+ var $table = $(parent).closest('table');
+
+
if (!this.isParentRedactor($table)) return false;
if ($table.size() == 0) return false;
this.bufferSet();
- var $current_tr = $(this.getParent()).closest('tr');
+ var $current_tr = $(parent).closest('tr');
var $focus_tr = $current_tr.prev().length ? $current_tr.prev() : $current_tr.next();
if ($focus_tr.length)
{
@@ -5309,17 +6112,25 @@
$current_tr.remove();
this.selectionRestore();
+ $table.find('span#selection-marker-1').remove();
this.sync();
},
tableDeleteColumn: function()
{
- var $table = $(this.getParent()).closest('table');
+ var parent = this.getParent();
+ var $table = $(parent).closest('table');
+
if (!this.isParentRedactor($table)) return false;
if ($table.size() == 0) return false;
this.bufferSet();
- var $current_td = $(this.getParent()).closest('td');
+ var $current_td = $(parent).closest('td');
+ if (!($current_td.is('td')))
+ {
+ $current_td = $current_td.closest('td');
+ }
+
var index = $current_td.get(0).cellIndex;
// Set the focus correctly
@@ -5336,6 +6147,7 @@
}, this));
this.selectionRestore();
+ $table.find('span#selection-marker-1').remove();
this.sync();
},
tableAddHead: function()
@@ -5406,7 +6218,9 @@
},
tableAddColumn: function (type)
{
- var $table = $(this.getParent()).closest('table');
+ var parent = this.getParent();
+ var $table = $(parent).closest('table');
+
if (!this.isParentRedactor($table)) return false;
if ($table.size() == 0) return false;
@@ -5414,8 +6228,9 @@
var index = 0;
- var $current_tr = $(this.getParent()).closest('tr');
- var $current_td = $(this.getParent()).closest('td');
+ var current = this.getCurrent();
+ var $current_tr = $(current).closest('tr');
+ var $current_td = $(current).closest('td');
$current_tr.find('td').each($.proxy(function(i, elem)
{
@@ -5459,6 +6274,19 @@
var data = $('#redactor_insert_video_area').val();
data = this.cleanStripTags(data);
+ // parse if it is link on youtube & vimeo
+ var iframeStart = '';
+
+ if (data.match(reUrlYoutube))
+ {
+ data = data.replace(reUrlYoutube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
+ }
+ else if (data.match(reUrlVimeo))
+ {
+ data = data.replace(reUrlVimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
+ }
+
this.selectionRestore();
var current = this.getBlock() || this.getCurrent();
@@ -5470,6 +6298,7 @@
this.modalClose();
},
+
// LINK
linkShow: function()
{
@@ -5477,6 +6306,40 @@
var callback = $.proxy(function()
{
+ // Predefined links
+ if (this.opts.predefinedLinks !== false)
+ {
+ this.predefinedLinksStorage = {};
+ var that = this;
+ $.getJSON(this.opts.predefinedLinks, function(data)
+ {
+ var $select = $('#redactor-predefined-links');
+ $select .html('');
+ $.each(data, function(key, val)
+ {
+ that.predefinedLinksStorage[key] = val;
+ $select.append($('