Skip to content

Commit

Permalink
WIP: got the jquery 1.4.1 specs passing-ish, but the output is messed…
Browse files Browse the repository at this point in the history
… up; not sure if it's only running one spec or if this is an event problem

  - removed the envjs-specific vendor/js-env.jar and went back to using the vendor/js.jar (regular Rhino)
  - had to drop Rhino down from normal optimization to opt level -1 to handle the htmlparser code in env.js
  - added an Envjs.wait() before loading jQuery and other libraries
  • Loading branch information
karnowski committed Mar 5, 2010
1 parent 0758974 commit a9dbdfb
Show file tree
Hide file tree
Showing 6 changed files with 8,189 additions and 7,097 deletions.
2 changes: 1 addition & 1 deletion lib/blue_ridge.rb
Expand Up @@ -6,7 +6,7 @@ def self.plugin_prefix
end

def self.rhino_command
"java -Dblue.ridge.prefix=\"#{plugin_prefix}\" -jar #{plugin_prefix}/vendor/env-js.jar -w -debug"
"java -Dblue.ridge.prefix=\"#{plugin_prefix}\" -jar #{plugin_prefix}/vendor/js.jar -w -debug -opt -1"
end

def self.test_runner_command
Expand Down
4 changes: 3 additions & 1 deletion lib/test_runner.js
Expand Up @@ -79,7 +79,9 @@ if(BlueRidge.loaded != true) {
loadInlineScript: function(){},
log: function(){}
});


Envjs.wait();

require(BLUE_RIDGE_VENDOR_PREFIX + "jquery-1.4.1.js");
require(BLUE_RIDGE_VENDOR_PREFIX + "jquery.fn.js");
require(BLUE_RIDGE_VENDOR_PREFIX + "jquery.print.js");
Expand Down
7 changes: 7 additions & 0 deletions vendor/README
@@ -0,0 +1,7 @@
env.rhino.js:
* Version: 1.2.0.2
* Modifications: removed the Env.js header log message

js.jar:
* Version: (not sure)
* Origin: pulled from the "rhino" directory from env.js (v1.2.0.2)
Binary file removed vendor/env-js.jar
Binary file not shown.

0 comments on commit a9dbdfb

Please sign in to comment.