codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-08-10 06:49:24 -07:00
commit 6de96e76b6
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/workers/worker_world.js
View file

@ -85,7 +85,8 @@ var ensureLanguagesImportedFromUserCodeMap = function (userCodeMap) {
var restricted = ["XMLHttpRequest", "Worker"]; var restricted = ["XMLHttpRequest", "Worker"];
if (!self.navigator || !(self.navigator.userAgent.indexOf('MSIE') > 0) && 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 // Can't restrict 'importScripts' in IE11, skip for all IE versions
restricted.push("importScripts"); restricted.push("importScripts");
} }

2
app/lib/surface/Lank.coffee
View file

@ -61,7 +61,7 @@ module.exports = Lank = class Lank extends CocoClass
constructor: (@thangType, options) -> constructor: (@thangType, options) ->
super() super()
spriteName = @thangType.get('name') 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) @options = _.extend($.extend(true, {}, @options), options)
@setThang @options.thang @setThang @options.thang
if @thang? if @thang?