Skip to content

Commit e5721e8

Browse files
ianharriganianharrigan
committed
4.2
1 parent 4d120b6 commit e5721e8

File tree

10 files changed

+45
-45
lines changed

10 files changed

+45
-45
lines changed

‎haxe/ui/backend/ComponentImpl.hx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class ComponentImpl extends ComponentBase {
101101
}
102102

103103
private override function get_isNativeScroller():Bool {
104-
if (Std.is(this, ScrollView) && cast(this, Component).native == true) {
104+
if ((this is ScrollView) && cast(this, Component).native == true) {
105105
return true;
106106
}
107107
return false;
@@ -120,7 +120,7 @@ class ComponentImpl extends ComponentBase {
120120
private override function handleCreate(native:Bool) {
121121
var newElement = null;
122122
if (native == true) {
123-
if (Std.is(this, ScrollView)) { // special case for scrollview
123+
if ((this is ScrollView)) { // special case for scrollview
124124
_nativeElement = new NativeElement(cast this);
125125
if (element == null) {
126126
element = _nativeElement.create();
@@ -156,7 +156,7 @@ class ComponentImpl extends ComponentBase {
156156
}
157157

158158
if (newElement == null) {
159-
if (Std.is(this, ScrollView)) {
159+
if ((this is ScrollView)) {
160160
_nativeElement = null;
161161
if (element == null) {
162162
element = Browser.document.createDivElement();
@@ -173,7 +173,7 @@ class ComponentImpl extends ComponentBase {
173173
newElement = Browser.document.createDivElement();
174174
newElement.classList.add("haxeui-component");
175175

176-
if (Std.is(this, Image)) {
176+
if ((this is Image)) {
177177
newElement.style.boxSizing = "initial";
178178
}
179179

@@ -221,7 +221,7 @@ class ComponentImpl extends ComponentBase {
221221
element.style.top = HtmlUtils.px(top);
222222
}
223223

224-
if (Std.is(this, TableView) && left != null && top != null && cast(this, TableView).native == true) {
224+
if ((this is TableView) && left != null && top != null && cast(this, TableView).native == true) {
225225
var c:Component = cast(this, Component);
226226
var h = c.findComponent(Header);
227227
h.element.style.left = '${HtmlUtils.px(h.screenLeft)}';
@@ -239,7 +239,7 @@ class ComponentImpl extends ComponentBase {
239239
return;
240240
}
241241

242-
if (Std.is(this, VerticalProgress)) { // this is a hack for chrome
242+
if ((this is VerticalProgress)) { // this is a hack for chrome
243243
if (element.style.getPropertyValue("transform-origin") != null && element.style.getPropertyValue("transform-origin").length > 0) {
244244
var tw = width;
245245
var th = height;
@@ -298,9 +298,9 @@ class ComponentImpl extends ComponentBase {
298298
private override function handleClipRect(value:Rectangle) {
299299
var c:Component = cast(this, Component);
300300
var parent:Component = c.parentComponent;
301-
if (value != null && parent != null && (parent._nativeElement == null || Std.is(c, Header))) {
301+
if (value != null && parent != null && (parent._nativeElement == null || (c is Header))) {
302302
element.style.clip = 'rect(${HtmlUtils.px(value.top)},${HtmlUtils.px(value.right)},${HtmlUtils.px(value.bottom)},${HtmlUtils.px(value.left)})';
303-
if (Std.is(this, Header) && parent.native == true) {
303+
if ((this is Header) && parent.native == true) {
304304
if (element.style.position != "fixed") {
305305
element.style.position = "fixed";
306306
}
@@ -397,21 +397,21 @@ class ComponentImpl extends ComponentBase {
397397
setCursor(style.cursor);
398398

399399
if (style.filter != null) {
400-
if (Std.is(style.filter[0], DropShadow)) {
400+
if ((style.filter[0] is DropShadow)) {
401401
var dropShadow:DropShadow = cast style.filter[0];
402402
if (dropShadow.inner == false) {
403403
element.style.boxShadow = '${dropShadow.distance}px ${dropShadow.distance + 2}px ${dropShadow.blurX - 1}px ${dropShadow.blurY - 1}px ${HtmlUtils.rgba(dropShadow.color, dropShadow.alpha)}';
404404
} else {
405405
element.style.boxShadow = 'inset ${dropShadow.distance}px ${dropShadow.distance}px ${dropShadow.blurX}px 0px ${HtmlUtils.rgba(dropShadow.color, dropShadow.alpha)}';
406406
}
407-
} else if (Std.is(style.filter[0], Blur)) {
407+
} else if ((style.filter[0] is Blur)) {
408408
var blur:Blur = cast style.filter[0];
409409
element.style.setProperty("-webkit-filter", 'blur(${blur.amount}px)');
410410
element.style.setProperty("-moz-filter", 'blur(${blur.amount}px)');
411411
element.style.setProperty("-o-filter", 'blur(${blur.amount}px)');
412412
//element.style.setProperty("-ms-filter", 'blur(${blur.amount}px)');
413413
element.style.setProperty("filter", 'blur(${blur.amount}px)');
414-
} else if (Std.is(style.filter[0], Grayscale)) {
414+
} else if ((style.filter[0] is Grayscale)) {
415415
var grayscale:Grayscale = cast style.filter[0];
416416
element.style.setProperty("-webkit-filter", 'grayscale(${grayscale.amount}%)');
417417
element.style.setProperty("-moz-filter", 'grayscale(${grayscale.amount}%)');
@@ -430,7 +430,7 @@ class ComponentImpl extends ComponentBase {
430430
}
431431

432432
if (style.backdropFilter != null) {
433-
if (Std.is(style.backdropFilter[0], Blur)) {
433+
if ((style.backdropFilter[0] is Blur)) {
434434
var blur:Blur = cast style.backdropFilter[0];
435435
element.style.setProperty("backdrop-filter", 'blur(${blur.amount}px)');
436436
}
@@ -574,9 +574,9 @@ class ComponentImpl extends ComponentBase {
574574
case UIEvent.CHANGE:
575575
if (_eventMap.exists(type) == false) {
576576
_eventMap.set(type, listener);
577-
if (Std.is(this, TextField) || Std.is(this, TextArea)) {
577+
if ((this is TextField) || (this is TextArea)) {
578578
element.addEventListener(EventMapper.HAXEUI_TO_DOM.get(KeyboardEvent.KEY_UP), __onTextFieldChangeEvent);
579-
} else if (Std.is(this, InteractiveComponent)) {
579+
} else if ((this is InteractiveComponent)) {
580580
element.addEventListener(EventMapper.HAXEUI_TO_DOM.get(type), __onChangeEvent);
581581
}
582582
}
@@ -610,7 +610,7 @@ class ComponentImpl extends ComponentBase {
610610
element.removeEventListener(EventMapper.HAXEUI_TO_DOM.get(type), __onKeyboardEvent);
611611
case UIEvent.CHANGE:
612612
_eventMap.remove(type);
613-
if (Std.is(this, TextField)) {
613+
if ((this is TextField)) {
614614
element.removeEventListener(EventMapper.HAXEUI_TO_DOM.get(KeyboardEvent.KEY_UP), __onTextFieldChangeEvent);
615615
} else {
616616
element.removeEventListener(EventMapper.HAXEUI_TO_DOM.get(type), __onChangeEvent);
@@ -676,15 +676,15 @@ class ComponentImpl extends ComponentBase {
676676
mouseEvent._originalEvent = event;
677677
var touchEvent = false;
678678
try {
679-
touchEvent = Std.is(event, js.html.TouchEvent);
679+
touchEvent = (event is js.html.TouchEvent);
680680
} catch (e:Dynamic) { }
681681

682682
if (touchEvent == true) {
683683
var te:js.html.TouchEvent = cast(event, js.html.TouchEvent);
684684
mouseEvent.screenX = (te.changedTouches[0].pageX - Screen.instance.container.offsetLeft) / Toolkit.scaleX;
685685
mouseEvent.screenY = (te.changedTouches[0].pageY - Screen.instance.container.offsetTop) / Toolkit.scaleY;
686686
mouseEvent.touchEvent = true;
687-
} else if (Std.is(event, js.html.MouseEvent)) {
687+
} else if ((event is js.html.MouseEvent)) {
688688
var me:js.html.MouseEvent = cast(event, js.html.MouseEvent);
689689
mouseEvent.buttonDown = (me.buttons != 0);
690690
mouseEvent.screenX = (me.pageX - Screen.instance.container.offsetLeft) / Toolkit.scaleX;
@@ -715,7 +715,7 @@ class ComponentImpl extends ComponentBase {
715715
var delta:Float = 0;
716716
if (Reflect.field(event, "wheelDelta") != null) {
717717
delta = Reflect.field(event, "wheelDelta");
718-
} else if (Std.is(event, WheelEvent)) {
718+
} else if ((event is WheelEvent)) {
719719
delta = cast(event, WheelEvent).deltaY;
720720
} else {
721721
delta = -event.detail;
@@ -741,7 +741,7 @@ class ComponentImpl extends ComponentBase {
741741
var keyboardEvent = new KeyboardEvent(type);
742742
keyboardEvent._originalEvent = event;
743743

744-
if (Std.is(event, js.html.KeyboardEvent)) {
744+
if ((event is js.html.KeyboardEvent)) {
745745
var me:js.html.KeyboardEvent = cast(event, js.html.KeyboardEvent);
746746
keyboardEvent.keyCode = me.keyCode;
747747
keyboardEvent.altKey = me.altKey;

‎haxe/ui/backend/ScreenImpl.hx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,15 @@ class ScreenImpl extends ScreenBase {
309309

310310
var touchEvent = false;
311311
try {
312-
touchEvent = Std.is(event, js.html.TouchEvent);
312+
touchEvent = (event is js.html.TouchEvent);
313313
} catch (e:Dynamic) { }
314314

315315
if (touchEvent == true) {
316316
var te:js.html.TouchEvent = cast(event, js.html.TouchEvent);
317317
mouseEvent.screenX = (te.changedTouches[0].pageX - Screen.instance.container.offsetLeft) / Toolkit.scaleX;
318318
mouseEvent.screenY = (te.changedTouches[0].pageY - Screen.instance.container.offsetTop) / Toolkit.scaleY;
319319
mouseEvent.touchEvent = true;
320-
} else if (Std.is(event, js.html.MouseEvent)) {
320+
} else if ((event is js.html.MouseEvent)) {
321321
var me:js.html.MouseEvent = cast(event, js.html.MouseEvent);
322322
mouseEvent.buttonDown = (me.buttons != 0);
323323
mouseEvent.screenX = (me.pageX - Screen.instance.container.offsetLeft) / Toolkit.scaleX;

‎haxe/ui/backend/TextDisplayImpl.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class TextDisplayImpl extends TextBase {
192192

193193
private var autoWidth(get, null):Bool;
194194
private function get_autoWidth():Bool {
195-
if (Std.is(parentComponent, Label)) {
195+
if ((parentComponent is Label)) {
196196
return cast(parentComponent, Label).autoWidth;
197197
}
198198
return false;

‎haxe/ui/backend/TextInputImpl.hx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class TextInputImpl extends TextDisplayImpl {
2323

2424
private function onChangeEvent(e) {
2525
var newText = null;
26-
if (Std.is(parentComponent, TextArea)) {
26+
if ((parentComponent is TextArea)) {
2727
newText = cast(element, TextAreaElement).value;
2828
} else {
2929
newText = cast(element, InputElement).value;
@@ -60,9 +60,9 @@ class TextInputImpl extends TextDisplayImpl {
6060
private override function validateData() {
6161
if (_text != null) {
6262
var html:String = normalizeText(_text);
63-
if (Std.is(element, InputElement)) {
63+
if ((element is InputElement)) {
6464
cast(element, InputElement).value = html;
65-
} else if (Std.is(element, TextAreaElement)) {
65+
} else if ((element is TextAreaElement)) {
6666
cast(element, TextAreaElement).value = html;
6767
}
6868
}
@@ -82,8 +82,8 @@ class TextInputImpl extends TextDisplayImpl {
8282
private override function validateStyle():Bool {
8383
var measureTextRequired:Bool = false;
8484

85-
if ((_displayData.multiline == false && Std.is(element, InputElement) == false)
86-
|| (_displayData.multiline == true && Std.is(element, TextAreaElement) == false)) {
85+
if ((_displayData.multiline == false && (element is InputElement) == false)
86+
|| (_displayData.multiline == true && (element is TextAreaElement) == false)) {
8787
var newElement:Element = createElement();
8888
element.parentElement.appendChild(newElement);
8989
HtmlUtils.removeElement(element);
@@ -98,7 +98,7 @@ class TextInputImpl extends TextDisplayImpl {
9898
measureTextRequired = true;
9999
}
100100

101-
if (Std.is(element, InputElement)) {
101+
if ((element is InputElement)) {
102102
var inputElement:InputElement = cast element;
103103
if (_inputData.password == true && inputElement.type != "password") {
104104
inputElement.type = "password";
@@ -111,16 +111,16 @@ class TextInputImpl extends TextDisplayImpl {
111111
#if !haxeui_builder
112112
element.style.cursor = "not-allowed";
113113
#end
114-
if (Std.is(element, InputElement)) {
114+
if ((element is InputElement)) {
115115
cast(element, InputElement).disabled = true;
116-
} else if (Std.is(element, TextAreaElement)) {
116+
} else if ((element is TextAreaElement)) {
117117
cast(element, TextAreaElement).disabled = true;
118118
}
119119
} else {
120120
element.style.cursor = null;
121-
if (Std.is(element, InputElement)) {
121+
if ((element is InputElement)) {
122122
cast(element, InputElement).disabled = false;
123-
} else if (Std.is(element, TextAreaElement)) {
123+
} else if ((element is TextAreaElement)) {
124124
cast(element, TextAreaElement).disabled = false;
125125
}
126126
}
@@ -129,7 +129,7 @@ class TextInputImpl extends TextDisplayImpl {
129129
}
130130

131131
private override function measureText() {
132-
if (Std.is(element, TextAreaElement)) {
132+
if ((element is TextAreaElement)) {
133133
_textWidth = cast(element, TextAreaElement).scrollWidth;
134134
_textHeight = cast(element, TextAreaElement).scrollHeight;
135135
} else {

‎haxe/ui/backend/html5/native/NativeElement.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class NativeElement {
5858

5959
/*
6060
private function onChange(e) {
61-
if (Std.is(_component, Slider)) {
61+
if ((_component is Slider)) {
6262
var input:InputElement = cast _component.element;
6363
cast(_component, Slider).pos = Std.parseFloat(input.value);
6464
}

‎haxe/ui/backend/html5/native/behaviours/ElementPlaceholder.hx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ import js.html.TextAreaElement;
1010
class ElementPlaceholder extends Behaviour {
1111
public override function set(value:Variant) {
1212
var el:Element = _component.element;
13-
if (Std.is(el, TextAreaElement)) {
13+
if ((el is TextAreaElement)) {
1414
cast(el, TextAreaElement).placeholder = value;
15-
} else if (Std.is(el, InputElement)){
15+
} else if ((el is InputElement)){
1616
cast(el, InputElement).placeholder = value;
1717
}
1818
}
1919

2020
public override function get():Variant {
2121
var el:Element = _component.element;
22-
if (Std.is(el, TextAreaElement)) {
22+
if ((el is TextAreaElement)) {
2323
return cast(el, TextAreaElement).placeholder;
24-
} else if (Std.is(el, InputElement)){
24+
} else if ((el is InputElement)){
2525
return cast(el, InputElement).placeholder;
2626
} else {
2727
return null;

‎haxe/ui/backend/html5/native/behaviours/ElementValue.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import js.html.TextAreaElement;
88
class ElementValue extends DataBehaviour {
99
public override function validateData() {
1010
var el:Element = _component.element;
11-
if (Std.is(el, TextAreaElement)) {
11+
if ((el is TextAreaElement)) {
1212
cast(el, TextAreaElement).value = StringTools.replace(_value, "\\n", "\n");
1313
} else {
1414
el.setAttribute("value", _value);

‎haxe/ui/backend/html5/native/behaviours/SpanText.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class SpanText extends DataBehaviour {
7575
if (list.length != 0) {
7676
for (n in 0...list.length) {
7777
var child = list.item(n);
78-
if (Std.is(child, InputElement) && cast(child, InputElement).type == type) {
78+
if ((child is InputElement) && cast(child, InputElement).type == type) {
7979
input = cast child;
8080
break;
8181
}

‎haxe/ui/backend/html5/native/layouts/ButtonLayout.hx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ class ButtonLayout extends DefaultLayout {
5050

5151
switch (component.style.iconPosition) {
5252
case "top" | "left" | null:
53-
if (Std.is(first, ImageElement) == false) {
53+
if ((first is ImageElement) == false) {
5454
HtmlUtils.swapElements(first, last);
5555
}
5656
case "right" | "bottom":
57-
if (Std.is(last, ImageElement) == false) {
57+
if ((last is ImageElement) == false) {
5858
HtmlUtils.swapElements(first, last);
5959
}
6060
default:

‎haxe/ui/backend/html5/native/size/ElementSize.hx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import haxe.ui.layouts.DelegateLayout.DelegateLayoutSize;
88
class ElementSize extends DelegateLayoutSize {
99
private override function get_width():Float {
1010
var w:Float = component.element.offsetWidth;
11-
if (Std.is(component, VerticalSlider)) {
11+
if ((component is VerticalSlider)) {
1212
if (w == component.element.offsetHeight) {
1313
w = 21;
1414
}
15-
} else if (Std.is(component, VerticalProgress)) {
15+
} else if ((component is VerticalProgress)) {
1616
if (component.element.offsetWidth > component.element.offsetHeight) {
1717
w = component.element.offsetHeight;
1818
}
@@ -22,7 +22,7 @@ class ElementSize extends DelegateLayoutSize {
2222

2323
private override function get_height():Float {
2424
var h:Float = component.element.offsetHeight;
25-
if (Std.is(component, VerticalProgress)) {
25+
if ((component is VerticalProgress)) {
2626
if (component.element.offsetWidth > component.element.offsetHeight) {
2727
h = component.element.offsetWidth;
2828
}

0 commit comments

Comments
 (0)