From 4ee780ef0726120a86225f57299a816ff8f266fa Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Tue, 5 May 2015 16:01:46 +0300
Subject: [PATCH] JS move document/window/storage to kotlin.browser

---
 js/js.libraries/src/core/domExts.kt   |  1 -
 js/js.libraries/src/core/htmlDom.kt   |  4 ++--
 js/js.libraries/src/stdlib/browser.kt | 18 ++++++++++++------
 libraries/stdlib/test/js/JsDomTest.kt |  1 +
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/js/js.libraries/src/core/domExts.kt b/js/js.libraries/src/core/domExts.kt
index 2cfbbadc7b4..8831808283d 100644
--- a/js/js.libraries/src/core/domExts.kt
+++ b/js/js.libraries/src/core/domExts.kt
@@ -42,7 +42,6 @@ private class HTMLCollectionListView(val collection: HTMLCollection) : AbstractL
 }
 
 public fun HTMLCollection.asList(): List<HTMLElement> = HTMLCollectionListView(this)
-
 public fun HTMLCollection?.toElementList(): List<Element> = this?.asList() ?: emptyList()
 
 private class DOMTokenListView(val delegate: DOMTokenList) : AbstractList<String>() {
diff --git a/js/js.libraries/src/core/htmlDom.kt b/js/js.libraries/src/core/htmlDom.kt
index b2279477db8..1c0d5a50f40 100644
--- a/js/js.libraries/src/core/htmlDom.kt
+++ b/js/js.libraries/src/core/htmlDom.kt
@@ -3,11 +3,11 @@ package kotlin.js.dom.html
 import org.w3c.dom.*
 
 native
-deprecated("Use org.w3c.dom instead")
+deprecated("Use kotlin.browser instead")
 public val window: Window = noImpl
 
 native
-deprecated("Use org.w3c.dom instead")
+deprecated("Use kotlin.browser instead")
 public var document: HTMLDocument = noImpl
 
 deprecated("Use org.w3c.dom instead")
diff --git a/js/js.libraries/src/stdlib/browser.kt b/js/js.libraries/src/stdlib/browser.kt
index 53178d8b8c9..7e5e86c7d04 100644
--- a/js/js.libraries/src/stdlib/browser.kt
+++ b/js/js.libraries/src/stdlib/browser.kt
@@ -1,10 +1,16 @@
 package kotlin.browser
 
-import org.w3c.dom.Document
+import org.w3c.dom.*
 
-/**
- * Provides access to the current active browsers DOM for the currently visible page.
- */
-deprecated("use org.w3c.dom instead")
-native public var document: Document = noImpl
+native
+public val window: Window = noImpl
+
+native
+public val document: Document = noImpl
+
+native
+public val localStorage: Storage = noImpl
+
+native
+public val sessionStorage: Storage = noImpl
 
diff --git a/libraries/stdlib/test/js/JsDomTest.kt b/libraries/stdlib/test/js/JsDomTest.kt
index 8349bc82c1b..57ec600978d 100644
--- a/libraries/stdlib/test/js/JsDomTest.kt
+++ b/libraries/stdlib/test/js/JsDomTest.kt
@@ -1,6 +1,7 @@
 package test.js
 
 import kotlin.*
+import kotlin.browser.*
 import kotlin.dom.*
 import kotlin.test.*
 import org.w3c.dom.*