Merge branch 'tleruitte-master'

Author: subhaze

AngularJS-sublime-package.py

@@ -313,7 +313,7 @@ def add_indexed_directives(self):
 		indexed_attrs = [
 			tuple([
 				'ngDir_' + self.definitionToDirective(directive) + '\tAngularJS',
-				self.definitionToDirective(directive)+'="$1"$0'
+				('data-' if self.settings.get('enable_data_prefix') else '') + self.definitionToDirective(directive)+'="$1"$0'
 			]) for directive in indexes if re.match('directive:', directive[0])
 		]
 		return list(set(indexed_attrs))
@@ -388,9 +388,9 @@ def on_query_completions(self, view, prefix, locations):
 				return jscompletions.get(('module'), ng.get_current_project_indexes())
 			return jscompletions.in_string_completions(prefix, ng.get_current_project_indexes())
 
-		if(viewlocation.at_html_attribute(view, 'ng-controller', locations)):
+		if(viewlocation.at_html_attribute(view, ('data-' if ng.settings.get('enable_data_prefix') else '') + 'ng-controller', locations)):
 			return jscompletions.get(('controller'), ng.get_current_project_indexes())
-		if(viewlocation.at_html_attribute(view, 'ng-app', locations)):
+		if(viewlocation.at_html_attribute(view, ('data-' if ng.settings.get('enable_data_prefix') else '') + 'ng-app', locations)):
 			return jscompletions.get(('module'), ng.get_current_project_indexes())
 		if(view.score_selector(_scope, ng.settings.get('filter_scope'))):
 			return ng.filter_completions()

viewlocation.py

@@ -24,9 +24,9 @@ def at_html_attribute(view, attribute, locations):
 	check_attribute = ''
 	view_point = locations[0]
 	char = ''
-	while(char != ' ' and view_point > -1):
+	while(not char.isspace() and view_point > -1):
 		char = view.substr(view_point)
-		if(char != ' '):
+		if(not char.isspace()):
 			check_attribute += char
 		view_point -= 1
 	check_attribute = check_attribute[::-1]