From 1d81133f24ed385af9066504a5e0fa0f30ec6129 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Sun, 9 Aug 2015 14:10:32 -0700 Subject: [PATCH] Possible solution for #2917, needs testing. Added crossbow bolts to missile orientation display logic. --- app/assets/javascripts/workers/worker_world.js | 3 ++- app/lib/surface/Lank.coffee | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/workers/worker_world.js b/app/assets/javascripts/workers/worker_world.js index 4b5f43f07..65ba1b42e 100644 --- a/app/assets/javascripts/workers/worker_world.js +++ b/app/assets/javascripts/workers/worker_world.js @@ -85,7 +85,8 @@ var ensureLanguagesImportedFromUserCodeMap = function (userCodeMap) { var restricted = ["XMLHttpRequest", "Worker"]; if (!self.navigator || !(self.navigator.userAgent.indexOf('MSIE') > 0) && - !self.navigator.userAgent.match(/Trident.*rv\:11\./)) { + !self.navigator.userAgent.match(/Trident.*rv\:11\./) && + !self.navigator.userAgent.match(/Edge/)) { // Can't restrict 'importScripts' in IE11, skip for all IE versions restricted.push("importScripts"); } diff --git a/app/lib/surface/Lank.coffee b/app/lib/surface/Lank.coffee index c64591207..a606054e1 100644 --- a/app/lib/surface/Lank.coffee +++ b/app/lib/surface/Lank.coffee @@ -61,7 +61,7 @@ module.exports = Lank = class Lank extends CocoClass constructor: (@thangType, options) -> super() spriteName = @thangType.get('name') - @isMissile = /(Missile|Arrow|Spear)/.test(spriteName) and not /(Tower|Charge)/.test(spriteName) + @isMissile = /(Missile|Arrow|Spear|Bolt)/.test(spriteName) and not /(Tower|Charge)/.test(spriteName) @options = _.extend($.extend(true, {}, @options), options) @setThang @options.thang if @thang?