Swapped "$w." for "window." in window/timer.js.

thatcher · Nov 15, 2009 · 4629f67 · 4629f67
1 parent 9376070
commit 4629f67
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/dist/env.js b/dist/env.js
@@ -8569,7 +8569,7 @@ var convert_time = function(time) {
   return time;
 }
 
-window.setTimeout = function(fn, time){
+$w.setTimeout = function(fn, time){
   var num;
   time = convert_time(time);
   $timers.lock(function(){
@@ -8582,7 +8582,7 @@ window.setTimeout = function(fn, time){
         } catch (e) {
           $env.error(e);
         } finally {
-          window.clearInterval(num);
+          $w.clearInterval(num);
         }
       };
     } else {
@@ -8592,7 +8592,7 @@ window.setTimeout = function(fn, time){
         } catch (e) {
           $env.error(e);
         } finally {
-          window.clearInterval(num);
+          $w.clearInterval(num);
         }
       };
     }
@@ -8603,7 +8603,7 @@ window.setTimeout = function(fn, time){
   return num;
 };
 
-window.setInterval = function(fn, time){
+$w.setInterval = function(fn, time){
   time = convert_time(time);
   if ( time < 10 ) {
     time = 10;
@@ -8624,7 +8624,7 @@ window.setInterval = function(fn, time){
   return num;
 };
 
-window.clearInterval = window.clearTimeout = function(num){
+$w.clearInterval = $w.clearTimeout = function(num){
   //$log("clearing interval "+num);
   $timers.lock(function(){
     if ( $timers[num] ) {
@@ -8642,7 +8642,7 @@ window.clearInterval = window.clearTimeout = function(num){
 
 // FIX: make a priority queue ...
 
-window.$wait = $env.wait = $env.wait || function(wait) {
+$w.$wait = $env.wait = $env.wait || function(wait) {
   var delta_wait;
   if (wait < 0) {
     delta_wait = -wait;

diff --git a/dist/env.rhino.js b/dist/env.rhino.js
@@ -9199,7 +9199,7 @@ var convert_time = function(time) {
   return time;
 }
 
-window.setTimeout = function(fn, time){
+$w.setTimeout = function(fn, time){
   var num;
   time = convert_time(time);
   $timers.lock(function(){
@@ -9212,7 +9212,7 @@ window.setTimeout = function(fn, time){
         } catch (e) {
           $env.error(e);
         } finally {
-          window.clearInterval(num);
+          $w.clearInterval(num);
         }
       };
     } else {
@@ -9222,7 +9222,7 @@ window.setTimeout = function(fn, time){
         } catch (e) {
           $env.error(e);
         } finally {
-          window.clearInterval(num);
+          $w.clearInterval(num);
         }
       };
     }
@@ -9233,7 +9233,7 @@ window.setTimeout = function(fn, time){
   return num;
 };
 
-window.setInterval = function(fn, time){
+$w.setInterval = function(fn, time){
   time = convert_time(time);
   if ( time < 10 ) {
     time = 10;
@@ -9254,7 +9254,7 @@ window.setInterval = function(fn, time){
   return num;
 };
 
-window.clearInterval = window.clearTimeout = function(num){
+$w.clearInterval = $w.clearTimeout = function(num){
   //$log("clearing interval "+num);
   $timers.lock(function(){
     if ( $timers[num] ) {
@@ -9272,7 +9272,7 @@ window.clearInterval = window.clearTimeout = function(num){
 
 // FIX: make a priority queue ...
 
-window.$wait = $env.wait = $env.wait || function(wait) {
+$w.$wait = $env.wait = $env.wait || function(wait) {
   var delta_wait;
   if (wait < 0) {
     delta_wait = -wait;

diff --git a/src/window/timer.js b/src/window/timer.js
@@ -33,7 +33,7 @@ var convert_time = function(time) {
   return time;
 }
 
-window.setTimeout = function(fn, time){
+$w.setTimeout = function(fn, time){
   var num;
   time = convert_time(time);
   $timers.lock(function(){
@@ -46,7 +46,7 @@ window.setTimeout = function(fn, time){
         } catch (e) {
           $env.error(e);
         } finally {
-          window.clearInterval(num);
+          $w.clearInterval(num);
         }
       };
     } else {
@@ -56,7 +56,7 @@ window.setTimeout = function(fn, time){
         } catch (e) {
           $env.error(e);
         } finally {
-          window.clearInterval(num);
+          $w.clearInterval(num);
         }
       };
     }
@@ -67,7 +67,7 @@ window.setTimeout = function(fn, time){
   return num;
 };
 
-window.setInterval = function(fn, time){
+$w.setInterval = function(fn, time){
   time = convert_time(time);
   if ( time < 10 ) {
     time = 10;
@@ -88,7 +88,7 @@ window.setInterval = function(fn, time){
   return num;
 };
 
-window.clearInterval = window.clearTimeout = function(num){
+$w.clearInterval = $w.clearTimeout = function(num){
   //$log("clearing interval "+num);
   $timers.lock(function(){
     if ( $timers[num] ) {
@@ -106,7 +106,7 @@ window.clearInterval = window.clearTimeout = function(num){
 
 // FIX: make a priority queue ...
 
-window.$wait = $env.wait = $env.wait || function(wait) {
+$w.$wait = $env.wait = $env.wait || function(wait) {
   var delta_wait;
   if (wait < 0) {
     delta_wait = -wait;