Externalized XHTML detection, fixed tests

akella · Nov 19, 2012 · fa4042d · fa4042d
1 parent bfb1e5c
commit fa4042d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/javascript/actionUtils.js b/javascript/actionUtils.js
@@ -278,13 +278,22 @@ emmet.define('actionUtils', function(require, _) {
 				 	var profile = require('resources').getVariable('profile');
 				 	if (!profile) { // no forced profile, guess from content
 					 	// html or xhtml?
-				 		profile = editor.getContent().search(/<!DOCTYPE[^>]+XHTML/i) != -1 ? 'xhtml': 'html';
+				 		profile = this.isXHTML(editor) ? 'xhtml': 'html';
 				 	}
 
 				 	return profile;
 			}
 
 			return 'xhtml';
+		},
+
+		/**
+		 * Tries to detect if current document is XHTML one.
+		 * @param {IEmmetEditor} editor
+		 * @returns {Boolean}
+		 */
+		isXHTML: function(editor) {
+			return editor.getContent().search(/<!DOCTYPE[^>]+XHTML/i) != -1;
 		}
 	};
 });
diff --git a/javascript/unittest/tests/actions.js b/javascript/unittest/tests/actions.js
@@ -408,7 +408,7 @@
 	test('Wrap With Abbreviation', function() {
 		var wrap = function(abbr, content) {
 			content = emmet.require('utils').escapeText(content);
-			return emmet.require('wrapWithAbbreviation').wrap(abbr, content);
+			return emmet.require('wrapWithAbbreviation').wrap(abbr, content, 'html', 'plain');
 		};
 
 		editorStub.replaceContent('<br${0} />');

diff --git a/javascript/unittest/tests/expandAbbreviation.js b/javascript/unittest/tests/expandAbbreviation.js
@@ -32,7 +32,12 @@
 
 	function runTest() {
 		var args = _.toArray(arguments);
-		var result = emmet.expandAbbreviation.apply(emmet, _.initial(args));
+		var params = _.initial(args);
+		if (!params[2]) {
+			params[2] = 'plain';
+		}
+
+		var result = emmet.expandAbbreviation.apply(emmet, params);
 		result = emmet.require('tabStops').processText(result, {
 			escape: function(ch) {
 				return ch;