Merge branch 'master' into fix-revoke-assign-btn

codecombat · Jul 26, 2018 · f44e039 · f44e039
2 parents b5eecd9 + fe8a182
commit f44e039
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 21 deletions.
diff --git a/app/assets/images/pages/home/emma.png b/app/assets/images/pages/home/emma.png
diff --git a/app/assets/images/pages/home/joey_110.png b/app/assets/images/pages/home/joey_110.png
diff --git a/app/models/User.coffee b/app/models/User.coffee
@@ -208,14 +208,6 @@ module.exports = class User extends CocoModel
     return 0 unless numVideos > 0
     return me.get('testGroupNumber') % numVideos
 
-  testCinematicPlayback: ->
-    return @shouldTestCinematicPlayback if @shouldTestCinematicPlayback?
-    return true if me.isAdmin()
-    return false if me.isStudent() or me.isTeacher()
-    @shouldTestCinematicPlayback = me.get('testGroupNumber') % 2 is 0
-    application.tracker.identify cinematicPlayback: @shouldTestCinematicPlayback
-    @shouldTestCinematicPlayback
-
   hasSubscription: ->
     return false if me.isStudent() or me.isTeacher()
     if payPal = @get('payPal')

diff --git a/app/templates/home-view.jade b/app/templates/home-view.jade
@@ -145,8 +145,8 @@ block content
             h3(data-i18n="new_home.builds_concepts_up")
 
         .col-lg-2.col-sm-3.col-lg-offset-1.text-center.col-sm-pull-8.col-lg-pull-7
-          img.img-circle(src="/images/pages/home/joey_110.png")
-          h6 Joey
+          img.img-circle(src="/images/pages/home/emma.png")
+          h6 Emma
           .small Grade 10
 
 

diff --git a/app/templates/teachers/edit-student-modal.jade b/app/templates/teachers/edit-student-modal.jade
@@ -37,9 +37,6 @@ block modal-body-content
       else
         .small-details
           button.revoke-student-btn.btn.btn-burgundy-alt(data-i18n="teacher.revoke_license")
-
-
-
     .edit-student-details
       strong(data-i18n="teacher.student_details")
       span.spr :

diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee
@@ -683,14 +683,8 @@ module.exports = class SpellView extends CocoView
       @saveSpadeTimeout = null
 
   onManualCast: (e) ->
-    cinematic = @options.level.isType('hero', 'hero-ladder', 'course-ladder')
-    cinematic = false if me.isStudent() and not @options.level.isType('course-ladder')
-    cinematic = false if not me.isStudent() and not me.testCinematicPlayback()
-    cinematic = false if $('#page-container').width() > 1440  # Not really needed on large screens
-    cinematic = false if key.shift  # Temporary? A way to turn it off for testing.
-
     cast = @$el.parent().length
-    @recompile cast, e.realTime, cinematic
+    @recompile cast, e.realTime, false
     @focus() if cast
     if @options.level.isType('web-dev')
       @sourceAtLastCast = @getSource()

diff --git a/app/views/play/modal/PlayHeroesModal.coffee b/app/views/play/modal/PlayHeroesModal.coffee
@@ -142,11 +142,11 @@ module.exports = class PlayHeroesModal extends ModalView
         {id: 'python', name: "Python (#{$.i18n.t('choose_hero.default')})"}
         {id: 'javascript', name: 'JavaScript'}
         {id: 'coffeescript', name: "CoffeeScript (#{$.i18n.t('choose_hero.experimental')})"}
-        {id: 'lua', name: "Lua (#{$.i18n.t('choose_hero.experimental')})"}
       ]
 
       if me.isAdmin() or not application.isProduction()
         @codeLanguageList.push {id: 'java', name: "Java (#{$.i18n.t('choose_hero.experimental')})"}
+        @codeLanguageList.push {id: 'lua', name: "Lua (#{$.i18n.t('choose_hero.experimental')})"}
 
   onHeroChanged: (e) ->
     direction = e.direction  # 'left' or 'right'