fix(taExecCommand): Fix List conversion bug.

Fixes #399
textAngular · Nov 27, 2014 · d97842c · d97842c
1 parent f9d7e42
commit d97842c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/dist/textAngular.min.js b/dist/textAngular.min.js
diff --git a/lib/DOM.js b/lib/DOM.js
@@ -99,6 +99,8 @@ angular.module('textAngular.DOM', ['textAngular.factories'])
 									if(_nodes[i].tagName.toLowerCase() === 'li') continue;
 									else if(_nodes[i].tagName.toLowerCase() === 'ol' || _nodes[i].tagName.toLowerCase() === 'ul'){
 										html += $n[0].innerHTML; // if it's a list, add all it's children
+									}else if(_nodes[i].tagName.toLowerCase() === 'span' && (_nodes[i].childNodes[0].tagName.toLowerCase() === 'ol' || _nodes[i].childNodes[0].tagName.toLowerCase() === 'ul')){
+										html += $n[0].childNodes[0].innerHTML; // if it's a list, add all it's children
 									}else{
 										html += '<' + taBrowserTag('li') + '>' + $n[0].innerHTML + '</' + taBrowserTag('li') + '>';
 									}

diff --git a/src/textAngular.js b/src/textAngular.js
@@ -382,6 +382,8 @@ angular.module('textAngular.DOM', ['textAngular.factories'])
 									if(_nodes[i].tagName.toLowerCase() === 'li') continue;
 									else if(_nodes[i].tagName.toLowerCase() === 'ol' || _nodes[i].tagName.toLowerCase() === 'ul'){
 										html += $n[0].innerHTML; // if it's a list, add all it's children
+									}else if(_nodes[i].tagName.toLowerCase() === 'span' && (_nodes[i].childNodes[0].tagName.toLowerCase() === 'ol' || _nodes[i].childNodes[0].tagName.toLowerCase() === 'ul')){
+										html += $n[0].childNodes[0].innerHTML; // if it's a list, add all it's children
 									}else{
 										html += '<' + taBrowserTag('li') + '>' + $n[0].innerHTML + '</' + taBrowserTag('li') + '>';
 									}

diff --git a/test/taExecCommand/taExecCommand.lists.spec.js b/test/taExecCommand/taExecCommand.lists.spec.js
@@ -181,7 +181,7 @@ describe('taExecCommand', function(){
 				}));
 			});
 		});
-		describe('list to other', function(){
+		describe('list to other/list', function(){
 			var element;
 			describe('li selected', function(){
 				it('from ol', inject(function(taSelection, taExecCommand){
@@ -198,6 +198,34 @@ describe('taExecCommand', function(){
 				}));
 			});
 			describe('list selected', function(){
+				describe('edge mixed case', function(){
+					it('to ol', inject(function(taSelection, taExecCommand){
+						element = angular.element('<div class="ta-bind"><ol><li>To the List!</li></ol><span><ul><li>To the List!</li></ul></span></div>');
+						taSelection.element = element[0];
+						taExecCommand()('insertorderedlist', false, null);
+						expect(element.html()).toBe('<ol><li>To the List!</li><li>To the List!</li></ol>');
+					}));
+					it('to ul', inject(function(taSelection, taExecCommand){
+						element = angular.element('<div class="ta-bind"><ol><li>To the List!</li></ol><span><ul><li>To the List!</li></ul></span></div>');
+						taSelection.element = element[0];
+						taExecCommand()('insertunorderedlist', false, null);
+						expect(element.html()).toBe('<ul><li>To the List!</li><li>To the List!</li></ul>');
+					}));
+				});
+				describe('mixed as child of ta-bind', function(){
+					it('to ol', inject(function(taSelection, taExecCommand){
+						element = angular.element('<div class="ta-bind"><ol><li>To the List!</li></ol><ul><li>To the List!</li></ul></div>');
+						taSelection.element = element[0];
+						taExecCommand()('insertorderedlist', false, null);
+						expect(element.html()).toBe('<ol><li>To the List!</li><li>To the List!</li></ol>');
+					}));
+					it('to ul', inject(function(taSelection, taExecCommand){
+						element = angular.element('<div class="ta-bind"><ol><li>To the List!</li></ol><ul><li>To the List!</li></ul></div>');
+						taSelection.element = element[0];
+						taExecCommand()('insertunorderedlist', false, null);
+						expect(element.html()).toBe('<ul><li>To the List!</li><li>To the List!</li></ul>');
+					}));
+				});
 				describe('from ol', function(){
 					describe('as child of ta-bind', function(){
 						it('to default', inject(function(taSelection, taExecCommand){