From 8640369b269206fc9cdbcdc07f7a3da6595df5aa Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Mon, 22 Sep 2014 21:50:48 -0700
Subject: [PATCH] Improved solidity of victory modal. Fixed error with empty
 sound groups in Thang editor.

---
 app/lib/AudioPlayer.coffee                     | 2 +-
 app/lib/surface/CocoSprite.coffee              | 2 +-
 app/lib/world/world.coffee                     | 1 +
 app/templates/play/level/modal/victory.jade    | 5 ++++-
 app/views/play/level/modal/VictoryModal.coffee | 3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/lib/AudioPlayer.coffee b/app/lib/AudioPlayer.coffee
index 7208bd20e..3a32d3759 100644
--- a/app/lib/AudioPlayer.coffee
+++ b/app/lib/AudioPlayer.coffee
@@ -108,7 +108,7 @@ class AudioPlayer extends CocoClass
   # TODO: load Interface sounds somehow, somewhere, somewhen
 
   preloadSoundReference: (sound) ->
-    name = @nameForSoundReference sound
+    return unless name = @nameForSoundReference sound
     filename = '/file/' + name
     @preloadSound filename, name
     filename
diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee
index f76caa2e4..798a8f38b 100644
--- a/app/lib/surface/CocoSprite.coffee
+++ b/app/lib/surface/CocoSprite.coffee
@@ -90,7 +90,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
 
   setUpSprite: ->
     for trigger, sounds of @thangType.get('soundTriggers') or {} when trigger isnt 'say'
-      AudioPlayer.preloadSoundReference sound for sound in sounds
+      AudioPlayer.preloadSoundReference sound for sound in sounds when sound
     if @thangType.get('raster')
       @stillLoading = false
       @actions = {}
diff --git a/app/lib/world/world.coffee b/app/lib/world/world.coffee
index 299296b3d..0cc3469de 100644
--- a/app/lib/world/world.coffee
+++ b/app/lib/world/world.coffee
@@ -68,6 +68,7 @@ module.exports = class World
 
   setThang: (thang) ->
     for old, i in @thangs
+      console.error 'world trying to set', thang, 'over', old unless old? and thang?
       if old.id is thang.id
         @thangs[i] = thang
     @thangMap[thang.id] = thang
diff --git a/app/templates/play/level/modal/victory.jade b/app/templates/play/level/modal/victory.jade
index 08a753b81..0620c91e8 100644
--- a/app/templates/play/level/modal/victory.jade
+++ b/app/templates/play/level/modal/victory.jade
@@ -17,7 +17,10 @@ block modal-footer-content
     a.btn.btn-primary(href="/play/ladder/#{level.get('slug')}#my-matches", data-dismiss="modal", data-i18n="play_level.victory_go_ladder") Return to Ladder
   else if hasNextLevel
     button.btn.btn-success.next-level-button(data-dismiss="modal", data-i18n="play_level.victory_play_next_level") Play Next Level
-  a.btn.btn-primary(href="/play-hero", data-dismiss="modal", data-i18n="play_level.victory_go_home") Go Home
+  else if level.get('type', true) === 'hero'
+    a.btn.btn-success(href="/play-hero", data-dismiss="modal", data-i18n="play_level.victory_play_next_level") Play Next Level
+  else
+    a.btn.btn-primary(href="/", data-dismiss="modal", data-i18n="play_level.victory_go_home") Go Home
   if me.get('anonymous')
     p.sign-up-poke
       button.btn.btn-success.sign-up-button.btn-large(data-toggle="coco-modal", data-target="modal/SignupModal", data-i18n="play_level.victory_sign_up") Sign Up to Save Progress
diff --git a/app/views/play/level/modal/VictoryModal.coffee b/app/views/play/level/modal/VictoryModal.coffee
index 083963193..e985b9e70 100644
--- a/app/views/play/level/modal/VictoryModal.coffee
+++ b/app/views/play/level/modal/VictoryModal.coffee
@@ -34,6 +34,9 @@ module.exports = class VictoryModal extends ModalView
     @session = options.session
     @saveReviewEventually = _.debounce(@saveReviewEventually, 2000)
     @loadExistingFeedback()
+    if @level.get('type', true) is 'hero'
+      @closeButton = false
+      @closesOnClickOutside = false
     super options
 
   loadExistingFeedback: ->