diff --git a/app/assets/index.html b/app/assets/index.html index 9e6e7541e..567a2f9bf 100644 --- a/app/assets/index.html +++ b/app/assets/index.html @@ -47,7 +47,6 @@ <!-- end segment.io code --> <!-- begin olark code --> - <!-- <script data-cfasync="false" type='text/javascript'>/*<![CDATA[*/window.olark||(function(c){var f=window,d=document,l=f.location.protocol=="https:"?"https:":"http:",z=c.name,r="load";var nt=function(){ f[z]=function(){ (a.s=a.s||[]).push(arguments)};var a=f[z]._={ @@ -66,7 +65,6 @@ loader: "static.olark.com/jsclient/loader0.js",name:"olark",methods:["configure","extend","declare","identify"]}); /* custom configuration goes here (www.olark.com/documentation) */ olark.identify('1451-787-10-5544');/*]]>*/</script> - --> <!-- end olark code --> </head> diff --git a/app/lib/scripts/SurfaceScriptModule.coffee b/app/lib/scripts/SurfaceScriptModule.coffee index 28424130f..d6c3b3016 100644 --- a/app/lib/scripts/SurfaceScriptModule.coffee +++ b/app/lib/scripts/SurfaceScriptModule.coffee @@ -29,7 +29,7 @@ module.exports = class SurfaceScriptModule extends ScriptModule e = {} e.pos = focus.target if _.isPlainObject focus.target e.thangID = focus.target if _.isString focus.target - e.zoom = focus.zoom or 2.0 + e.zoom = focus.zoom or 2.0 # TODO: test only doing this if e.pos, e.thangID, or focus.zoom? e.duration = if focus.duration? then focus.duration else 1500 e.duration = 0 if instant e.bounds = focus.bounds if focus.bounds? diff --git a/app/lib/surface/Surface.coffee b/app/lib/surface/Surface.coffee index b0b1ee423..11c46b993 100644 --- a/app/lib/surface/Surface.coffee +++ b/app/lib/surface/Surface.coffee @@ -244,7 +244,7 @@ module.exports = Surface = class Surface extends CocoClass target = null @camera.setBounds e.bounds if e.bounds @cameraBorder.updateBounds @camera.bounds - @camera.zoomTo target, e.zoom, e.duration + @camera.zoomTo target, e.zoom, e.duration # TODO: SurfaceScriptModule perhaps shouldn't assign e.zoom if not set setDisabled: (@disabled) -> @spriteBoss.disabled = @disabled