From 55def7f8ffa7497693d0e2959b55b7d4b6126afd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Mar 2012 20:46:06 +0400 Subject: [PATCH] More api hack for some web demo js examples. (by Natasha) --- js/js.libraries/src/html5/canvas.kt | 4 ++- .../src/org/jetbrains/k2js/config/Config.java | 25 ++++++++++--------- js/js.translator/testFiles/canvas_helper.js | 6 +++++ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/js/js.libraries/src/html5/canvas.kt b/js/js.libraries/src/html5/canvas.kt index 014de6b0cb2..af8f1b745fd 100644 --- a/js/js.libraries/src/html5/canvas.kt +++ b/js/js.libraries/src/html5/canvas.kt @@ -127,4 +127,6 @@ fun getContext() : Context = Context(); native fun getCanvas() : Canvas = Canvas(); native -fun getKotlinLogo() : HTMLImageElement = HTMLImageElement(); \ No newline at end of file +fun getKotlinLogo() : HTMLImageElement = HTMLImageElement(); +native +fun getImage(src: String) : HTMLImageElement = HTMLImageElement(); \ No newline at end of file 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 2d85c160eea..3ccbb8d307f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java +++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java @@ -32,18 +32,19 @@ public abstract class Config { @NotNull protected static final List LIB_FILE_NAMES = Arrays.asList( - "/core/annotations.kt", - "/jquery/common.kt", - "/jquery/ui.kt", - "/core/javautil.kt", - "/core/javalang.kt", - "/core/core.kt", - "/core/math.kt", - "/core/json.kt", - "/raphael/raphael.kt", - "/html5/canvas.kt", - "/html5/files.kt", - "/html5/image.kt" + "/core/annotations.kt", + "/jquery/common.kt", + "/jquery/ui.kt", + "/core/javautil.kt", + "/core/javalang.kt", + "/core/date.kt", + "/core/core.kt", + "/core/math.kt", + "/core/json.kt", + "/raphael/raphael.kt", + "/html5/canvas.kt", + "/html5/files.kt", + "/html5/image.kt" ); protected static final String LIBRARIES_LOCATION = "js/js.libraries/src"; diff --git a/js/js.translator/testFiles/canvas_helper.js b/js/js.translator/testFiles/canvas_helper.js index 651c3923710..eab312362ee 100644 --- a/js/js.translator/testFiles/canvas_helper.js +++ b/js/js.translator/testFiles/canvas_helper.js @@ -24,4 +24,10 @@ function getCanvas() { function getKotlinLogo() { return document.getElementsByTagName('img')[0]; +} + +function getImage(src) { + var image = document.createElement("img"); + image.src = src; + return image; } \ No newline at end of file