From d758a59199ac2fbcfc3b6e2f0c413deb31951469 Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Sun, 23 Sep 2018 20:44:50 +0200 Subject: [PATCH] more work to wquery --- src/client/css/main.less | 2 +- src/client/index.html | 2 +- src/client/js/components/inventory.js | 6 ++-- src/client/js/rendering/renderer.js | 2 +- src/client/plugins/wquery.js | 33 ++++++++++++++----- .../ui/templates/tooltipItem/tooltipItem.js | 6 ++-- src/client/ui/templates/wardrobe/wardrobe.js | 4 +-- .../ui/templates/workbench/workbench.js | 2 +- .../components/extensions/socialCommands.js | 6 ++-- src/server/misc/mods.js | 2 +- 10 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/client/css/main.less b/src/client/css/main.less index 4dc554b4..00e71b72 100644 --- a/src/client/css/main.less +++ b/src/client/css/main.less @@ -35,7 +35,7 @@ body { user-select: none; } -.canvasContainer { +.canvas-container { position: relative; float: left; diff --git a/src/client/index.html b/src/client/index.html index 0b578e6a..86a6dd14 100644 --- a/src/client/index.html +++ b/src/client/index.html @@ -11,7 +11,7 @@ -
+
diff --git a/src/client/js/components/inventory.js b/src/client/js/components/inventory.js index 13811c3b..c6f7d083 100644 --- a/src/client/js/components/inventory.js +++ b/src/client/js/components/inventory.js @@ -69,13 +69,11 @@ define([ if (item.level > stats.level) errors.push('level'); - if ((item.requires) && (stats[item.requires[0].stat] < item.requires[0].value)) + if (item.requires && item.requires[0] && stats[item.requires[0].stat] < item.requires[0].value) errors.push('stats'); if (item.factions) { - if (item.factions.some(function (f) { - return f.noEquip; - })) + if (item.factions.some(f => f.noEquip)) errors.push('faction'); } diff --git a/src/client/js/rendering/renderer.js b/src/client/js/rendering/renderer.js index 1be46c4b..d966390e 100644 --- a/src/client/js/rendering/renderer.js +++ b/src/client/js/rendering/renderer.js @@ -90,7 +90,7 @@ define([ window.onresize = this.onResize.bind(this); $(this.renderer.view) - .appendTo('.canvasContainer'); + .appendTo('.canvas-container'); this.stage = new pixi.Container(); diff --git a/src/client/plugins/wquery.js b/src/client/plugins/wquery.js index ea49e78a..7d7d7b38 100644 --- a/src/client/plugins/wquery.js +++ b/src/client/plugins/wquery.js @@ -1,3 +1,5 @@ +const sqData = new Map(); + const sq = { default: function (q) { const type = typeof(q); @@ -26,8 +28,11 @@ const sq = { return sq.wrap(els); }, - children: function () { - return sq.wrap(this[0].children); + children: function (filter) { + if (!filter) + return sq.wrap(this[0].children); + + return this.find(filter); }, parent: function () { @@ -96,7 +101,8 @@ const sq = { }, addClass: function (classNames) { - classNames.split(' ').forEach(c => this.each(el => el.classList.add(c))); + if (classNames) + classNames.split(' ').forEach(c => this.each(el => el.classList.add(c))); return this; }, @@ -158,7 +164,13 @@ const sq = { if (['left', 'top', 'width', 'height'].includes(c) && (!val.indexOf || val.indexOf('%') === -1)) val += 'px'; - this.each(el => val ? el.attributeStyleMap.set(c, val) : el.attributeStyleMap.delete(c)); + this.each(el => { + if (val) + el.style[c] = val; + + else + el.attributeStyleMap.delete(c); + }); }); return this; }, @@ -235,13 +247,16 @@ const sq = { }, data: function (property, value) { - if (!this.dataSet) - this.dataSet = {}; + let dataSet = sqData.get(this[0]); + if (!dataSet) { + dataSet = {}; + sqData.set(this[0], dataSet); + } if (arguments.length === 1) - return this.dataSet[property]; + return dataSet[property]; - this.dataSet[property] = value; + dataSet[property] = value; return this; }, @@ -316,7 +331,7 @@ const sq = { return newO; } - if (!newO) + if (!newO || typeof(newO) !== 'object') newO = {}; for (let i in o) { if (o.hasOwnProperty(i)) diff --git a/src/client/ui/templates/tooltipItem/tooltipItem.js b/src/client/ui/templates/tooltipItem/tooltipItem.js index 5ff6a5f3..803eab5c 100644 --- a/src/client/ui/templates/tooltipItem/tooltipItem.js +++ b/src/client/ui/templates/tooltipItem/tooltipItem.js @@ -247,7 +247,7 @@ define([ .replace('$STATS$', stats) .replace('$LEVEL$', level); - if (item.requires) { + if (item.requires && item.requires[0]) { html = html .replace('$ATTRIBUTE$', item.requires[0].stat) .replace('$ATTRIBUTEVALUE$', item.requires[0].value); @@ -305,7 +305,7 @@ define([ } else this.tooltip.find('.requires .stats').show(); - if ((!item.stats) || (!Object.keys(item.stats).length)) + if (!stats.length) this.tooltip.children('.stats').hide(); if ((!item.type) || (item.type === item.name)) @@ -399,7 +399,7 @@ define([ } else this.find('.faction').hide(); - if ((shiftDown) || (!compare)) + if (shiftDown || !compare) this.tooltip.find('.info').hide(); if (item.cd) { diff --git a/src/client/ui/templates/wardrobe/wardrobe.js b/src/client/ui/templates/wardrobe/wardrobe.js index d6c6e6f7..99e63df6 100644 --- a/src/client/ui/templates/wardrobe/wardrobe.js +++ b/src/client/ui/templates/wardrobe/wardrobe.js @@ -58,13 +58,13 @@ define([ this.skin = skin; let costume = skin.sprite.split(','); - let spirteX = -costume[0] * 8; + let spriteX = -costume[0] * 8; let spriteY = -costume[1] * 8; let spritesheet = skin.spritesheet || '../../../images/characters.png'; this.find('.sprite') - .css('background', 'url("' + spritesheet + '") ' + spirteX + 'px ' + spriteY + 'px'); + .css('background', 'url("' + spritesheet + '") ' + spriteX + 'px ' + spriteY + 'px'); }, apply: function () { diff --git a/src/client/ui/templates/workbench/workbench.js b/src/client/ui/templates/workbench/workbench.js index 98362c5f..8fea5ee3 100644 --- a/src/client/ui/templates/workbench/workbench.js +++ b/src/client/ui/templates/workbench/workbench.js @@ -31,7 +31,7 @@ define([ onOpenWorkbench: function (msg) { this.workbenchId = msg.workbenchId; - this.find('.heading-title').html(msg.name); + this.find('.heading-text').html(msg.name); this.renderRecipes(msg.recipes); diff --git a/src/server/components/extensions/socialCommands.js b/src/server/components/extensions/socialCommands.js index 1855f07a..acc0d4f7 100644 --- a/src/server/components/extensions/socialCommands.js +++ b/src/server/components/extensions/socialCommands.js @@ -9,6 +9,7 @@ let commandRoles = { join: 0, leave: 0, unEq: 0, + roll: 0, //Mods mute: 5, @@ -34,7 +35,8 @@ let localCommands = [ 'leave', 'mute', 'unmute', - 'setPassword' + 'setPassword', + 'roll' ]; module.exports = { @@ -196,7 +198,7 @@ module.exports = { roll: function () { let roll = 1 + ~~(Math.random() * 100); - global.io.sockets.emit('event', { + cons.emit('event', { event: 'onGetMessages', data: { messages: [{ diff --git a/src/server/misc/mods.js b/src/server/misc/mods.js index af60cc0e..9fc7b0ac 100644 --- a/src/server/misc/mods.js +++ b/src/server/misc/mods.js @@ -10,7 +10,7 @@ module.exports = { modList.forEach(function (m) { let mod = require('../mods/' + m + '/index'); - //this.onGetMod(m, mod); + this.onGetMod(m, mod); }, this); cbDone();