- Fix extra separation

coalaura · coalaura · commit 944be5ff485c · 2021-07-14T18:52:52.000+02:00
diff --git a/resources/js/Pages/Map/Index.vue b/resources/js/Pages/Map/Index.vue
@@ -367,7 +367,8 @@ export default {
                             attributes.push('on foot');
                             markers[id].options.forceZIndex = 101;
                         }
-                        extra += '<br><i>Is ' + attributes.shift() + (attributes.length > 0 ? ' and ' + attributes.join(', ') : '') + '</i>';
+                        const lastExtra = attributes.pop();
+                        extra += '<br><i>Is ' + (attributes.length > 0 ? attributes.join(', ') + ' and ' : '') + lastExtra + '</i>';
 
                         if (player.afk > 300) {
                             extra += '<br><i>Hasn\'t moved in ' + _this.formatSeconds(player.afk) + '</i>';

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,8 @@ export default {`
`367`	`367`	`attributes.push('on foot');`
`368`	`368`	`markers[id].options.forceZIndex = 101;`
`369`	`369`	`}`
`370`		`- extra += '<br><i>Is ' + attributes.shift() + (attributes.length > 0 ? ' and ' + attributes.join(', ') : '') + '</i>';`
	`370`	`+ const lastExtra = attributes.pop();`
	`371`	`+ extra += '<br><i>Is ' + (attributes.length > 0 ? attributes.join(', ') + ' and ' : '') + lastExtra + '</i>';`
`371`	`372`
`372`	`373`	`if (player.afk > 300) {`
`373`	`374`	`extra += '<br><i>Hasn\'t moved in ' + _this.formatSeconds(player.afk) + '</i>';`