fix(taSanitize): merge taPreSatitize to taSanitize (#424)

textAngular · Dec 12, 2014 · e3c9cf6 · e3c9cf6
1 parent 91b16c8
commit e3c9cf6
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/src/textAngular.js b/src/textAngular.js
@@ -234,7 +234,7 @@ angular.module('textAngular.factories', [])
 		return $html[0].innerHTML;
 	};
 	return taFixChrome;
-}).factory('taPreSanitize', function() {
+}).factory('taSanitize', ['$sanitize', function taSanitizeFactory($sanitize){
 
 	var convert_info = {
 		'font-weight': {
@@ -276,22 +276,15 @@ angular.module('textAngular.factories', [])
 		});
 	}
 
-	return function(unsafe){
-
-		try {
-			var jq_container = angular.element('<div>' + unsafe + '</div>');
-			fixChildren( jq_container );
-			unsafe = jq_container.html();
-		} catch (e) {
-		}
-
-		return unsafe;
-	};
-}).factory('taSanitize', ['$sanitize', 'taPreSanitize', function taSanitizeFactory($sanitize, taPreSanitize){
 	return function taSanitize(unsafe, oldsafe, ignore){
 
 		if ( !ignore ) {
-			unsafe = taPreSanitize(unsafe);
+			try {
+				var jq_container = angular.element('<div>' + unsafe + '</div>');
+				fixChildren( jq_container );
+				unsafe = jq_container.html();
+			} catch (e) {
+			}
 		}
 
 		// unsafe and oldsafe should be valid HTML strings