aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2010-09-23 13:53:38 +0200
committerMisko Hevery2010-09-23 13:53:38 +0200
commit27868f17ded5e668aad17739cecd228dc3c87219 (patch)
tree0f8e3a9b7080dc4820cc93f7d892578da34c16fa
parent0d5407bc1e976f1f9908d01cfdf848b6c212d135 (diff)
downloadangular.js-27868f17ded5e668aad17739cecd228dc3c87219.tar.bz2
cleanup underscore.js form rakefile
-rw-r--r--Rakefile10
-rw-r--r--src/scenario/bootstrap.js5
2 files changed, 2 insertions, 13 deletions
diff --git a/Rakefile b/Rakefile
index 1af9e303..bf5caaee 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,15 +6,6 @@ desc 'Generate Externs'
task :compile_externs do
out = File.new("externs.js", "w")
- out.write("function _(){};\n")
- file = File.new("lib/underscore/underscore.js", "r")
- while (line = file.gets)
- if line =~ /^\s*_\.(\w+)\s*=.*$/
- out.write("_.#{$1}=function(){};\n")
- end
- end
- file.close
-
out.write("function jQuery(){};\n")
file = File.new("lib/jquery/jquery-1.4.2.js", "r")
while (line = file.gets)
@@ -32,7 +23,6 @@ end
desc 'Compile Scenario'
task :compile_scenario do
concat = %x(cat \
- lib/underscore/underscore.js \
lib/jquery/jquery-1.4.2.js \
src/scenario/angular.prefix \
src/Angular.js \
diff --git a/src/scenario/bootstrap.js b/src/scenario/bootstrap.js
index 694d0e97..f74305c3 100644
--- a/src/scenario/bootstrap.js
+++ b/src/scenario/bootstrap.js
@@ -25,13 +25,12 @@
};
window.onload = function(){
- _.defer(function(){
+ setTimeout(function(){
$scenarioRunner.run(jQuery(window.document.body));
- });
+ }, 0);
(onLoadDelegate||function(){})();
};
addCSS("../../css/angular-scenario.css");
- addScript("../../lib/underscore/underscore.js");
addScript("../../lib/jquery/jquery-1.4.2.js");
addScript("Runner.js");
addScript("../Angular.js");