Skip to content

Updated for Haxe 3.3.0 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrcdk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated for Haxe 3.3.0 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions js/bootstrap/Alert.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package js.bootstrap;

class Alert {

public static inline function alert( j : js.JQuery ) : js.JQuery {
public static inline function alert( j : JQuery ) : JQuery {
return untyped j.alert();
}

public static inline function alertClose( j : js.JQuery ) : js.JQuery {
public static inline function alertClose( j : JQuery ) : JQuery {
return untyped j.alert("close");
}

Expand All @@ -16,4 +16,4 @@ class Alert {
}
#end

}
}
8 changes: 4 additions & 4 deletions js/bootstrap/Button.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package js.bootstrap;

class Button {
public static inline function button( j : js.JQuery, ?state:String = null ) : js.JQuery {
public static inline function button( j : JQuery, ?state:String = null ) : JQuery {
return untyped j.button( state );
}

public static inline function buttonToggle( j : js.JQuery ) { return button(j, "toggle" ); }
public static inline function buttonLoading( j : js.JQuery ) { return button(j, "loading" ); }
public static inline function buttonReset( j : js.JQuery ) { return button(j, "reset" ); }
public static inline function buttonToggle( j : JQuery ) { return button(j, "toggle" ); }
public static inline function buttonLoading( j : JQuery ) { return button(j, "loading" ); }
public static inline function buttonReset( j : JQuery ) { return button(j, "reset" ); }

#if !noEmbedBootstrap
public static function __init__() { bootstrap.Lib.includeFile("js/bootstrap-button.js"); }
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap/Dropdown.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package js.bootstrap;

class Dropdown {

public static inline function dropdown( j : js.JQuery ) : js.JQuery {
public static inline function dropdown( j : JQuery ) : JQuery {
return untyped j.dropdown();
}

Expand Down
3 changes: 3 additions & 0 deletions js/bootstrap/JQuery.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package js.bootstrap;

typedef JQuery = #if (haxe_ver >= 3.300) js.jquery.JQuery #else js.JQuery #end
8 changes: 4 additions & 4 deletions js/bootstrap/Modal.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ typedef ModalOptions = {
}

class Modal {
public static inline function modal( j : js.JQuery , conf : ModalOptions = null ) : js.JQuery {
public static inline function modal( j : JQuery , conf : ModalOptions = null ) : JQuery {
return untyped j.modal( conf );
}

public static inline function modalToggle( j : js.JQuery ) : js.JQuery { return untyped j.modal( "toggle" ); }
public static inline function modalShow( j : js.JQuery ) : js.JQuery { return untyped j.modal( "show" ); }
public static inline function modalHide( j : js.JQuery ) : js.JQuery { return untyped j.modal( "hide" ); }
public static inline function modalToggle( j : JQuery ) : JQuery { return untyped j.modal( "toggle" ); }
public static inline function modalShow( j : JQuery ) : JQuery { return untyped j.modal( "show" ); }
public static inline function modalHide( j : JQuery ) : JQuery { return untyped j.modal( "hide" ); }

#if !noEmbedBootstrap
public static function __init__() { bootstrap.Lib.includeFile("js/bootstrap-modal.js"); }
Expand Down
10 changes: 5 additions & 5 deletions js/bootstrap/Popover.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ typedef PopoverOptions = {
}

class Popover {
public static inline function popover( j : js.JQuery , ?opts : PopoverOptions = null ) : js.JQuery {
public static inline function popover( j : JQuery , ?opts : PopoverOptions = null ) : JQuery {
return untyped j.popover( opts );
}

public static inline function popoverToggle( j : js.JQuery ) : js.Jquery { return untyped j.popover( "toggle" ); }
public static inline function popoverShow( j : js.JQuery ) : js.Jquery { return untyped j.popover( "show" ); }
public static inline function popoverHide( j : js.JQuery ) : js.Jquery { return untyped j.popover( "hide" ); }
public static inline function popoverToggle( j : JQuery ) : JQuery { return untyped j.popover( "toggle" ); }
public static inline function popoverShow( j : JQuery ) : JQuery { return untyped j.popover( "show" ); }
public static inline function popoverHide( j : JQuery ) : JQuery { return untyped j.popover( "hide" ); }

#if !noEmbedBootstrap
public static function __init__() {
bootstrap.Lib.includeFile("js/bootstrap-tooltip.js");
bootstrap.Lib.includeFile("js/bootstrap-popover.js");
}
#end
}
}
4 changes: 2 additions & 2 deletions js/bootstrap/Tab.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package js.bootstrap;

class Tab
{
public static inline function tab( j : js.JQuery ) : js.JQuery
public static inline function tab( j : JQuery ) : JQuery
return untyped j.tab();

public static inline function tabShow( j : js.JQuery ) : js.JQuery
public static inline function tabShow( j : JQuery ) : JQuery
return untyped j.tab( "show" );

#if !noEmbedBootstrap
Expand Down
8 changes: 4 additions & 4 deletions js/bootstrap/Tooltip.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ typedef TooltipOptions = {
}

class Tooltip {
public static inline function tooltip( j : js.JQuery , ?opts:TooltipOptions = null ) : js.JQuery {
public static inline function tooltip( j : JQuery , ?opts:TooltipOptions = null ) : JQuery {
return untyped j.tooltip( opts );
}

public static inline function tooltipToggle( j : js.JQuery ) : js.JQuery { return untyped j.tooltip( "toggle" ); }
public static inline function tooltipShow( j : js.JQuery ) : js.JQuery { return untyped j.tooltip( "show" ); }
public static inline function tooltipHide( j : js.JQuery ) : js.JQuery { return untyped j.tooltip( "hide" ); }
public static inline function tooltipToggle( j : JQuery ) : JQuery { return untyped j.tooltip( "toggle" ); }
public static inline function tooltipShow( j : JQuery ) : JQuery { return untyped j.tooltip( "show" ); }
public static inline function tooltipHide( j : JQuery ) : JQuery { return untyped j.tooltip( "hide" ); }

#if !noEmbedBootstrap
public static function __init__() { bootstrap.Lib.includeFile( "js/bootstrap-tooltip.js" ); }
Expand Down