mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-04-26 05:53:39 -04:00
Re-enabled Olark.
This commit is contained in:
parent
613e7848dc
commit
dcf7a0d1fd
3 changed files with 2 additions and 4 deletions
app
|
@ -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>
|
||||
|
|
|
@ -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?
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue