Merge branch 'master' of github.com:angular/angular.js into future

1 files changed, 2 insertions, 4 deletions

diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index 90e1104e..1f03b8a3 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-bootstrap.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(angularJsConfig(document));
   };
 
 })(window.onload);