Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Fixed problem that decodes text in first line #3

Open
yutosegoe wants to merge 4 commits into
base: fix/issue-1_treat-effective-characters
Choose a base branch
from
Open

Fixed problem that decodes text in first line #3

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38e532f
Fixed problem that decodes text in first line
yutosegoe Jul 19, 2019
7102b36
Fixed not to use template literals
yutosegoe Jul 23, 2019
4cd2705
avoid to prepend empty div element
ma2gedev Jan 23, 2020
0029e33
Merge pull request #4 from ma2gedev/fix/avoid-to-prepend-empty-div
typewriter Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 39 additions & 29 deletions dist/textAngular.umd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ angular.module('textAngular.factories', [])
tag: 'i'
}
];

var styleMatch = [];
for(var i = 0; i < convert_infos.length; i++){
var _partialStyle = '(' + convert_infos[i].property + ':\\s*(';
Expand All @@ -1119,7 +1119,7 @@ angular.module('textAngular.factories', [])
styleMatch.push(_partialStyle);
}
var styleRegexString = '(' + styleMatch.join('|') + ')';

function wrapNested(html, wrapTag) {
var depth = 0;
var lastIndex = 0;
Expand All @@ -1138,7 +1138,7 @@ angular.module('textAngular.factories', [])
angular.element(wrapTag)[0].outerHTML.substring(wrapTag.length) +
html.substring(lastIndex);
}

function transformLegacyStyles(html){
if(!html || !angular.isString(html) || html.length <= 0) return html;
var i;
Expand Down Expand Up @@ -1186,7 +1186,7 @@ angular.module('textAngular.factories', [])
else finalHtml += html.substring(lastIndex);
return finalHtml;
}

function transformLegacyAttributes(html){
if(!html || !angular.isString(html) || html.length <= 0) return html;
// replace all align='...' tags with text-align attributes
Expand Down Expand Up @@ -1215,7 +1215,7 @@ angular.module('textAngular.factories', [])
// return with remaining html
return finalHtml + html.substring(lastIndex);
}

