From 1b768b84439e725010acc943ebfda462e49d3704 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 29 Jul 2010 12:50:14 -0700
Subject: refactored $location service so that it correctly updates under all
 conditions

---
 src/angular-bootstrap.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/angular-bootstrap.js')

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);
-- 
cgit v1.2.3


From 03aac8b0ab17a9e8a41c5794f1e838315875051a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 29 Jul 2010 15:26:10 -0700
Subject: fix broken build, fix #autobind and css loading

---
 src/angular-bootstrap.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/angular-bootstrap.js')

diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index e055371a..1f03b8a3 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 (function(previousOnLoad){
-  var filename = /(.*)\/angular-(.*).js(#.*)?/,
+  var filename = /^(.*)\/angular-bootstrap.js(#.*)?$/,
       scripts = document.getElementsByTagName("SCRIPT"),
       serverPath,
       match;
@@ -61,7 +61,7 @@
     try {
       if (previousOnLoad) previousOnLoad();
     } catch(e) {}
-    angularInit(parseKeyValue(angularJsConfig(document)));
+    angularInit(angularJsConfig(document));
   };
 
 })(window.onload);
-- 
cgit v1.2.3