浏览代码

Move Lib.window/document into Browser as discussed.

Bruno Garcia 13 年之前
父节点
当前提交
55455fe9de
共有 2 个文件被更改,包括 31 次插入8 次删除
  1. 31 0
      std/js/Browser.hx
  2. 0 8
      std/js/Lib.hx

+ 31 - 0
std/js/Browser.hx

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C)2005-2012 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package js;
+
+class Browser {
+
+	public static var window(default,null) : js.html.DOMWindow = untyped __js__("typeof window != \"undefined\" ? window : null");
+	public static var document(default,null) : js.html.Document = untyped __js__("typeof window != \"undefined\" ? window.document : null");
+	public static var location(default,null) : js.html.Location = untyped __js__("typeof window != \"undefined\" ? window.location : null");
+	public static var navigator(default,null) : js.html.Navigator = untyped __js__("typeof window != \"undefined\" ? window.navigator : null");
+
+}

+ 0 - 8
std/js/Lib.hx

@@ -21,13 +21,8 @@
  */
 package js;
 
-import js.html.DOMWindow;
-import js.html.Document;
-
 class Lib {
 
-	public static var document : Document;
-	public static var window : DOMWindow;
 	static var onerror : String -> Array<String> -> Bool = null;
 
 	/**
@@ -53,10 +48,7 @@ class Lib {
 	}
 
 	static function __init__() {
-		if( untyped __js__("typeof document") != "undefined" )
-			document = untyped __js__("document");
 		if( untyped __js__("typeof window") != "undefined" ) {
-			window = untyped __js__("window");
 			(untyped window).onerror = function( msg, url, line ) {
 				var f = Lib.onerror;
 				if( f == null )