return function taSanitize(unsafe, oldsafe, ignore){
// unsafe html should NEVER built into a DOM object via angular.element. This allows XSS to be inserted and run.
if ( !ignore ) {
Expand All @@ -1229,7 +1229,7 @@ angular.module('textAngular.factories', [])
// any exceptions (lets say, color for example) should be made here but with great care
// setup unsafe element for modification
unsafe = transformLegacyAttributes(unsafe);

var safe;
try {
safe = $sanitize(unsafe);
Expand All @@ -1238,9 +1238,9 @@ angular.module('textAngular.factories', [])
} catch (e){
safe = oldsafe || '';
}

// Do processing for <pre> tags, removing tabs and return carriages outside of them

var _preTags = safe.match(/(<pre[^>]*>.*?<\/pre[^>]*>)/ig);
var processedSafe = safe.replace(/(&#(9|10);)*/ig, '');
var re = /<pre[^>]*>.*?<\/pre[^>]*>/ig;
Expand Down Expand Up @@ -1567,39 +1567,39 @@ function($document, taDOM){
},
setSelection: function(el, start, end){
var range = rangy.createRange();

range.setStart(el, start);
range.setEnd(el, end);

rangy.getSelection().setSingleRange(range);
},
setSelectionBeforeElement: function (el){
var range = rangy.createRange();

range.selectNode(el);
range.collapse(true);

rangy.getSelection().setSingleRange(range);
},
setSelectionAfterElement: function (el){
var range = rangy.createRange();

range.selectNode(el);
range.collapse(false);

rangy.getSelection().setSingleRange(range);
},
setSelectionToElementStart: function (el){
var range = rangy.createRange();

range.selectNodeContents(el);
range.collapse(true);

rangy.getSelection().setSingleRange(range);
},
setSelectionToElementEnd: function (el){
var range = rangy.createRange();

range.selectNodeContents(el);
range.collapse(false);
if(el.childNodes && el.childNodes[el.childNodes.length - 1] && el.childNodes[el.childNodes.length - 1].nodeName === 'br'){
Expand All @@ -1625,7 +1625,7 @@ function($document, taDOM){
var frag = _document.createDocumentFragment();
var children = element[0].childNodes;
var isInline = true;

if(children.length > 0){
// NOTE!! We need to do the following:
// check for blockelements - if they exist then we have to split the current element in half (and all others up to the closest block element) and insert all children in-between.
Expand All @@ -1647,7 +1647,7 @@ function($document, taDOM){
// paste text of some sort
lastNode = frag = _document.createTextNode(html);
}

// Other Edge case - selected data spans multiple blocks.
if(isInline){
range.deleteContents();
Expand All @@ -1672,7 +1672,7 @@ function($document, taDOM){
secondParent = parent.cloneNode();
// split the nodes into two lists - before and after, splitting the node with the selection into 2 text nodes.
taDOM.splitNodes(parent.childNodes, parent, secondParent, range.startContainer, range.startOffset);

// Escape out of the inline tags like b
while(!VALIDELEMENTS.test(parent.nodeName)){
angular.element(parent).after(secondParent);
Expand All @@ -1687,12 +1687,12 @@ function($document, taDOM){
secondParent = parent.cloneNode();
taDOM.splitNodes(parent.childNodes, parent, secondParent, undefined, undefined, range.startOffset);
}

angular.element(parent).after(secondParent);
// put cursor to end of inserted content
range.setStartAfter(parent);
range.setEndAfter(parent);

if(/^(|<br(|\/)>)$/i.test(parent.innerHTML.trim())){
range.setStartBefore(parent);
range.setEndBefore(parent);
Expand All @@ -1718,7 +1718,7 @@ function($document, taDOM){
range.deleteContents();
}
}

range.insertNode(frag);
if(lastNode){
api.setSelectionToElementEnd(lastNode);
Expand All @@ -1740,35 +1740,35 @@ function($document, taDOM){
if(element.attr(attribute) !== undefined) resultingElements.push(element);
return resultingElements;
},

transferChildNodes: function(source, target){
// clear out target
target.innerHTML = '';
while(source.childNodes.length > 0) target.appendChild(source.childNodes[0]);
return target;
},

splitNodes: function(nodes, target1, target2, splitNode, subSplitIndex, splitIndex){
if(!splitNode && isNaN(splitIndex)) throw new Error('taDOM.splitNodes requires a splitNode or splitIndex');
var startNodes = document.createDocumentFragment();
var endNodes = document.createDocumentFragment();
var index = 0;

while(nodes.length > 0 && (isNaN(splitIndex) || splitIndex !== index) && nodes[0] !== splitNode){
startNodes.appendChild(nodes[0]); // this removes from the nodes array (if proper childNodes object.
index++;
}

if(!isNaN(subSplitIndex) && subSplitIndex >= 0 && nodes[0]){
startNodes.appendChild(document.createTextNode(nodes[0].nodeValue.substring(0, subSplitIndex)));
nodes[0].nodeValue = nodes[0].nodeValue.substring(subSplitIndex);
}
while(nodes.length > 0) endNodes.appendChild(nodes[0]);

taDOM.transferChildNodes(startNodes, target1);
taDOM.transferChildNodes(endNodes, target2);
},

transferNodeAttributes: function(source, target){
for(var i = 0; i < source.attributes.length; i++) target.setAttribute(source.attributes[i].name, source.attributes[i].value);
return target;
Expand Down Expand Up @@ -1982,6 +1982,16 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'

var _ensureContentWrapped = function(value) {
if (_blankTest(value)) return value;

// guard to prepend empty div element
if (!value.startsWith('<' + attrs.taDefaultWrap + '>')) {
// wrap first line in default tag not to detect as text
value = value.replace(
new RegExp('(.*?)(<' + attrs.taDefaultWrap + '>.*)'),
'<' + attrs.taDefaultWrap + '>$1</' + attrs.taDefaultWrap + '>$2'
);
}

var domTest = angular.element("<div>" + value + "</div>");
//console.log('domTest.children().length():', domTest.children().length);
if (domTest.children().length === 0) {
Expand Down