codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-12-29 13:22:42 -08:00
commit 317719fbe4
3 changed files with 6 additions and 3 deletions
app/views
editor/campaign
CampaignEditorView.coffee
play/menu
GuideView.coffee
scripts/windows/coco-dev-setup/batch/config
downloads.coco

5
app/views/editor/campaign/CampaignEditorView.coffee
View file

@ -201,8 +201,11 @@ module.exports = class CampaignEditorView extends RootView
onCampaignLevelClicked: (levelOriginal) -> onCampaignLevelClicked: (levelOriginal) ->
return unless levelTreema = @treema.childrenTreemas?.levels?.childrenTreemas?[levelOriginal] return unless levelTreema = @treema.childrenTreemas?.levels?.childrenTreemas?[levelOriginal]
if key.ctrl
url = "/editor/level/#{levelTreema.data.slug}"
window.open url, '_blank'
levelTreema.select() levelTreema.select()
# levelTreema.open() #levelTreema.open()
onCampaignLevelDoubleClicked: (levelOriginal) -> onCampaignLevelDoubleClicked: (levelOriginal) ->
@openCampaignLevelView @supermodel.getModelByOriginal Level, levelOriginal @openCampaignLevelView @supermodel.getModelByOriginal Level, levelOriginal

2
app/views/play/menu/GuideView.coffee
View file

@ -14,7 +14,7 @@ module.exports = class LevelGuideView extends CocoView
constructor: (options) -> constructor: (options) ->
@levelID = options.level.get('slug') @levelID = options.level.get('slug')
@helpVideos = options.level.get 'helpVideos' @helpVideos = options.level.get('helpVideos') ? []
@trackedHelpVideoStart = @trackedHelpVideoFinish = false @trackedHelpVideoStart = @trackedHelpVideoFinish = false
# A/B Testing video tutorial styles # A/B Testing video tutorial styles

2
scripts/windows/coco-dev-setup/batch/config/downloads.coco
View file

@ -14,7 +14,7 @@
<vs12redist>http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe</vs12redist> <vs12redist>http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe</vs12redist>
</b64> </b64>
<general> <general>
<gitbash>https://msysgit.googlecode.com/files/Git-1.8.5.2-preview20131230.exe</gitbash> <gitbash>https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20141217/Git-1.9.5-preview20141217.exe</gitbash>
<vs10redist>http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe</vs10redist> <vs10redist>http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe</vs10redist>
</general> </general>
</general> </general>