Revision d105d886

View differences:

src/main.js
72 72
  function Scaffold (source, filename, module) {
73 73
    // wrap the source in a strange function 
74 74
    var source = "function (__filename) {" 
75
               + "  var on_load;"
75
               + "  var onLoad;"
76 76
               + "  var exports = this;"
77 77
               + "  var require = this.__require;"
78 78
               + "  var include = this.__include;"
79 79
               +    source 
80
               + "  this.__on_load = on_load;"
80
               + "  this.__onLoad = onLoad;"
81 81
               + "};"
82 82
               ;
83 83
    // returns the function       
84 84
    var compiled = node.compile(source, filename);
85 85

  
86
    if (module.__on_load) {
86
    if (module.__onLoad) {
87 87
      //node.debug("<"+ filename+"> has onload! this is bad");
88 88
    }
89 89

  
......
103 103
    this.filename = filename;
104 104
    this.module  = module;
105 105
    this.subs    = module.__subs;
106
    this.on_load = module.__on_load;
106
    this.onLoad = module.__onLoad;
107 107

  
108 108
    // remove these references so they don't get exported.
109 109
    delete module.__subs;
110
    delete module.__on_load;
110
    delete module.__onLoad;
111 111
    delete module.__require;
112 112
    delete module.__include;
113 113
  }
......
125 125

  
126 126
      function finish() {
127 127
        //node.debug("finish 1 load <" + filename + ">");
128
        if (scaffold.on_load instanceof Function) {
128
        if (scaffold.onLoad instanceof Function) {
129 129
          //node.debug("foo bar <" + filename + ">"); 
130
          scaffold.on_load(); 
130
          scaffold.onLoad(); 
131 131
        }
132 132
        //node.debug("finish 2 load <" + filename + ">");
133 133

  
test/test-file-open.js
1 1
include("mjsunit");
2 2
var assert_count = 0;
3 3

  
4
function onload () {
5
  var fixtures = node.path.join(script.dirname, "fixtures");
4
function onLoad () {
5
  var dirname = node.path.dirname(__filename);
6
  var fixtures = node.path.join(dirname, "fixtures");
6 7
  var x = node.path.join(fixtures, "x.txt");
7 8

  
8 9
  file = new File;
test/test-setTimeout.js
1 1
include("mjsunit");
2 2

  
3
function on_load () {
3
function onLoad () {
4 4
  assertInstanceof(setTimeout, Function);
5 5
  var starttime = new Date;
6 6

  
test/test-test.js
1 1
include("mjsunit");
2 2
var a = require("fixtures/a");
3 3

  
4
function on_load () {
4
function onLoad () {
5 5
  assertFalse(false, "testing the test program.");
6 6

  
7 7
  assertInstanceof(a.A, Function);

Also available in: Unified diff