Fix(DOM): merged fix from Hike-zzz: fixing issue #616 #1174

textAngular · Jul 10, 2016 · 328cd69 · 328cd69
1 parent c2185a8
commit 328cd69
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/dist/textAngular-rangy.min.js b/dist/textAngular-rangy.min.js
diff --git a/dist/textAngular.js b/dist/textAngular.js
@@ -575,6 +575,9 @@ angular.module('textAngular.DOM', ['textAngular.factories'])
 								}
 							}
 						}
+						_nodes = _nodes.filter(function(value, index, self) {
+							return self.indexOf(value) === index;
+						});
 						if(angular.element(_nodes[0]).hasClass('ta-bind')){
 							$target = angular.element(options);
 							$target[0].innerHTML = _nodes[0].innerHTML;

diff --git a/dist/textAngular.min.js b/dist/textAngular.min.js
diff --git a/dist/textAngular.umd.js b/dist/textAngular.umd.js
@@ -1426,6 +1426,9 @@ angular.module('textAngular.DOM', ['textAngular.factories'])
 								}
 							}
 						}
+						_nodes = _nodes.filter(function(value, index, self) {
+							return self.indexOf(value) === index;
+						});
 						if(angular.element(_nodes[0]).hasClass('ta-bind')){
 							$target = angular.element(options);
 							$target[0].innerHTML = _nodes[0].innerHTML;

diff --git a/src/DOM.js b/src/DOM.js
@@ -175,6 +175,9 @@ angular.module('textAngular.DOM', ['textAngular.factories'])
 								}
 							}
 						}
+						_nodes = _nodes.filter(function(value, index, self) {
+							return self.indexOf(value) === index;
+						});
 						if(angular.element(_nodes[0]).hasClass('ta-bind')){
 							$target = angular.element(options);
 							$target[0].innerHTML = _nodes[0].innerHTML;

diff --git a/test/taExecCommand/taExecCommand.formatBlock.spec.js b/test/taExecCommand/taExecCommand.formatBlock.spec.js
@@ -77,6 +77,14 @@ describe('taExecCommand', function(){
 					expect($element.html()).toBe('<blockquote><p>Some <b>test</b> content</p><p><br></p><p>Some <b>test</b> content</p></blockquote>');
 					$element.remove();
 				}));
+				it('selection with multiple nested inline nodes', inject(function($document, taExecCommand, taSelection){
+					$element = angular.element('<div class="ta-bind"><p><i>Try</i><b>me!</b></p></div>');
+					$document.find('body').append($element);
+					taSelection.element = $element.find('p')[0];
+					taExecCommand()('formatBlock', false, '<BLOCKQUOTE>');
+					expect($element.html()).toBe('<blockquote><p><i>Try</i><b>me!</b></p></blockquote>');
+					$element.remove();
+				}));
 			});
 		});
 		describe('unwraps elements', function(){