codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 00:31:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Rob 2016-07-27 17:03:27 -07:00
commit f0e2ea8598
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/pages/base/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 43 KiB

1
app/views/artisans/LevelConceptMap.coffee
View file

@ -7,6 +7,7 @@ Campaign = require 'models/Campaign'
CocoCollection = require 'collections/CocoCollection' CocoCollection = require 'collections/CocoCollection'
Campaigns = require 'collections/Campaigns' Campaigns = require 'collections/Campaigns'
Levels = require 'collections/Levels' Levels = require 'collections/Levels'
unless typeof esper is 'undefined'
parser = new esper().realm.parser parser = new esper().realm.parser
module.exports = class LevelConceptMap extends RootView module.exports = class LevelConceptMap extends RootView

17
app/views/play/level/tome/editor/snippets.coffee
View file

@ -140,16 +140,6 @@ module.exports = (SnippetManager, autoLineEndings) ->
@completions = completions @completions = completions
return callback null, completions return callback null, completions
#If the prefix is a reserved word, make enter just complete it
keywords = session.getMode()?.$highlightRules?.$keywordList
if keywords and prefix in keywords
completions.push
content: prefix
caption: prefix
snippet: prefix + "\n"
score: 100
meta: '\u21E5'
snippetMap = SnippetManager.snippetMap snippetMap = SnippetManager.snippetMap
SnippetManager.getActiveScopes(editor).forEach (scope) -> SnippetManager.getActiveScopes(editor).forEach (scope) ->
@ -165,6 +155,13 @@ module.exports = (SnippetManager, autoLineEndings) ->
score: fuzzScore * s.importance ? 1.0 score: fuzzScore * s.importance ? 1.0
meta: s.meta or (if s.tabTrigger and not s.name then s.tabTrigger + '\u21E5' else 'snippets') meta: s.meta or (if s.tabTrigger and not s.name then s.tabTrigger + '\u21E5' else 'snippets')
, @ , @
#If the prefix is a reserved word, only exact prefix snippets match
keywords = session.getMode()?.$highlightRules?.$keywordList
if keywords and prefix in keywords
@completions = _.filter(completions, (x) -> x.caption.indexOf prefix is 0)
return callback null, @completions
# console.log 'Zatanna snippet completions', completions # console.log 'Zatanna snippet completions', completions
@completions = completions @completions = completions
callback null, completions callback null, completions