diff options
| author | Misko Hevery | 2010-07-29 12:50:14 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-07-29 12:54:13 -0700 |
| commit | 1b768b84439e725010acc943ebfda462e49d3704 (patch) | |
| tree | 06476962f7116e8c10ddb35d17c5bd3038528aaa /src/angular-bootstrap.js | |
| parent | 6bd8006edcbfe1dc1be8cb865fbcfe25157fe117 (diff) | |
| download | angular.js-1b768b84439e725010acc943ebfda462e49d3704.tar.bz2 | |
refactored $location service so that it correctly updates under all conditions
Diffstat (limited to 'src/angular-bootstrap.js')
| -rw-r--r-- | src/angular-bootstrap.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js index 90e1104e..e055371a 100644 --- a/src/angular-bootstrap.js +++ b/src/angular-bootstrap.js @@ -22,16 +22,14 @@ * THE SOFTWARE. */ (function(previousOnLoad){ - var filename = /(.*)\/angular-(.*).js(#(.*))?/, + var filename = /(.*)\/angular-(.*).js(#.*)?/, scripts = document.getElementsByTagName("SCRIPT"), serverPath, - config, match; for(var j = 0; j < scripts.length; j++) { match = (scripts[j].src || "").match(filename); if (match) { serverPath = match[1]; - config = match[4]; } } @@ -63,7 +61,7 @@ try { if (previousOnLoad) previousOnLoad(); } catch(e) {} - angularInit(parseKeyValue(config)); + angularInit(parseKeyValue(angularJsConfig(document))); }; })(window.onload); |
