codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-02 00:43:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-enabled Olark.

Browse source
This commit is contained in:
Nick Winter 2014-02-19 12:43:25 -08:00
parent 613e7848dc
commit dcf7a0d1fd
3 changed files with 2 additions and 4 deletions

2
app/assets/index.html
View file

@ -47,7 +47,6 @@
<!-- end segment.io code --> <!-- end segment.io code -->
<!-- begin olark 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(){ <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(){ f[z]=function(){
(a.s=a.s||[]).push(arguments)};var a=f[z]._={ (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"]}); loader: "static.olark.com/jsclient/loader0.js",name:"olark",methods:["configure","extend","declare","identify"]});
/* custom configuration goes here (www.olark.com/documentation) */ /* custom configuration goes here (www.olark.com/documentation) */
olark.identify('1451-787-10-5544');/*]]>*/</script> olark.identify('1451-787-10-5544');/*]]>*/</script>
-->
<!-- end olark code --> <!-- end olark code -->
</head> </head>

2
app/lib/scripts/SurfaceScriptModule.coffee
View file

@ -29,7 +29,7 @@ module.exports = class SurfaceScriptModule extends ScriptModule
e = {} e = {}
e.pos = focus.target if _.isPlainObject focus.target e.pos = focus.target if _.isPlainObject focus.target
e.thangID = focus.target if _.isString 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 = if focus.duration? then focus.duration else 1500
e.duration = 0 if instant e.duration = 0 if instant
e.bounds = focus.bounds if focus.bounds? e.bounds = focus.bounds if focus.bounds?

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

@ -244,7 +244,7 @@ module.exports = Surface = class Surface extends CocoClass
target = null target = null
@camera.setBounds e.bounds if e.bounds @camera.setBounds e.bounds if e.bounds
@cameraBorder.updateBounds @camera.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) -> setDisabled: (@disabled) ->
@spriteBoss.disabled = @disabled @spriteBoss.disabled = @disabled