Prevent .toLowerCase() error and add new angular valid selector prefixes

ramonvictor · Oct 22, 2015 · 694c2f7 · ramonvictor · Oct 22, 2015 · stramel
1 parent fe852ca
commit 694c2f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/find-selectors.js b/lib/find-selectors.js
@@ -28,7 +28,7 @@ FindSelectors.prototype.parseFileContent = function() {
 
 FindSelectors.prototype.eachNodeCheck = function(node, selectors) {
 	if (node.type == 'CallExpression' && node.callee.object &&
-		node.callee.object.name.toLowerCase() === 'by') {
+		node.callee.object.name && node.callee.object.name.toLowerCase() === 'by') {
 		var lineInfo = node.arguments[0].loc.start;
 		var lineAndColumn = lineInfo.line + ':' + lineInfo.column;
 

diff --git a/lib/find-view-matches.js b/lib/find-view-matches.js
@@ -57,10 +57,18 @@ function loopSelectors(selectors, content) {
 }
 
 function attrSelector(attr, value) {
-	return [
-		'[ng-', attr, '="', value, '"], ',
-		'[data-ng-', attr, '="', value, '"]'
-	].join('');
+	// 'ng:' excluded, since it's not a `cheerio` valid selector.
+	var ngPrefixes = [ 'ng-', 'ng_', 'data-ng-', 'x-ng-' ];
+	var output = [];
+
+	for (var i = 0; i < ngPrefixes.length; i++) {
+		output.push(
+			'[' + ngPrefixes[i] + attr + '="' + value+ '"]' +
+			(i === (ngPrefixes.length - 1) ? '' : ', ')
+		);
+	}
+
+	return output.join('');
 }
 
 function prefixSelector(prefix, value) {