2 files changed, 12 insertions, 5 deletions
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index fb2acbeb..f6a7c5aa 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -5,14 +5,22 @@
  * (c) 2010-2011 AngularJS http://angularjs.org
  * License: MIT
  */
-(function(window) {
+(function(window, document) {
 
   var filename = /^(.*\/)angular-bootstrap.js(#.*)?$/,
       scripts = document.getElementsByTagName("SCRIPT"),
+      autobind = scripts[scripts.length-1].getAttribute('ng:autobind'),
+      config,
       serverPath,
       match,
       globalVars = {};
 
+  if (autobind) {
+    config = {autobind: autobind};
+  } else {
+    config = (autobind == '') ? {autobind: true} : {}
+  }
+
   for(var j = 0; j < scripts.length; j++) {
     match = (scripts[j].src || "").match(filename);
     if (match) {
@@ -99,7 +107,7 @@
     // empty the cache to prevent mem leaks
     globalVars = {};
 
-    angularInit({autobind:true}, document);
+    angularInit(config, document);
   }
 
   if (window.addEventListener) {
@@ -108,5 +116,5 @@
     window.attachEvent('onload', onLoadListener);
   }
 
-})(window);
+})(window, document);
 
diff --git a/src/scenario/angular-bootstrap.js b/src/scenario/angular-bootstrap.js
index 35a98bda..a0012ff7 100644
--- a/src/scenario/angular-bootstrap.js
+++ b/src/scenario/angular-bootstrap.js
@@ -25,8 +25,7 @@
     try {
       if (previousOnLoad) previousOnLoad();
     } catch(e) {}
-    var config = angularJsConfig(document);
-    if (config.autotest) angular.scenario.setUpAndRun(config);
+    angular.scenario.setUpAndRun({});
   };
 
   addCSS("../../css/angular-scenario.css");