Skip to content
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

Jump to bottom

chore: remove is prefix from constructors #202

Merged
merged 16 commits into from
Apr 7, 2024
Merged

chore: remove is prefix from constructors #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7af4a1a
chore: rename client properties
carlos-menezes Mar 19, 2024
08155a1
chore: format `Handling.cpp`
carlos-menezes Mar 19, 2024
d287834
chore: client compat
carlos-menezes Mar 19, 2024
62b3473
chore: rename missing properties in client module
carlos-menezes Mar 19, 2024
d95963f
chore: client types
carlos-menezes Mar 19, 2024
fc981b7
Revert "chore: client compat"
carlos-menezes Mar 20, 2024
a9912fb
Revert "chore: rename client properties"
carlos-menezes Mar 20, 2024
05f3042
Revert "chore: format `Handling.cpp`"
carlos-menezes Mar 20, 2024
937d767
Revert "chore: rename missing properties in client module"
carlos-menezes Mar 20, 2024
a82f14d
Revert "chore: client types"
carlos-menezes Mar 20, 2024
fcd482c
Merge branch 'dev' into chore/remove-is-prefix
carlos-menezes Mar 20, 2024
79af3bd
chore: refactor WebView constructor
carlos-menezes Mar 20, 2024
3ff47ee
chore: refactor Audio constructor
carlos-menezes Mar 23, 2024
e938dd8
Merge branch 'dev' into chore/remove-is-prefix
carlos-menezes Mar 23, 2024
aee12d3
Merge branch 'dev' into chore/remove-is-prefix
carlos-menezes Mar 29, 2024
67df37e
Merge branch 'dev' into chore/remove-is-prefix
carlos-menezes Apr 2, 2024
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
8 changes: 4 additions & 4 deletions client/js/compatibility/classes/webview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class WebView extends alt.WebView {

let instance = null;
if (args.length == 4) {
const [_, isOverlay, pos, size] = args;
instance = alt.WebView.create({ url, isOverlay, pos, size });
const [_, overlay, pos, size] = args;
instance = alt.WebView.create({ url, overlay, pos, size });
} else if (args.length == 3 && isObject(args[2])) {
const [_, pos, size] = args;
instance = alt.WebView.create({ url, pos, size });
Expand All @@ -30,8 +30,8 @@ class WebView extends alt.WebView {
const [_, pos] = args;
alt.WebView.create({ url, pos });
} else if (args.length == 2) {
const isOverlay = args[1];
instance = alt.WebView.create({ url, isOverlay });
const overlay = args[1];
instance = alt.WebView.create({ url, overlay });
} else {
instance = alt.WebView.create({ url });
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/factories/AudioFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ static js::FactoryHandler audioFactory(alt::IBaseObject::Type::AUDIO, [](js::Obj
float volume;
if(!args.Get("volume", volume)) return nullptr;

bool isRadio = args.Get<bool>("isRadio", false);
bool isRadio = args.Get<bool>("radio", false);
bool clearCache = args.Get<bool>("clearCache", true);

js::IResource* resource = args.GetResource();
Expand Down
4 changes: 2 additions & 2 deletions client/src/factories/WebViewFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ static js::FactoryHandler webViewFactory(alt::IBaseObject::Type::WEBVIEW, [](js:
{
alt::Vector2i pos = args.Get<alt::Vector2i>("pos", {0, 0});
alt::Vector2i size = args.Get<alt::Vector2i>("size", {0, 0});
bool isVisible = args.Get("isVisible", true);
bool isOverlay = args.Get("isOverlay", false);
bool isVisible = args.Get("visible", true);
bool isOverlay = args.Get("overlay", false);

return alt::ICore::Instance().CreateWebView(url, pos, size, isVisible, isOverlay, args.GetResource()->GetResource());
}
Expand Down
6 changes: 3 additions & 3 deletions types/client/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ declare module "@altv/client" {
export interface AudioCreateOptions {
source: string;
volume: number;
isRadio?: boolean; // default: false
radio?: boolean; // default: false
clearCache?: boolean; // default: true
}

Expand Down Expand Up @@ -1234,8 +1234,8 @@ declare module "@altv/client" {
url: string;
pos?: altShared.IVector2; // default: { x: 0, y: 0 }
size?: altShared.IVector2; // default: { x: 0, y: 0 }
isVisible?: boolean; // default: true
isOverlay?: boolean; // default: false
visible?: boolean; // default: true
overlay?: boolean; // default: false
}

export abstract class WebView extends BaseObject {
Expand Down