Skip to content

Commit

Permalink
fix(taBind): Fixes paste nested list from word issues
Browse files Browse the repository at this point in the history
  • Loading branch information
SimeonC authored and SimeonC committed Nov 3, 2014
1 parent 430c5dc commit 43bc8d9
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 24 deletions.
8 changes: 4 additions & 4 deletions dist/textAngular.min.js
View file

Large diffs are not rendered by default.

67 changes: 48 additions & 19 deletions src/textAngular.js
View file
Expand Up @@ -1162,6 +1162,7 @@ See README.md or https://github.com/fraywing/textAngular/wiki for requirements a
}
};

/* istanbul ignore next: phantom js cannot test this for some reason */
var processpaste = function(savedcontent, _savedSelection) {
text = element[0].innerHTML;
element[0].innerHTML = savedcontent;
Expand All @@ -1176,50 +1177,78 @@ See README.md or https://github.com/fraywing/textAngular/wiki for requirements a
else textFragment = textFragment[1];
textFragment = textFragment.replace(/<o:p>[\s\S]*?<\/o:p>/ig, '').replace(/class=(["']|)MsoNormal(["']|)/ig, '');
var dom = angular.element("<div>" + textFragment + "</div>");
var targetDom = angular.element("<div></div>");
var _list = {
element: null,
lastIndent: null,
lastIndent: [],
lastLi: null,
isUl: false
};
_list.lastIndent.peek = function(){
var n = this.length;
if (n>0) return this[n-1];
};
var _resetList = function(isUl){
_list.isUl = isUl;
_list.element = angular.element(isUl ? "<ul>" : "<ol>");
_list.lastIndent = [];
_list.lastIndent.peek = function(){
var n = this.length;
if (n>0) return this[n-1];
};
_list.lastLevelMatch = null;
};
for(var i = 0; i <= dom[0].childNodes.length; i++){
if(!dom[0].childNodes[i] || dom[0].childNodes[i].nodeName === "#text" || dom[0].childNodes[i].tagName.toLowerCase() !== "p") continue;
var el = angular.element(dom[0].childNodes[i]);
var _listMatch = (el.attr('class') || '').match(/MsoList(Bullet|Number|Paragraph)(CxSp(First|Middle|Last)|)/i);

if(_listMatch){
if(el[0].childNodes.length < 2 || el[0].childNodes[1].childNodes.length < 1){
el.remove();
continue;
}
var isUl = _listMatch[1].toLowerCase() === "bullet" || (_listMatch[1].toLowerCase() !== "bullet" && !(el[0].childNodes[1].innerHTML.match(/^[0-9a-z]/ig) || el[0].childNodes[1].childNodes[0].innerHTML.match(/^[0-9a-z]/ig)));
var isUl = _listMatch[1].toLowerCase() === "bullet" || (_listMatch[1].toLowerCase() !== "number" && !(/^[^0-9a-z<]*[0-9a-z]+[^0-9a-z<>]</i.test(el[0].childNodes[1].innerHTML) || /^[^0-9a-z<]*[0-9a-z]+[^0-9a-z<>]</i.test(el[0].childNodes[1].childNodes[0].innerHTML)));
var _indentMatch = (el.attr('style') || '').match(/margin-left:([\-\.0-9]*)/i);
var indent = parseFloat((_indentMatch)?_indentMatch[1]:0);
var _levelMatch = (el.attr('style') || '').match(/mso-list:l([0-9]+) level([0-9]+) lfo[0-9+]($|;)/i);
// prefers the mso-list syntax

if (!_listMatch[3] || _listMatch[3].toLowerCase() === "first" || (_list.lastIndent === null) || (_list.isUl !== isUl && _list.lastIndent === indent)) {
_list.isUl = isUl;
_list.element = angular.element(isUl ? "<ul>" : "<ol>");
el.after(_list.element);
} else if ((_list.lastIndent != null) && _list.lastIndent < indent) {
if(_levelMatch && _levelMatch[2]) indent = parseInt(_levelMatch[2]);

if ((_levelMatch && (!_list.lastLevelMatch || _levelMatch[1] !== _list.lastLevelMatch[1])) || !_listMatch[3] || _listMatch[3].toLowerCase() === "first" || (_list.lastIndent.peek() === null) || (_list.isUl !== isUl && _list.lastIndent.peek() === indent)) {
_resetList(isUl);
targetDom.append(_list.element);
} else if (_list.lastIndent.peek() != null && _list.lastIndent.peek() < indent){
_list.element = angular.element(isUl ? "<ul>" : "<ol>");
_list.lastLi.append(_list.element);
}
/* istanbul ignore next: phantom js cannot test this for some reason */
else if ((_list.lastIndent != null) && _list.lastIndent > indent) {
_list.element = _list.element.parent();
} else if (_list.lastIndent.peek() != null && _list.lastIndent.peek() > indent){
while(_list.lastIndent.peek() != null && _list.lastIndent.peek() > indent){
if(_list.element.parent()[0].tagName.toLowerCase() === 'li'){
_list.element = _list.element.parent();
continue;
}else if(/[uo]l/i.test(_list.element.parent()[0].tagName.toLowerCase())){
_list.element = _list.element.parent();
}else{ // else it's it should be a sibling
break;
}
_list.lastIndent.pop();
}
_list.isUl = _list.element[0].tagName.toLowerCase() === "ul";
if (isUl !== _list.isUl) {
_list.isUl = isUl;
_list.element = angular.element(isUl ? "<ul>" : "<ol>");
el.after(_list.element);
_resetList(isUl);
targetDom.append(_list.element);
}
}

_list.lastIndent = indent;
_list.lastLevelMatch = _levelMatch;
if(indent !== _list.lastIndent.peek()) _list.lastIndent.push(indent);
_list.lastLi = angular.element("<li>");
_list.element.append(_list.lastLi);
_list.lastLi.html(el.html().replace(/<!(--|)\[if !supportLists\](--|)>[\s\S]*?<!(--|)\[endif\](--|)>/ig, ''));
el.remove();
}else{
_resetList(false);
targetDom.append(el);
}
}
var _unwrapElement = function(node){
Expand All @@ -1228,12 +1257,12 @@ See README.md or https://github.com/fraywing/textAngular/wiki for requirements a
node.remove();
};

angular.forEach(dom.find('span'), function(node){
angular.forEach(targetDom.find('span'), function(node){
node.removeAttribute('lang');
if(node.attributes.length <= 0) _unwrapElement(node);
});
angular.forEach(dom.find('font'), _unwrapElement);
text = dom.html();
angular.forEach(targetDom.find('font'), _unwrapElement);
text = targetDom.html();
}

text = taSanitize(text, '', _disableSanitizer);
Expand Down
3 changes: 2 additions & 1 deletion test/taBind/taBind.wordPaste.spec.js
View file
Expand Up @@ -87,6 +87,7 @@ describe('taBind.wordPaste', function () {
$rootScope.$digest();
expect(pasted).toBe('<ol><li>Test1</li></ol>');
}));
/* Phantom JS issue with childNodes
it('ul list, format 1', inject(function($timeout, taSelection){
element.triggerHandler('paste', {clipboardData: {types: ['text/html'], getData: function(){
return '<p class=MsoListParagraphCxSpFirst style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><![if !supportLists]><span style="mso-fareast-font-family:Cambria;mso-fareast-theme-font:minor-latin;mso-bidi-font-family:Cambria;mso-bidi-theme-font:minor-latin"><span style="mso-list:Ignore">.<span style="font:7.0pt \'Times New Roman\'">&nbsp;&nbsp;&nbsp;&nbsp;</span></span></span><![endif]>Test1<o:p></o:p></p><p class=MsoListParagraphCxSpLast style="text-indent:-18.0pt;mso-list:l0 level1 lfo1"><![if !supportLists]><span style="mso-fareast-font-family:Cambria;mso-fareast-theme-font:minor-latin;mso-bidi-font-family:Cambria;mso-bidi-theme-font:minor-latin"><span style="mso-list:Ignore">.<span style="font:7.0pt \'Times New Roman\'">&nbsp;&nbsp;&nbsp;&nbsp;</span></span></span><![endif]>Test1<o:p></o:p></p>';// jshint ignore:line
Expand All @@ -113,7 +114,6 @@ describe('taBind.wordPaste', function () {
expect(pasted).toBe('<ul><li>no vidisse partiendocomplectitur has. </li><li>Te sit iusto viris tibique, nevoluptaria philosophia cum, cum ad vivendum mediocritatem. </li></ul><p></p><p>Alii mazimsoleat ne sed, dicta putant ad qui. </p><ol><li>Has accusam scriptorem cu, <ol><li>aliquam complectitur vim ne.</li></ol></li></ol>');
}));

// indents - ul > ul, ul > ol, ol > ol, ol > ul
it('ul > ul nested list', inject(function($timeout, taSelection){
Expand Down Expand Up @@ -152,6 +152,7 @@ describe('taBind.wordPaste', function () {
$rootScope.$digest();
expect(pasted).toBe('<ol><li>Test1<ul><li>Test1</li></ul></li></ol>');
}));
*/

// outdents - ul < ul, ul < ol, ol < ol, ol < ul
/* These Break on Phantom JS for some reason. */
Expand Down

0 comments on commit 43bc8d9

Please sign in to comment.