aboutsummaryrefslogtreecommitdiffstats
path: root/src/scenario/bootstrap.js
diff options
context:
space:
mode:
authorMisko Hevery2010-10-19 15:34:58 -0700
committerMisko Hevery2010-10-19 15:56:53 -0700
commit01c7abab35dbdee711c54875424b388f8631a3c0 (patch)
tree00a4adee508a9e854881f7ecea5e779fb6d48a80 /src/scenario/bootstrap.js
parente7e894a2e36e042be6d62af56b0f3126f4e4fc77 (diff)
downloadangular.js-01c7abab35dbdee711c54875424b388f8631a3c0.tar.bz2
Fix browser triggering in scenario to always do native events.
- Also fixed angular.suffix for scenarios - refactored click() to browserTrigger() - Fixed Rakefile with CSS and jQuery
Diffstat (limited to 'src/scenario/bootstrap.js')
-rw-r--r--src/scenario/bootstrap.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/scenario/bootstrap.js b/src/scenario/bootstrap.js
index 014c636d..4661bfb2 100644
--- a/src/scenario/bootstrap.js
+++ b/src/scenario/bootstrap.js
@@ -10,7 +10,7 @@
}
}
})();
-
+
function addScript(path) {
document.write('<script type="text/javascript" src="' + prefix + path + '"></script>');
}
@@ -46,6 +46,11 @@
addCSS("../../css/angular-scenario.css");
addScript("../../lib/jquery/jquery-1.4.2.js");
+ document.write(
+ '<script type="text/javascript">' +
+ 'var _jQuery = jQuery.noConflict(true);' +
+ '</script>'
+ );
addScript("../angular-bootstrap.js");
addScript("Scenario.js");
@@ -61,7 +66,6 @@
// Create the runner (which also sets up the global API)
document.write(
'<script type="text/javascript">' +
- 'var _jQuery = jQuery.noConflict(true);' +
'var $scenario = new angular.scenario.Runner(window);' +
'</script>'
);