From 8db917849abde810460d5478064ec1cb95b0604e Mon Sep 17 00:00:00 2001 From: "sh8281.kim" Date: Tue, 12 Nov 2013 15:20:41 +0900 Subject: [PATCH 1/2] impl window self --- src/components/script/dom/window.rs | 7 ++++++- src/test/html/content/test_window.html | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/test/html/content/test_window.html diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index b4a804464f5..25ea828a39e 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -223,13 +223,18 @@ impl Window { let global = WindowBinding::Wrap(cx, ptr::null(), win); unsafe { - do "window".to_c_str().with_ref |name| { + let fns = ["window","self"]; + for str in fns.iter() { + do (*str).to_c_str().with_ref |name| { JS_DefineProperty(cx, global, name, RUST_OBJECT_TO_JSVAL(global), Some(GetJSClassHookStubPointer(PROPERTY_STUB) as JSPropertyOp), Some(GetJSClassHookStubPointer(STRICT_PROPERTY_STUB) as JSStrictPropertyOp), JSPROP_ENUMERATE); + } + } + } win } diff --git a/src/test/html/content/test_window.html b/src/test/html/content/test_window.html new file mode 100644 index 00000000000..f532929a124 --- /dev/null +++ b/src/test/html/content/test_window.html @@ -0,0 +1,13 @@ + + + + + + + + + From 853bcba0d1758ee92fb3bf4975e582c910d28a16 Mon Sep 17 00:00:00 2001 From: "sh8281.kim" Date: Thu, 14 Nov 2013 13:44:02 +0900 Subject: [PATCH 2/2] fix indent & name --- src/components/script/dom/window.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 25ea828a39e..dbf6236fdc6 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -223,14 +223,14 @@ impl Window { let global = WindowBinding::Wrap(cx, ptr::null(), win); unsafe { - let fns = ["window","self"]; - for str in fns.iter() { + let fn_names = ["window","self"]; + for str in fn_names.iter() { do (*str).to_c_str().with_ref |name| { - JS_DefineProperty(cx, global, name, - RUST_OBJECT_TO_JSVAL(global), - Some(GetJSClassHookStubPointer(PROPERTY_STUB) as JSPropertyOp), - Some(GetJSClassHookStubPointer(STRICT_PROPERTY_STUB) as JSStrictPropertyOp), - JSPROP_ENUMERATE); + JS_DefineProperty(cx, global, name, + RUST_OBJECT_TO_JSVAL(global), + Some(GetJSClassHookStubPointer(PROPERTY_STUB) as JSPropertyOp), + Some(GetJSClassHookStubPointer(STRICT_PROPERTY_STUB) as JSStrictPropertyOp), + JSPROP_ENUMERATE); } }