diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/script/dom/window.rs | 2 | ||||
-rw-r--r-- | src/components/script/script_task.rs | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 26cccc7f6d8..f935faa147c 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -111,7 +111,6 @@ pub struct TimerData { pub handle: i32, pub is_interval: bool, pub funval: JSVal, - pub args: ~[JSVal], } impl Window { @@ -248,7 +247,6 @@ impl Window { handle: handle, is_interval: is_interval, funval: callback, - args: ~[], }; let ScriptChan(ref chan) = chan; chan.send(FireTimerMsg(page_id, data)); diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index 44312b3312c..45bdedf456d 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -751,11 +751,7 @@ impl ScriptTask { window.get_mut().active_timers.remove(&timer_data.handle); } - let this_value = if timer_data.args.len() > 0 { - fail!("NYI") - } else { - window.reflector().get_jsobject() - }; + let this_value = window.reflector().get_jsobject(); // TODO: Support extra arguments. This requires passing a `*JSVal` array as `argv`. let rval = NullValue(); |