codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 23:58:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trying latest sass-brunch (which happened to alphabetize our devDependencies.) Fixed bug with required/restricted items not showing up properly. Added quick links to open level editors from campaign editor.

Browse source
This commit is contained in:
Nick Winter 2015-01-02 12:36:47 -08:00
parent 42166bf623
commit f66afa1dc0
4 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -309,6 +309,7 @@ class LevelNode extends TreemaObjectNode
if data.tasks if data.tasks
completion = "#{(t for t in data.tasks when t.complete).length} / #{data.tasks.length}" completion = "#{(t for t in data.tasks when t.complete).length} / #{data.tasks.length}"
valEl.append $("<a href='/editor/level/#{_.string.slugify(data.name)}' class='spr'>(e)</a>")
valEl.append $("<#{el}></#{el}>").addClass('treema-shortened').text name valEl.append $("<#{el}></#{el}>").addClass('treema-shortened').text name
if status if status
valEl.append $('<em class="spl"></em>').text status valEl.append $('<em class="spl"></em>').text status

2
app/views/play/CampaignView.coffee
View file

@ -331,7 +331,7 @@ module.exports = class CampaignView extends RootView
playAmbientSound: -> playAmbientSound: ->
return if @ambientSound return if @ambientSound
return unless file = @campaign.get('ambientSound')?[AudioPlayer.ext.substr 1] return unless file = @campaign?.get('ambientSound')?[AudioPlayer.ext.substr 1]
src = "/file/#{file}" src = "/file/#{file}"
unless AudioPlayer.getStatus(src)?.loaded unless AudioPlayer.getStatus(src)?.loaded
AudioPlayer.preloadSound src AudioPlayer.preloadSound src

4
app/views/play/menu/InventoryModal.coffee
View file

@ -93,8 +93,8 @@ module.exports = class InventoryModal extends ModalView
locked = not (item.get('original') in me.items()) locked = not (item.get('original') in me.items())
#locked = false if me.get('slug') is 'nick' #locked = false if me.get('slug') is 'nick'
required = item.get('slug') in _.flatten(_.values(@options.level.get('requiredGear') ? {})) required = item.get('original') in _.flatten(_.values(@options.level.get('requiredGear') ? {}))
restricted = item.get('slug') in _.flatten(_.values(@options.level.get('restrictedGear') ? {})) restricted = item.get('original') in _.flatten(_.values(@options.level.get('restrictedGear') ? {}))
placeholder = not item.getFrontFacingStats().props.length and not _.size(item.getFrontFacingStats().stats) placeholder = not item.getFrontFacingStats().props.length and not _.size(item.getFrontFacingStats().stats)
if placeholder and locked # The item is not complete, so don't put it into a collection. if placeholder and locked # The item is not complete, so don't put it into a collection.

38
package.json
View file

@ -72,35 +72,35 @@
"stripe": "~2.9.0" "stripe": "~2.9.0"
}, },
"devDependencies": { "devDependencies": {
"jade": "0.33.x", "auto-reload-brunch": "> 1.0 < 1.8",
"javascript-brunch": "> 1.0 < 1.8", "bless-brunch": "https://github.com/ThomasConner/bless-brunch/tarball/master",
"bower": "~1.3.8",
"brunch": "~1.7.4",
"coffee-script-brunch": "https://github.com/brunch/coffee-script-brunch/tarball/master", "coffee-script-brunch": "https://github.com/brunch/coffee-script-brunch/tarball/master",
"coffeelint-brunch": "> 1.0 < 1.8", "coffeelint-brunch": "> 1.0 < 1.8",
"sass-brunch": "1.7.2", "compressible": "~1.0.1",
"css-brunch": "> 1.0 < 1.8", "css-brunch": "> 1.0 < 1.8",
"jade": "0.33.x",
"jade-brunch": "> 1.0 < 1.8", "jade-brunch": "> 1.0 < 1.8",
"uglify-js-brunch": "~1.7.4",
"auto-reload-brunch": "> 1.0 < 1.8",
"brunch": "~1.7.4",
"jasmine-node": "1.13.x", "jasmine-node": "1.13.x",
"nodemon": "0.7.5", "jasmine-spec-reporter": "~0.3.0",
"marked": "0.2.x", "javascript-brunch": "> 1.0 < 1.8",
"telepath-brunch": "https://github.com/nwinter/telepath-brunch/tarball/master", "karma": "~0.12",
"bower": "~1.3.8",
"bless-brunch": "https://github.com/ThomasConner/bless-brunch/tarball/master",
"karma-script-launcher": "~0.1.0",
"karma-chrome-launcher": "~0.1.2", "karma-chrome-launcher": "~0.1.2",
"karma-coffee-preprocessor": "~0.1.2",
"karma-coverage": "~0.1.4",
"karma-firefox-launcher": "~0.1.3", "karma-firefox-launcher": "~0.1.3",
"karma-html2js-preprocessor": "~0.1.0", "karma-html2js-preprocessor": "~0.1.0",
"karma-coffee-preprocessor": "~0.1.2",
"karma-jasmine": "~0.2.0", "karma-jasmine": "~0.2.0",
"requirejs": "~2.1.10",
"karma-requirejs": "~0.2.1",
"karma-phantomjs-launcher": "~0.1.1", "karma-phantomjs-launcher": "~0.1.1",
"karma": "~0.12", "karma-requirejs": "~0.2.1",
"karma-coverage": "~0.1.4", "karma-script-launcher": "~0.1.0",
"compressible": "~1.0.1", "marked": "0.2.x",
"jasmine-spec-reporter": "~0.3.0" "nodemon": "0.7.5",
"requirejs": "~2.1.10",
"sass-brunch": "^1.8.8",
"telepath-brunch": "https://github.com/nwinter/telepath-brunch/tarball/master",
"uglify-js-brunch": "~1.7.4"
}, },
"license": "MIT for the code, and CC-BY for the art and music", "license": "MIT for the code, and CC-BY for the art and music",
"private": true, "private": true,