Update v1.9.7

* Finally fixed new Callbacks
* New Design for MSK.Input
* Bugfixes for MSK.Input

Author: Musiker15

VERSION

@@ -1 +1 @@
-1.9.6
+1.9.7

client/cl_callback.lua

@@ -3,7 +3,9 @@ local CallbackHandler = {}
 
 AddEventHandler('onResourceStop', function(resource)
 	if CallbackHandler[resource] then
-        RemoveEventHandler(CallbackHandler[resource])
+        for k, handler in pairs(CallbackHandler[resource]) do
+            RemoveEventHandler(handler)
+        end
     end
 end)
 
@@ -14,14 +16,22 @@ MSK.RegisterClientCallback = function(eventName, cb)
     end)
 
     local script = GetInvokingResource()
-    if script then CallbackHandler[script] = handler end
+    if script then 
+        if CallbackHandler[script] then
+            table.insert(CallbackHandler[script], handler)
+        else
+            CallbackHandler[script] = {}
+            table.insert(CallbackHandler[script], handler)
+        end
+    end
 end
+MSK.Register = MSK.RegisterClientCallback
 exports('RegisterClientCallback', MSK.RegisterClientCallback)
 
 -- NEW Method for Server Callbacks
 MSK.Trigger = function(eventName, ...)
     local p = promise.new()
-    local ticket = GetGameTimer() .. GetPlayerServerId(PlayerId())
+    local ticket = tostring(GetGameTimer() .. GetPlayerServerId(PlayerId()))
 
     SetTimeout(5000, function()
         p:reject("Request Timed Out (408)")

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_core'
 description 'Core functions for MSK Scripts'
-version '1.9.6'
+version '1.9.7'
 
 lua54 'yes'
 

html/index.html

@@ -16,11 +16,15 @@
         <script src="https://code.jquery.com/jquery-3.5.0.js"></script>
         <script src="script.js"></script>
 
-        <div class="msk-input-container"><span id="msk-input-title">Das ist eine Überschrift</span>
-            <span id="close" onclick="closeInputUI()"><i class="fa-solid fa-xmark"></i></span>
+        <div class="msk-input-container">
+            <div class="msk-input-title-box">
+                <div class="msk-input-title">
+                    <span class="msk-input-title-text"><i class="fa-solid fa-chevrons-left arrow-left"></i><span id="msk-input-title">This is a title</span><i class="fa-solid fa-chevrons-right arrow-right"></i></span>
+                </div>
+            </div>
             <textarea class="msk-input" rows="5" cols="50" id="big-input" placeholder=""></textarea>
             <textarea class="msk-input" rows="1" cols="50" id="small-input" placeholder=""></textarea>
-            <button class="msk-submit-button" onclick="input()">Confirm</button>
+            <button class="msk-submit-button"onclick="input()"><span class="msk-submit-button-text">Confirm</span></button>
         </div>
 
         <div class="progress-container">

html/script.js

@@ -24,6 +24,15 @@ window.addEventListener('message', (event) => {
         document.getElementById(input).placeholder = data.placeholder;
         $(".msk-input-container").fadeIn()
         $("#msk-input-title").text(data.header)
+
+        document.getElementById('small-input').addEventListener("keydown", function(e) {
+            if (e.key === "Enter") {
+                if (e.shiftKey) {
+                    return;
+                }
+                e.preventDefault();
+            }
+        })
     } else if (event.data.action == 'progressBarStart') {
         event.data.id = currID
         progressBarStart(event.data);
@@ -119,16 +128,14 @@ closeInputUI = (send) => {
 
 document.onkeyup = (data) => {
     if (data.which == 27) {
+        var textfield = '#small-input'
+        if (field) {textfield = '#big-input'}
+        $(textfield).val('');
+
         closeInputUI()
     }
 }
 
-$("#small-input").keydown((event) => {
-    if (event.keyCode == 13) {
-        event.preventDefault();
-    }
-})
-
 input = () => {
     var textfield = '#small-input'
     if (field) {textfield = '#big-input'}