Merge pull request #89 from jerel/bugfix/invalid-regex

Fixed regex that resulted in an invalid range in older browsers
emberjs · Sep 4, 2015 · 1e2bc3e · 1e2bc3e
2 parents 9fd8128 + a88ce02
commit 1e2bc3e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/addon/lib/system/inflector.js b/addon/lib/system/inflector.js
@@ -3,8 +3,8 @@ import Ember from 'ember';
 var capitalize = Ember.String.capitalize;
 
 var BLANK_REGEX = /^\s*$/;
-var LAST_WORD_DASHED_REGEX = /([\w/-]+[_/-\s])([a-z\d]+$)/;
-var LAST_WORD_CAMELIZED_REGEX = /([\w/-\s]+)([A-Z][a-z\d]*$)/;
+var LAST_WORD_DASHED_REGEX = /([\w/-]+[_/\s-])([a-z\d]+$)/;
+var LAST_WORD_CAMELIZED_REGEX = /([\w/\s-]+)([A-Z][a-z\d]*$)/;
 var CAMELIZED_REGEX = /[A-Z][a-z\d]*$/;
 
 function loadUncountable(rules, uncountable) {