Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/haxeui/haxeui-core
Browse files Browse the repository at this point in the history
  • Loading branch information
ianharrigan committed Feb 5, 2024
2 parents 316406a + 585263f commit 8a7846b
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion haxe/ui/_module/locale/en/std-strings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fri=Fri
sat=Sat

january=January
febuary=February
february=February
march=March
april=April
may=May
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/_module/locale/fr/std-strings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fri=Ven
sat=Sam

january=Janvier
febuary=Février
february=Février
march=Mars
april=Avril
may=Mai
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/_module/locale/pt/std-strings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fri=Sex
sat=Sáb

january=Janeiro
febuary=Fevereiro
february=Fevereiro
march=Março
april=Abril
may=Maio
Expand Down
6 changes: 3 additions & 3 deletions haxe/ui/components/Button.hx
Original file line number Diff line number Diff line change
Expand Up @@ -724,11 +724,11 @@ class ButtonBuilder extends CompositeBuilder {
public override function applyStyle(style:Style) {
super.applyStyle(style);

haxe.ui.macros.ComponentMacros.cascacdeStylesTo("button-label", [
haxe.ui.macros.ComponentMacros.cascadeStylesTo("button-label", [
color, fontName, fontSize, cursor, textAlign, fontBold, fontUnderline, fontItalic
], false);
haxe.ui.macros.ComponentMacros.cascacdeStylesTo("button-icon", [cursor], false);
haxe.ui.macros.ComponentMacros.cascacdeStylesToList(Label, [
haxe.ui.macros.ComponentMacros.cascadeStylesTo("button-icon", [cursor], false);
haxe.ui.macros.ComponentMacros.cascadeStylesToList(Label, [
color, fontName, fontSize, cursor, textAlign, fontBold, fontUnderline, fontItalic
]);

Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/components/CheckBox.hx
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class CheckBoxBuilder extends CompositeBuilder {
}

public override function applyStyle(style:Style) {
haxe.ui.macros.ComponentMacros.cascacdeStylesTo('${_checkbox.cssName}-label', [
haxe.ui.macros.ComponentMacros.cascadeStylesTo('${_checkbox.cssName}-label', [
color, fontName, fontSize, cursor, textAlign, fontBold, fontUnderline, fontItalic
]);
}
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/components/SectionHeader.hx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private class Builder extends CompositeBuilder {
public override function applyStyle(style:Style) {
super.applyStyle(style);

haxe.ui.macros.ComponentMacros.cascacdeStylesToList(Label, [
haxe.ui.macros.ComponentMacros.cascadeStylesToList(Label, [
color, fontName, fontSize, cursor, textAlign, fontBold, fontUnderline, fontItalic
]);
}
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/components/TabBar.hx
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ private class Builder extends CompositeBuilder {
public override function applyStyle(style:Style) {
super.applyStyle(style);

haxe.ui.macros.ComponentMacros.cascacdeStylesToList(Button, [
haxe.ui.macros.ComponentMacros.cascadeStylesToList(Button, [
color, fontName, fontSize, textAlign, fontBold, fontUnderline, fontItalic
]);
}
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/containers/ListView.hx
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ private class ListViewBuilder extends ScrollViewBuilder {

public override function applyStyle(style:Style) {
super.applyStyle(style);
haxe.ui.macros.ComponentMacros.cascacdeStylesToList(Label, [color, fontName, fontSize, cursor, textAlign]);
haxe.ui.macros.ComponentMacros.cascadeStylesToList(Label, [color, fontName, fontSize, cursor, textAlign]);
}
}

Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/containers/TabView.hx
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ private class Builder extends CompositeBuilder {
public override function applyStyle(style:Style) {
super.applyStyle(style);

haxe.ui.macros.ComponentMacros.cascacdeStylesTo("tabview-tabs", [
haxe.ui.macros.ComponentMacros.cascadeStylesTo("tabview-tabs", [
color, fontName, fontSize, cursor, textAlign, fontBold, fontUnderline, fontItalic
], false);
}
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/containers/menus/MenuItem.hx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private class Builder extends CompositeBuilder {
}

public override function applyStyle(style:Style) {
haxe.ui.macros.ComponentMacros.cascacdeStylesTo("menuitem-label", [color, fontName, fontSize, cursor, textAlign]);
haxe.ui.macros.ComponentMacros.cascadeStylesTo("menuitem-label", [color, fontName, fontSize, cursor, textAlign]);
}
}

Expand Down
4 changes: 2 additions & 2 deletions haxe/ui/macros/ComponentMacros.hx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class ComponentMacros {
return macro new $t();
}

macro public static function cascacdeStylesTo(id:Expr, styleProperties:Expr = null, recursiveFind:Null<Bool> = null):Expr {
macro public static function cascadeStylesTo(id:Expr, styleProperties:Expr = null, recursiveFind:Null<Bool> = null):Expr {
if (styleProperties == null) {
return macro null;
}
Expand Down Expand Up @@ -127,7 +127,7 @@ class ComponentMacros {
return builder.expr;
}

macro public static function cascacdeStylesToList(componentType:Expr, styleProperties:Expr = null):Expr {
macro public static function cascadeStylesToList(componentType:Expr, styleProperties:Expr = null):Expr {
if (styleProperties == null) {
return macro null;
}
Expand Down
2 changes: 1 addition & 1 deletion haxe/ui/util/DateUtil.hx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class DateUtil {
public static var DAYS_IN_MONTH:Array<Int> = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
public static var DAY_NAMES:Array<String> = ["{{sunday}}", "{{monday}}", "{{tuesday}}", "{{wednesday}}", "{{thursday}}", "{{friday}}", "{{saturday}}"];
public static var SHORT_DAY_NAMES:Array<String> = ["{{sun}}", "{{mon}}", "{{tues}}", "{{wed}}", "{{thur}}", "{{fri}}", "{{sat}}"];
public static var MONTH_NAMES:Array<String> = ["{{january}}", "{{febuary}}", "{{march}}", "{{april}}", "{{may}}", "{{june}}", "{{july}}", "{{august}}", "{{september}}", "{{october}}", "{{november}}", "{{december}}"];
public static var MONTH_NAMES:Array<String> = ["{{january}}", "{{february}}", "{{march}}", "{{april}}", "{{may}}", "{{june}}", "{{july}}", "{{august}}", "{{september}}", "{{october}}", "{{november}}", "{{december}}"];
public static var SHORT_MONTH_NAMES:Array<String> = ["{{jan}}", "{{feb}}", "{{mar}}", "{{apr}}", "{{may}}", "{{jun}}", "{{jul}}", "{{aug}}", "{{sep}}", "{{oct}}", "{{nov}}", "{{dec}}"];

}

0 comments on commit 8a7846b

Please sign in to comment.