kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haxe_ver is a number

Browse Source
This commit is contained in:
Valentin Lemière
2016-08-30 09:41:32 +02:00
parent 69206a502a
commit 67489f4f26
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lime/_backend/html5/HTML5Window.hx
View File

@@ -44,7 +44,7 @@ class HTML5Window {
public var canvas:CanvasElement;
public var div:DivElement;
public var element:#if (haxe_ver >= "3.2") Element #else HtmlElement #end;
public var element:#if (haxe_ver >= 3.2) Element #else HtmlElement #end;
#if stats
public var stats:Dynamic;
#end

2
lime/app/Config.hx
View File

@@ -28,7 +28,7 @@ typedef WindowConfig = {
@:optional var depthBuffer:Bool;
@:optional var display:Int;
#if (js && html5)
@:optional var element:#if (haxe_ver >= "3.2") js.html.Element #else js.html.HtmlElement #end;
@:optional var element:#if (haxe_ver >= 3.2) js.html.Element #else js.html.HtmlElement #end;
#end
@:optional var fullscreen:Bool;
@:optional var hardware:Bool;

12
lime/audio/HTML5AudioContext.hx
View File

@@ -56,7 +56,7 @@ class HTML5AudioContext {
}
#if (haxe_ver < "3.2")
#if (haxe_ver < 3.2)
public function getAudioDecodedByteCount (buffer:AudioBuffer):Int {
#if (js && html5)
@@ -103,7 +103,7 @@ class HTML5AudioContext {
}
#if (haxe_ver < "3.2")
#if (haxe_ver < 3.2)
public function getController (buffer:AudioBuffer):Dynamic /*MediaController*/ {
#if (js && html5)
@@ -210,7 +210,7 @@ class HTML5AudioContext {
}
#if (haxe_ver < "3.2")
#if (haxe_ver < 3.2)
public function getInitialTime (buffer:AudioBuffer):Float {
#if (js && html5)
@@ -242,7 +242,7 @@ class HTML5AudioContext {
}
#if (haxe_ver < "3.2")
#if (haxe_ver < 3.2)
public function getMediaGroup (buffer:AudioBuffer):String {
#if (js && html5)
@@ -491,7 +491,7 @@ class HTML5AudioContext {
}
#if (haxe_ver < "3.2")
#if (haxe_ver < 3.2)
public function setController (buffer:AudioBuffer, value:Dynamic /*MediaController*/):Void {
#if (js && html5)
@@ -545,7 +545,7 @@ class HTML5AudioContext {
}
#if (haxe_ver < "3.2")
#if (haxe_ver < 3.2)
public function setMediaGroup (buffer:AudioBuffer, value:String):Void {
#if (js && html5)

2
lime/project/WindowData.hx
View File

@@ -25,7 +25,7 @@ typedef WindowData = {
@:optional var stencilBuffer:Bool;
@:optional var title:String;
#if (js && html5)
@:optional var element:#if (haxe_ver >= "3.2") js.html.Element #else js.html.HtmlElement #end;
@:optional var element:#if (haxe_ver >= 3.2) js.html.Element #else js.html.HtmlElement #end;
#end
}

4
lime/system/System.hx
View File

@@ -10,7 +10,7 @@ import flash.Lib;
#end
#if (js && html5)
#if (haxe_ver >= "3.2")
#if (haxe_ver >= 3.2)
import js.html.Element;
#else
import js.html.HtmlElement;
@@ -49,7 +49,7 @@ class System {
@:keep @:expose("lime.embed")
public static function embed (element:Dynamic, width:Null<Int> = null, height:Null<Int> = null, background:String = null, assetsPrefix:String = null) {
var htmlElement:#if (haxe_ver >= "3.2") Element #else HtmlElement #end = null;
var htmlElement:#if (haxe_ver >= 3.2) Element #else HtmlElement #end = null;
if (Std.is (element, String)) {

2
lime/text/Font.hx
View File

@@ -124,7 +124,7 @@ class Font {
}
public function getGlyphs (characters:String = #if (display && haxe_ver < "3.2") "" #else "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^`'\"/\\&*()[]{}<>|:;_-+=?,. " #end):Array<Glyph> {
public function getGlyphs (characters:String = #if (display && haxe_ver < 3.2) "" #else "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^`'\"/\\&*()[]{}<>|:;_-+=?,. " #end):Array<Glyph> {
#if ((cpp || neko || nodejs) && !macro)
var glyphs:Dynamic = lime_font_get_glyph_indices (src, characters);