Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

adding the $varname$ and %PLAYER_NAME% prefix to custom modal #230

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

adding the $varname$ and %PLAYER_NAME% prefix to custom modal #230

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
2 changes: 1 addition & 1 deletion src/gameClasses/ClientNetworkEvents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ var ClientNetworkEvents = {
break;

case 'showCustomModal':
ige.playerUi.showCustomModal(data);
ige.playerUi.showCustomModal(data, data.extraData);
break;

case 'openWebsite':
Expand Down
11 changes: 10 additions & 1 deletion src/gameClasses/components/script/ActionComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,13 +516,22 @@ var ActionComponent = IgeEntity.extend({
var player = ige.variable.getValue(action.player, vars);
var htmlContent = ige.variable.getValue(action.htmlContent, vars) || '';
var modalTitle = ige.variable.getValue(action.title, vars) || '';
var primitiveVariables = ige.variable.getAllVariables([
'string',
'number',
'boolean'
])

if (player && player._stats && player._stats.clientId) {
ige.network.send('ui', {
command: 'showCustomModal',
title: modalTitle,
content: htmlContent,
isDismissible: true
isDismissible: true,
extraData: {
playerName: player._stats && player._stats.name,
variables: primitiveVariables
}
}, player._stats.clientId);
}
break;
Expand Down
27 changes: 24 additions & 3 deletions src/gameClasses/components/ui/PlayerUiComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,32 @@ var PlayerUiComponent = IgeEntity.extend({
},

// open a modal with custom content rendered in it
showCustomModal: function (config) {
showCustomModal: function (config, extraData) {
var self = this;

console.log(config, extraData)
config.isDismissible = config.isDismissible === undefined ? true : !!(config.isDismissible);


var playerName = extraData && extraData.playerName;

if (config.content.indexOf('%PLAYER_NAME%') > -1 && playerName) {
config.content = config.content.replace(/%PLAYER_NAME%/g, playerName);
};

var variables = config.content.match(new RegExp('\\$.+?\\$', 'g'));

if (variables && variables.length) {
variables.forEach((variable) => {
var variableName = variable.split('$')[1];

if (extraData.variables.hasOwnProperty(variableName)) {
var variableValue = extraData.variables[variableName];

config.content = config.content.replace(new RegExp(`\\$${variableName}\\$`, 'g'), variableValue);
}
});
}
console.log(config, extraData)

$('#custom-modal .content').html(config.content || '');

if (config.title) {
Expand Down