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.

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

add: fix nui issue caused by fivem #218

Merged
merged 2 commits into from May 1, 2021
Merged

add: fix nui issue caused by fivem #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94fc9d6
fix: odd debugging code.. not really required.
JamesEU Apr 30, 2021
d7e332b
Update version.lua
JamesEU May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 20 additions & 17 deletions vrp/gui/index.html
View file
Open in desktop
@@ -1,20 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
<!--<script src="Menu.js" type="text/javascript"></script>-->
<script src="ProgressBar.js" type="text/javascript"></script>
<script src="WPrompt.js" type="text/javascript"></script>
<script src="RequestManager.js" type="text/javascript"></script>
<script src="AnnounceManager.js" type="text/javascript"></script>
<script src="Div.js" type="text/javascript"></script>
<script src="main.js" type="text/javascript"></script>
<link href="design.css" rel="stylesheet" type="text/css" />

<script src="ogrp.menu.js" type="text/javascript"></script>
<script src="ogrp.main.js" type="text/javascript"></script>
<link href="ogrp.menu.css" rel="stylesheet" type="text/css" />
</head>
<body>
</body>
</html>
<head>
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js" integrity="sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU=" crossorigin="anonymous"></script>
<script src="Menu.js" type="text/javascript"></script>
<script src="ProgressBar.js" type="text/javascript"></script>
<script src="WPrompt.js" type="text/javascript"></script>
<script src="RequestManager.js" type="text/javascript"></script>
<script src="AnnounceManager.js" type="text/javascript"></script>
<script src="Div.js" type="text/javascript"></script>
<script src="main.js" type="text/javascript"></script>
<link href="design.css" rel="stylesheet" type="text/css" />
<script src="ogrp.menu.js" type="text/javascript"></script>
<script src="ogrp.main.js" type="text/javascript"></script>
<link href="ogrp.menu.css" rel="stylesheet" type="text/css" />
</head>

<body>
</body>

</html>
8 changes: 0 additions & 8 deletions vrp/gui/main.js
View file
Open in desktop
@@ -1,13 +1,5 @@
window.addEventListener("load", function() {
errdiv = document.createElement("div");
if (true) { //debug
errdiv.classList.add("console");
document.body.appendChild(errdiv);
window.onerror = function(errorMsg, url, lineNumber, column, errorObj) {
errdiv.innerHTML += '<br />Error: ' + errorMsg + ' Script: ' + url + ' Line: ' + lineNumber +
' Column: ' + column + ' StackTrace: ' + errorObj;
}
}

//init dynamic menu
//var dynamic_menu = new Menu();
Expand Down
124 changes: 60 additions & 64 deletions vrp/gui/ogrp.main.js
View file
Open in desktop
@@ -1,84 +1,80 @@

window.addEventListener("load", function() {
ogrpDebugBar();
ogrpMainError();

var requestMan = new RequestManager();
var ogrpMenu = new OGRP_MENU();
var requestMan = new RequestManager();
var ogrpMenu = new OGRP_MENU();

requestMan.onResponse = function(id, ok) {
$.post("https://vrp/request",JSON.stringify({act: "response", id: id, ok: ok}));
};
requestMan.onResponse = function(id, ok) {
$.post("https://vrp/request", JSON.stringify({ act: "response", id: id, ok: ok }));
};

ogrpMenu.onClose = function() {
$.post("https://vrp/menu",JSON.stringify({act: "close", id: ogrpMenu.id}));
};
ogrpMenu.onValid = function(choice,mod) {
$.post("https://vrp/menu",JSON.stringify({act: "valid", id: ogrpMenu.id, choice: choice, mod: mod}));
};
ogrpMenu.onClose = function() {
$.post("https://vrp/menu", JSON.stringify({ act: "close", id: ogrpMenu.id }));
};
ogrpMenu.onValid = function(choice, mod) {
$.post("https://vrp/menu", JSON.stringify({ act: "valid", id: ogrpMenu.id, choice: choice, mod: mod }));
};

$.post("https://vrp/cfg","");
$.post("https://vrp/cfg", "");

window.addEventListener("message", function(evt) {
var data = evt.data;
window.addEventListener("message", function(evt) {
var data = evt.data;

if(data.act === "open_menu") {
openMenu(data);
} else if(data.act === "close_menu") {
ogrpMenu.close(data);
} else if(data.act === "event") {
messageEventHandler(data);
} else if(data.act === "request") {
requestMan.addRequest(data.id,data.text,data.time);
}
});
if (data.act === "open_menu") {
openMenu(data);
} else if (data.act === "close_menu") {
ogrpMenu.close(data);
} else if (data.act === "event") {
messageEventHandler(data);
} else if (data.act === "request") {
requestMan.addRequest(data.id, data.text, data.time);
}
});

openMenu = function(data) {
ogrpMenu.open(data);
ogrpMenu.id = data.menudata.id;
};
openMenu = function(data) {
ogrpMenu.open(data);
ogrpMenu.id = data.menudata.id;
};

closeMenu = function() {
ogrpMenu.close();
};
closeMenu = function() {
ogrpMenu.close();
};

messageEventHandler = function(data) {
if(data.event === "CANCEL") {
if (ogrpMenu.opened) {
ogrpMenu.close(data);
}
} else if(data.event === "UP") {
if (ogrpMenu.opened) {
ogrpMenu.moveUp();
}
} else if(data.event === "DOWN") {
if (ogrpMenu.opened) {
ogrpMenu.moveDown();
}
} else if(data.event === "LEFT") {
ogrpMenu.valid(-1);
} else if(data.event === "RIGHT") {
ogrpMenu.valid(1);
} else if(data.event === "SELECT") {
ogrpMenu.valid(0);
} else if (data.event == "F5") {
messageEventHandler = function(data) {
if (data.event === "CANCEL") {
if (ogrpMenu.opened) {
ogrpMenu.close(data);
}
} else if (data.event === "UP") {
if (ogrpMenu.opened) {
ogrpMenu.moveUp();
}
} else if (data.event === "DOWN") {
if (ogrpMenu.opened) {
ogrpMenu.moveDown();
}
} else if (data.event === "LEFT") {
ogrpMenu.valid(-1);
} else if (data.event === "RIGHT") {
ogrpMenu.valid(1);
} else if (data.event === "SELECT") {
ogrpMenu.valid(0);
} else if (data.event == "F5") {
requestMan.respond(true);
} else if (data.event == "F6") {
requestMan.respond(false);
}
};
};
});

function ogrpDebugBar() {
$("body").append(
$("<div>",{"id":"ogrpErrDiv","class":"ogrp_console"})
);
$("body").append(
$("<div>", { "id": "ogrpErrDiv", "class": "ogrp_console" })
);
}

function ogrpMainError() {
window.onerror = function(errorMsg, url, lineNumber, column, errorObj) {
$("#ogrpErrDiv").append(
"<br />Error: " + errorMsg + " Script: " + url + " Line: " + lineNumber + " Column: " + column + " StackTrace: " + errorObj
);
};
window.onerror = function(errorMsg, url, lineNumber, column, errorObj) {
$("#ogrpErrDiv").append(
"<br />Error: " + errorMsg + " Script: " + url + " Line: " + lineNumber + " Column: " + column + " StackTrace: " + errorObj
);
};
}