diff --git a/.gitignore b/.gitignore
index 8d087284..2ed6a4fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
node_modules
-package-lock.json
*.css
storage.db
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ac7bb50..04722f96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,9 +17,10 @@ audit:
lint-server:
stage: test
script:
- - npm install eslint@7.32.0 eslint-plugin-prettier prettier babel-eslint eslint-plugin-requirejs
- - cd src/server
- - ../../node_modules/.bin/eslint .
+ - cd src
+ - npm install
+ - cd server
+ - ../node_modules/.bin/eslint .
only:
- merge_requests
- master
@@ -27,9 +28,10 @@ lint-server:
lint-client:
stage: test
script:
- - npm install eslint@7.32.0 eslint-plugin-prettier prettier babel-eslint eslint-plugin-requirejs
- - cd src/client
- - ../../node_modules/.bin/eslint .
+ - cd src
+ - npm install
+ - cd client
+ - ../node_modules/.bin/eslint .
only:
- merge_requests
- master
diff --git a/src/.eslintignore b/src/.eslintignore
deleted file mode 100644
index b5bab615..00000000
--- a/src/.eslintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/client/plugins/*
-node_modules/*
-*.json
diff --git a/src/client/.eslintrc b/src/client/.eslintrc
index abf6f991..3834824e 100644
--- a/src/client/.eslintrc
+++ b/src/client/.eslintrc
@@ -220,7 +220,7 @@
"no-throw-literal": 2,
"no-undef": 1,
"no-undef-init": 2,
- "no-underscore-dangle": 1,
+ "no-underscore-dangle": 0,
"no-unneeded-ternary": 2,
"no-unreachable": 1,
"no-unused-expressions": 2,
diff --git a/src/client/css/main.less b/src/client/css/main.less
index f3b129f8..a34b6007 100644
--- a/src/client/css/main.less
+++ b/src/client/css/main.less
@@ -206,6 +206,14 @@ body {
color: @qualityLegendary;
}
+.chat-style-white {
+ color: @white !important;
+}
+
+.chat-style-cyan {
+ color: @blueA !important;
+}
+
.color-red {
color: @redB !important;
}
diff --git a/src/client/js/main.js b/src/client/js/main.js
index 25120e9c..366cb98e 100644
--- a/src/client/js/main.js
+++ b/src/client/js/main.js
@@ -11,7 +11,6 @@ define([
'js/sound/sound',
'js/system/globals',
'js/components/components',
- 'ui/templates/online/online',
'ui/templates/tooltips/tooltips'
], function (
client,
diff --git a/src/client/js/system/events.js b/src/client/js/system/events.js
index 2b185ffb..1442e81e 100644
--- a/src/client/js/system/events.js
+++ b/src/client/js/system/events.js
@@ -26,10 +26,7 @@ define([
return callback;
},
clearQueue: function () {
- //Hack to allow the player list to persist
- this.queue.spliceWhere(function (q) {
- return ((q.event !== 'onGetConnectedPlayer') && (q.event !== 'onGetDisconnectedPlayer'));
- });
+ this.queue.length = 0;
},
off: function (eventName, callback) {
let list = this.events[eventName] || [];
diff --git a/src/client/package-lock.json b/src/client/package-lock.json
new file mode 100644
index 00000000..cfb47448
--- /dev/null
+++ b/src/client/package-lock.json
@@ -0,0 +1,13 @@
+{
+ "name": "isleward_client",
+ "version": "0.12.0",
+ "lockfileVersion": 2,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "isleward_client",
+ "version": "0.12.0",
+ "devDependencies": {}
+ }
+ }
+}
diff --git a/src/client/package.json b/src/client/package.json
index 393d73dc..f33e7a33 100644
--- a/src/client/package.json
+++ b/src/client/package.json
@@ -1,13 +1,8 @@
{
"name": "isleward_client",
- "version": "0.12.0",
+ "version": "0.13.0",
"description": "isleward",
- "dependencies": {
- },
"devDependencies": {
- "eslint": "^7.32.0",
- "babel-eslint": "^10.1.0",
- "eslint-plugin-prettier": "^3.4.0",
- "eslint-plugin-requirejs": "^4.0.1"
+
}
}
diff --git a/src/client/ui/factory.js b/src/client/ui/factory.js
index 93e4c326..2f0b9ba5 100644
--- a/src/client/ui/factory.js
+++ b/src/client/ui/factory.js
@@ -97,7 +97,7 @@ define([
else
path = this.root + 'ui/templates/' + type + '/' + type;
}
-
+
require([path], this.onGetTemplate.bind(this, options, type));
},
diff --git a/src/client/ui/templates/login/template.html b/src/client/ui/templates/login/template.html
index 090690d3..8635ed1e 100644
--- a/src/client/ui/templates/login/template.html
+++ b/src/client/ui/templates/login/template.html
@@ -11,11 +11,11 @@
- [ Latest Release Notes ]
+ [ Latest Release Notes ]
- v0.12.0
+ v0.13.0
diff --git a/src/client/ui/templates/messages/messages.js b/src/client/ui/templates/messages/messages.js
index 5544822d..0ca3ad98 100644
--- a/src/client/ui/templates/messages/messages.js
+++ b/src/client/ui/templates/messages/messages.js
@@ -214,8 +214,8 @@ define([
}
if (m.item) {
- let source = message.split(':')[0];
- message = source + ': ' + message.replace(source + ': ', '') + '';
+ const [source, useMessage] = message.split(': {');
+ message = source + ': {' + useMessage + '';
}
let el = $('' + message + '
')
@@ -245,9 +245,9 @@ define([
const isChannel = m?.subType === 'custom';
if (isChannel) {
if (this.find('.filter[filter="' + m.channel + '"]').hasClass('active'))
- el.show();
+ el.css({ display: 'flex' });
else
- el.hide();
+ el.css({ display: 'none' });
}
if (isMobile && ['loot', 'info'].indexOf(m.type) !== -1) {
diff --git a/src/client/ui/templates/messages/styles.less b/src/client/ui/templates/messages/styles.less
index 96818e44..e79db3d5 100644
--- a/src/client/ui/templates/messages/styles.less
+++ b/src/client/ui/templates/messages/styles.less
@@ -53,6 +53,7 @@
.list-message {
display: none;
+ justify-content: row;
width: 100%;
padding: 5px 10px;
color: white;
@@ -64,7 +65,7 @@
drop-shadow(0px 2px 0px @blackD)
drop-shadow(2px 0px 0px @blackD)
drop-shadow(-2px 0px 0px @blackD);
- word-wrap: break-word;
+ word-wrap: anywhere;
line-height: 18px;
&.q {
@@ -111,19 +112,27 @@
}
&.rep .rep {
- display: block;
+ display: flex;
}
&.chat .chat {
- display: block;
+ display: flex;
}
&.info .info {
- display: block;
+ display: flex;
}
&.loot .loot {
- display: block;
+ display: flex;
+ }
+
+ .emojiTag {
+ width: 24px;
+ height: 24px;
+ margin-top: -4px;
+ margin-right: 5px;
+ flex-shrink: 0;
}
}
diff --git a/src/client/ui/templates/online/online.js b/src/client/ui/templates/online/online.js
deleted file mode 100644
index 639bf235..00000000
--- a/src/client/ui/templates/online/online.js
+++ /dev/null
@@ -1,177 +0,0 @@
-define([
- 'js/system/events',
- 'js/system/client',
- 'js/system/globals',
- 'html!ui/templates/online/template',
- 'css!ui/templates/online/styles',
- 'html!ui/templates/online/templateListItem'
-], function (
- events,
- client,
- globals,
- template,
- styles,
- templateListItem
-) {
- return {
- tpl: template,
- centered: true,
-
- onlineList: [],
-
- modal: true,
- hasClose: true,
-
- actions: [],
-
- postRender: function () {
- globals.onlineList = this.onlineList;
-
- this.onEvent('onGetConnectedPlayer', this.onGetConnectedPlayer.bind(this));
- this.onEvent('onGetDisconnectedPlayer', this.onGetDisconnectedPlayer.bind(this));
-
- this.onEvent('onGetSocialActions', this.onGetSocialActions.bind(this));
-
- this.onEvent('onKeyDown', this.onKeyDown.bind(this));
- this.onEvent('onShowOnline', this.toggle.bind(this));
- },
-
- onGetSocialActions: function (actions) {
- this.actions = actions;
- },
-
- onKeyDown: function (key) {
- if (key === 'o')
- this.toggle();
- },
-
- onAfterShow: function () {
- this.build();
- },
-
- onGetConnectedPlayer: function (list) {
- if (!list.length)
- list = [list];
-
- let onlineList = this.onlineList;
-
- list.forEach(function (l) {
- let exists = onlineList.find(function (o) {
- return (o.name === l.name);
- });
- if (exists)
- $.extend(true, exists, l);
- else
- onlineList.push(l);
- });
-
- onlineList
- .sort(function (a, b) {
- if (a.level === b.level) {
- if (a.name > b.name)
- return 1;
- return -1;
- } return b.level - a.level;
- });
-
- if (this.shown)
- this.build();
- },
-
- onGetDisconnectedPlayer: function (playerName) {
- let onlineList = this.onlineList;
-
- onlineList.spliceWhere(function (o) {
- return (o.name === playerName);
- });
-
- if (this.shown)
- this.build();
- },
-
- build: function () {
- let headingText = this.el.find('.heading-text');
- let playerCount = this.onlineList.length;
- headingText.html(`online players (${playerCount})`);
-
- let container = this.el.find('.list');
- container
- .children(':not(.heading)')
- .remove();
-
- this.onlineList.forEach(function (l) {
- let html = templateListItem
- .replace('$NAME$', l.name)
- .replace('$LEVEL$', l.level)
- .replace('$CLASS$', l.class);
-
- let el = $(html)
- .appendTo(container)
- .on('contextmenu', this.showContext.bind(this, l));
-
- if (isMobile)
- el.on('mousedown', this.showContext.bind(this, l));
- }, this);
- },
-
- showContext: function (char, e) {
- if (char.name !== window.player.name) {
- const extraActions = this.actions.map(({ command, text }) => {
- return {
- text,
- callback: this.performAction.bind(this, command, char.name)
- };
- });
-
- const isBlocked = window.player.social.isPlayerBlocked(char.name);
-
- const actions = [{
- text: 'invite to party',
- callback: this.invite.bind(this, char.id)
- }, {
- text: 'whisper',
- callback: events.emit.bind(events, 'onDoWhisper', char.name)
- }, {
- text: isBlocked ? 'unblock' : 'block',
- callback: this.block.bind(this, char.name)
- }, ...extraActions];
-
- events.emit('onBeforeOnlineListContext', char.id, actions);
-
- events.emit('onContextMenu', actions, e);
- }
-
- e.preventDefault();
- return false;
- },
-
- performAction: function (command, charName) {
- client.request({
- cpn: 'social',
- method: 'chat',
- data: {
- message: `/${command} ${charName}`
- }
- });
- },
-
- block: function (charName) {
- const isBlocked = window.player.social.isPlayerBlocked(charName);
- let method = isBlocked ? 'unblock' : 'block';
-
- this.performAction(method, charName);
- },
-
- invite: function (charId) {
- this.hide();
-
- client.request({
- cpn: 'social',
- method: 'getInvite',
- data: {
- targetId: charId
- }
- });
- }
- };
-});
diff --git a/src/client/ui/templates/online/styles.less b/src/client/ui/templates/online/styles.less
deleted file mode 100644
index b6bd8d9b..00000000
--- a/src/client/ui/templates/online/styles.less
+++ /dev/null
@@ -1,100 +0,0 @@
-@import "../../../css/colors.less";
-
-.uiOnline {
- display: none;
- background-color: @blackB;
- border: 5px solid @blackB;
- text-align: center;
- width: 450px;
- height: 396px;
-
- > .heading {
- color: @blueA;
- width: 100%;
- height: 36px;
- background-color: @blackB;
-
- .heading-text {
- padding-top: 8px;
- margin: auto;
- }
-
- }
-
- .bottom {
- height: calc(100% - 36px);
- background-color: @blackC;
- padding: 8px;
-
- .list {
- width: 100%;
- height: 100%;
- overflow-y: auto;
- background-color: @blackC;
- display: flex;
- flex-direction: column;
-
- .heading {
- height: 24px;
- color: @white;
-
- > div {
- float: left;
- padding: 4px;
- height: 24px;
-
- &:nth-child(1) {
- width: 10%;
- }
-
- &:nth-child(2) {
- width: 55%;
- }
-
- &:nth-child(3) {
- width: 35%;
- }
-
- }
-
- }
-
- .onlineUser {
- color: @grayC;
- height: 24px;
- cursor: pointer;
-
- > div {
- float: left;
- padding: 4px;
- height: 24px;
-
- &:nth-child(1) {
- width: 10%;
- }
-
- &:nth-child(2) {
- width: 55%;
- }
-
- &:nth-child(3) {
- width: 35%;
- }
-
- }
-
- &:hover {
- background-color: @blackB;
- }
-
- }
-
- }
-
- }
-
-}
-
-.mobile .uiOnline {
- z-index: 2;
-}
diff --git a/src/client/ui/templates/online/template.html b/src/client/ui/templates/online/template.html
deleted file mode 100644
index 10c18080..00000000
--- a/src/client/ui/templates/online/template.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
level
-
name
-
spirit
-
-
-
-
-
$LEVEL$
-
$NAME$
-
($CLASS$)
-