From ee1e7d59068b94f15ca4882604d9d8649a3710cb Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Fri, 1 Jun 2012 08:38:27 +0100
Subject: [PATCH] attempt to fix the build - whoops, sorry again :)

---
 js/js.libraries/src/jquery/common.kt             |  2 +-
 .../k2js/test/semantics/StdLibToJSTest.java      | 16 ++++++++++++++--
 .../src/org/jetbrains/k2js/config/Config.java    | 11 +++++------
 libraries/tools/kotlin-js-library/pom.xml        |  5 +++++
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/js/js.libraries/src/jquery/common.kt b/js/js.libraries/src/jquery/common.kt
index a8e5d565ea5..962a8be81fb 100644
--- a/js/js.libraries/src/jquery/common.kt
+++ b/js/js.libraries/src/jquery/common.kt
@@ -1,6 +1,6 @@
 package js.jquery;
 
-import org.w3c.dom.Element
+import js.dom.core.Element
 
 native
 class JQuery() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
index 42873c5478e..e46d16a5dd7 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
@@ -17,6 +17,7 @@
 package org.jetbrains.k2js.test.semantics;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.js.K2JSCompiler;
@@ -29,6 +30,7 @@ import org.jetbrains.k2js.test.SingleFileTranslationTest;
 import java.io.File;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  */
@@ -58,10 +60,20 @@ public final class StdLibToJSTest extends SingleFileTranslationTest {
             files.add(new File(stdlibDir, file).getPath());
         }
 
+        Set<String> ignoreFiles = Sets.newHashSet(
+                "/jquery/common.kt",
+                "/jquery/ui.kt",
+                "/dom/domcore.kt",
+                "/dom/html/htmlcore.kt",
+                "/dom/html5/canvas.kt",
+                "/dom/html/window.kt");
+
         // lets add the standard JS library files
         for (String libFileName : Config.LIB_FILE_NAMES) {
-            System.out.println("Compiling " + libFileName);
-            files.add(Config.LIBRARIES_LOCATION + libFileName);
+            if (!ignoreFiles.contains(libFileName)) {
+                System.out.println("Compiling " + libFileName);
+                files.add(Config.LIBRARIES_LOCATION + libFileName);
+            }
         }
 
         // now lets try invoke the compiler
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index 821deb82755..6f34e12eb7a 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -64,12 +64,11 @@ public abstract class Config {
             "/raphael/raphael.kt",
             "/stdlib/JUMaps.kt",
             "/stdlib/browser.kt",
-            "/core/dom.kt"
-            // TODO doesn't compile yet
-            // "/dom/domcore.kt",
-            // "/dom/html/htmlcore.kt",
-            //"/dom/html5/canvas.kt"
-            //"/dom/html/window.kt"
+            "/core/dom.kt",
+            "/dom/domcore.kt",
+            "/dom/html/htmlcore.kt",
+            "/dom/html5/canvas.kt",
+            "/dom/html/window.kt"
     );
 
     public static final String LIBRARIES_LOCATION = "js/js.libraries/src";
diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml
index 94c3ac06c2a..e049205fe20 100644
--- a/libraries/tools/kotlin-js-library/pom.xml
+++ b/libraries/tools/kotlin-js-library/pom.xml
@@ -33,6 +33,11 @@
                                     <fileset dir="${kotlin-js-lib-srcdir}">
                                         <exclude name="core/dom/core.kt"/>
                                         <exclude name="html5/localstorage.kt"/>
+                                        <exclude name="jquery/common.kt"/>
+                                        <exclude name="jquery/ui.kt"/>
+                                        <exclude name="dom/html/htmlcore.kt"/>
+                                        <exclude name="dom/html5/canvas.kt"/>
+                                        <exclude name="dom/html/window.kt"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${basedir}/target/generated-js-library/kotlin">