fix(taBind): Add blankTest tests and seperate service

Author: SimeonC

lib/taBind.js

@@ -1,6 +1,23 @@
 angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'])
-.directive('taBind', ['taSanitize', '$timeout', '$window', '$document', 'taFixChrome', 'taBrowserTag', 'taSelection', 'taSelectableElements', 'taApplyCustomRenderers', 'taOptions',
-				function(taSanitize, $timeout, $window, $document, taFixChrome, taBrowserTag, taSelection, taSelectableElements, taApplyCustomRenderers, taOptions){
+.service('_taBlankTest', [function(){
+	var INLINETAGS_NONBLANK = /<(a|abbr|acronym|bdi|bdo|big|cite|code|del|dfn|img|ins|kbd|label|map|mark|q|ruby|rp|rt|s|samp|time|tt|var)[^>]*(>|$)/i;
+	return function(_defaultTest){
+		return function(_blankVal){
+			if(!_blankVal) return true;
+			_blankVal = _blankVal.toString();
+			var _firstTagIndex = _blankVal.indexOf('>');
+			if(_firstTagIndex === -1) return _blankVal.trim().length === 0;
+			_blankVal = _blankVal.trim().substring(_firstTagIndex, _firstTagIndex + 100);
+			// this regex is to match any number of whitespace only between two tags
+			if (_blankVal.length === 0 || _blankVal === _defaultTest || /^>(\s|&nbsp;)*<\/[^>]+>$/ig.test(_blankVal)) return true;
+			// this regex tests if there is a tag followed by some optional whitespace and some text after that
+			else if (/>\s*[^\s<]/i.test(_blankVal) || INLINETAGS_NONBLANK.test(_blankVal)) return false;
+			else return true;
+		};
+	};
+}])
+.directive('taBind', ['taSanitize', '$timeout', '$window', '$document', 'taFixChrome', 'taBrowserTag', 'taSelection', 'taSelectableElements', 'taApplyCustomRenderers', 'taOptions', '_taBlankTest',
+				function(taSanitize, $timeout, $window, $document, taFixChrome, taBrowserTag, taSelection, taSelectableElements, taApplyCustomRenderers, taOptions, _taBlankTest){
 	// Uses for this are textarea or input with ng-model and ta-bind='text'
 	// OR any non-form element with contenteditable="contenteditable" ta-bind="html|text" ng-model
 	return {
@@ -15,7 +32,6 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
 			var _lastKey;
 			var BLOCKED_KEYS = /^(9|19|20|27|33|34|35|36|37|38|39|40|45|112|113|114|115|116|117|118|119|120|121|122|123|144|145)$/i;
 			var UNDO_TRIGGER_KEYS = /^(8|13|32|46|59|61|107|109|186|187|188|189|190|191|192|219|220|221|222)$/i; // spaces, enter, delete, backspace, all punctuation
-			var INLINETAGS_NONBLANK = /<(a|abbr|acronym|bdi|bdo|big|cite|code|del|dfn|img|ins|kbd|label|map|mark|q|ruby|rp|rt|s|samp|time|tt|var)[^>]*>/i;
 
 			// defaults to the paragraph element, but we need the line-break or it doesn't allow you to type into the empty element
 			// non IE is '<p><br/></p>', ie is '<p></p>' as for once IE gets it correct...
@@ -39,16 +55,7 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
 						'<' + attrs.taDefaultWrap + '>&nbsp;</' + attrs.taDefaultWrap + '>';
 			}
 
-			var _blankTest = function(_blankVal){
-				var _firstTagIndex = _blankVal.indexOf('>');
-				if(_firstTagIndex === -1) return _blankVal.trim().length === 0;
-				_blankVal = _blankVal.trim().substring(_firstTagIndex, _firstTagIndex + 100);
-				// this regex is to match any number of whitespace only between two tags
-				if (_blankVal.length === 0 || _blankVal === _defaultTest || /^>(\s|&nbsp;)*<\/[^>]+>$/ig.test(_blankVal)) return true;
-				// this regex tests if there is a tag followed by some optional whitespace and some text after that
-				else if (/>\s*[^\s<]/i.test(_blankVal) || INLINETAGS_NONBLANK.test(_blankVal)) return false;
-				else return true;
-			};
+			var _blankTest = _taBlankTest(_defaultTest);
 
 			element.addClass('ta-bind');
 

test/taBind/taBind._taBlankTest.spec.js

@@ -0,0 +1,27 @@
+describe('taBind._taBlankTest', function () {
+	'use strict';
+	beforeEach(module('textAngular'));
+	afterEach(inject(function($document){
+		$document.find('body').html('');
+	}));
+	var testString = function(result){ return function(_str){
+		it(_str, inject(function (_taBlankTest) {
+			expect(_taBlankTest('<p><br></p>')(_str)).toBe(result);
+		}));
+	};};
+	
+	describe('should return true for', function () {
+		it('undefined', inject(function (_taBlankTest) {
+			expect(_taBlankTest('<p><br></p>')()).toBe(true);
+		}));
+		angular.forEach(['<p></p>','<p><br></p>',''], testString(true));
+	});
+	
+	describe('should return false for', function () {
+		angular.forEach(
+			['<p>test</p>','<p>Test Some<br></p>','Some Test','<p><img class="ta-insert-video" src="https://img.youtube.com/vi/sbQQKI1Fwo4/hqdefault.jpg" ta-insert-video="https://www.youtube.com/embed/sbQQKI1Fwo4" contenteditable="false" allowfullscreen="true" frameborder="0"><br></p>'],
+			testString(false)
+		);
+	});
+
+});

test/taBind/taBind.validation.spec.js

@@ -169,7 +169,7 @@ describe('taBind.validation', function () {
 
 		describe('should handle inline elements like img', function () {
 			beforeEach(function(){
-				$rootScope.html = '<pre><img src="test.jpg"/></pre>';
+				$rootScope.html = '<p><img src="test.jpg"/></p>';
 				$rootScope.$digest();
 			});
 			it('ng-required', function(){