diff options
| author | Igor Minar | 2010-10-19 17:07:20 -0700 | 
|---|---|---|
| committer | Igor Minar | 2010-10-20 14:48:35 -0700 | 
| commit | 644c8514c54518e350b0c2a0e17a9af09ed340f9 (patch) | |
| tree | 49d81c852f8db977dc1955d3feda501930dd95b7 /src | |
| parent | 2115db69035c5993533fe7a3825e64cf6e9068ad (diff) | |
| download | angular.js-644c8514c54518e350b0c2a0e17a9af09ed340f9.tar.bz2 | |
extract and test regexp that identifies angular script tag
Diffstat (limited to 'src')
| -rw-r--r-- | src/Angular.js | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Angular.js b/src/Angular.js index b97c4226..97ca7663 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -48,7 +48,8 @@ var _undefined        = undefined,      angularFormatter  = extensionMap(angular, 'formatter'),      angularService    = extensionMap(angular, 'service'),      angularCallbacks  = extensionMap(angular, 'callbacks'), -    nodeName; +    nodeName, +    rngScript         = /^(|.*\/)angular(-.*)?(\.min)?.js(\?[^#]*)?(#(.*))?$/;  function foreach(obj, iterator, context) {    var key; @@ -422,8 +423,7 @@ function angularInit(config){  }  function angularJsConfig(document, config) { -  var filename = /^(.*)angular(-([^\/]*))?.js(\?[^#]*)?(#(.*))?$/, -      scripts = document.getElementsByTagName("script"), +  var scripts = document.getElementsByTagName("script"),        match;    config = extend({      base_url: '', @@ -431,7 +431,7 @@ function angularJsConfig(document, config) {      ie_compat_id: 'ng-ie-compat'    }, config);    for(var j = 0; j < scripts.length; j++) { -    match = (scripts[j].src || "").match(filename); +    match = (scripts[j].src || "").match(rngScript);      if (match) {        config.base_url = match[1];        extend(config, parseKeyValue(match[6]));  | 
