From d11b0a617c0eead91e2a36a9fe844541392f5d53 Mon Sep 17 00:00:00 2001
From: pTalanov <Pavel.Talanov@jetbrains.com>
Date: Tue, 5 Jun 2012 16:46:52 +0400
Subject: [PATCH] WebDemoCanvas test files synched with actual version in WD

---
 .../k2js/test/semantics/WebDemoCanvasExamplesTest.java   | 2 +-
 .../testFiles/webDemoCanvasExamples/cases/Fancy lines.kt | 5 +++--
 .../webDemoCanvasExamples/cases/Traffic light.kt         | 9 ++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoCanvasExamplesTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoCanvasExamplesTest.java
index 838a05f7c32..89e34bc1ade 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoCanvasExamplesTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoCanvasExamplesTest.java
@@ -42,7 +42,7 @@ public final class WebDemoCanvasExamplesTest extends SingleFileTranslationTest {
     }
 
     public void testFancyLines() throws Exception {
-        doTest("Fancy lines.kt", "window");
+        doTest("Fancy lines.kt", "$");
     }
 
     public void testTrafficLight() throws Exception {
diff --git a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Fancy lines.kt b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Fancy lines.kt
index 6e6389f8723..2bf75ef0a5b 100644
--- a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Fancy lines.kt	
+++ b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Fancy lines.kt	
@@ -8,9 +8,10 @@ package fancylines
 
 import js.dom.html5.*
 import js.dom.html.window
+import js.jquery.*
 
 fun main(args: Array<String>) {
-    window.onload = {
+    jq {
         FancyLines().run()
     }
 }
@@ -63,4 +64,4 @@ class FancyLines() {
         window.setInterval({line()}, 40);
         window.setInterval({blank()}, 100);
     }
-}
\ No newline at end of file
+}
diff --git a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt
index 111d3c4c6d8..35c31895899 100644
--- a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt	
+++ b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt	
@@ -28,9 +28,15 @@ val context: CanvasContext
 
 val PATH_TO_IMAGES = "http://kotlin-demo.jetbrains.com/static/images/canvas/"
 
+
+
+var _state: CanvasState? = null
 val state: CanvasState
     get() {
-        return CanvasState(canvas)
+        if (_state == null) {
+            _state = CanvasState(canvas)
+        }
+        return _state!!
     }
 
 val colors: Colors
@@ -430,6 +436,7 @@ class CanvasState(val canvas: HTMLCanvasElement) {
         }
         return Vector(e.pageX, e.pageY) - offset
     }
+
     fun draw() {
         clear()
         for (shape in shapes) {