From 6f3a757a37cf26f358220c52ff7db2ae56f31642 Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Tue, 19 Oct 2010 21:53:16 -0700
Subject: Angular should look for angular-ie-compat file at the right location

The location should be based on the base path of the angular script
and the version identifier of the angular script.

ex: angular.js -> angular-ie-compat.js
    js/angular-0.9.0.min.js -> js/angular-ie-compat-0.9.0.js
---
 src/Angular.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Angular.js b/src/Angular.js
index 97ca7663..e17c143e 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -49,7 +49,7 @@ var _undefined        = undefined,
     angularService    = extensionMap(angular, 'service'),
     angularCallbacks  = extensionMap(angular, 'callbacks'),
     nodeName,
-    rngScript         = /^(|.*\/)angular(-.*)?(\.min)?.js(\?[^#]*)?(#(.*))?$/;
+    rngScript         = /^(|.*\/)angular(-.*?)?(\.min)?.js(\?[^#]*)?(#(.*))?$/;
 
 function foreach(obj, iterator, context) {
   var key;
@@ -426,14 +426,13 @@ function angularJsConfig(document, config) {
   var scripts = document.getElementsByTagName("script"),
       match;
   config = extend({
-    base_url: '',
-    ie_compat: 'angular-ie-compat.js',
     ie_compat_id: 'ng-ie-compat'
   }, config);
   for(var j = 0; j < scripts.length; j++) {
     match = (scripts[j].src || "").match(rngScript);
     if (match) {
       config.base_url = match[1];
+      config.ie_compat = match[1] + 'angular-ie-compat' + (match[2] || '') + '.js';
       extend(config, parseKeyValue(match[6]));
       eachAttribute(jqLite(scripts[j]), function(value, name){
         if (/^ng:/.exec(name)) {
-- 
cgit v1.2.3