fix(textAngularSetup) Fix clear formatting functionality when used wi…

…th ta-default-wrap=br textAngular#1374 - thanks to damien-otis for this fix.
kileha3 · Nov 10, 2016 · 0e45059 · 0e45059
1 parent ca7c53e
commit 0e45059
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/DOM.js b/src/DOM.js
@@ -190,11 +190,16 @@ angular.module('textAngular.DOM', ['textAngular.factories'])
 			// nothing left to do..
 			return element;
 		}
-		var $target = angular.element(options);
-		$target[0].innerHTML = element.innerHTML;
-		element.parentNode.insertBefore($target[0], element);
-		element.parentNode.removeChild(element);
-		return $target;
+		if (options === '<br>'){
+			return element;
+		}
+		else {
+			var $target = angular.element(options);
+			$target[0].innerHTML = element.innerHTML;
+			element.parentNode.insertBefore($target[0], element);
+			element.parentNode.removeChild(element);
+			return $target;
+		}
 	};
 	return function(taDefaultWrap, topNode){
 		// NOTE: here we are dealing with the html directly from the browser and not the html the user sees.
@@ -311,8 +316,10 @@ angular.module('textAngular.DOM', ['textAngular.factories'])
                 }
             }catch(e){}
 			//console.log('************** selectedElement:', selectedElement);
+			/* istanbul ignore if: */
+			if (!selectedElement){return;}
 			var $selected = angular.element(selectedElement);
-			var tagName = (selectedElement.tagName && selectedElement.tagName.toLowerCase()) ||
+			var tagName = (selectedElement && selectedElement.tagName && selectedElement.tagName.toLowerCase()) ||
 				/* istanbul ignore next: */ "";
 			if(command.toLowerCase() === 'insertorderedlist' || command.toLowerCase() === 'insertunorderedlist'){
 				var selfTag = taBrowserTag((command.toLowerCase() === 'insertorderedlist')? 'ol' : 'ul');

diff --git a/src/textAngularSetup.js b/src/textAngularSetup.js
@@ -714,7 +714,8 @@ angular.module('textAngularSetup', [])
 			// check if in list. If not in list then use formatBlock option
 			if(possibleNodes[0] && possibleNodes[0].tagName.toLowerCase() !== 'li' &&
 				possibleNodes[0].tagName.toLowerCase() !== 'ol' &&
-				possibleNodes[0].tagName.toLowerCase() !== 'ul') {
+				possibleNodes[0].tagName.toLowerCase() !== 'ul' &&
+				possibleNodes[0].getAttribute("contenteditable") !== "true") {
 				this.$editor().wrapSelection("formatBlock", "default");
 			}
 			restoreSelection();