diff --git a/app/assets/images/pages/base/logo.png b/app/assets/images/pages/base/logo.png index a33d4f6ea..005cc2189 100644 Binary files a/app/assets/images/pages/base/logo.png and b/app/assets/images/pages/base/logo.png differ diff --git a/app/views/artisans/LevelConceptMap.coffee b/app/views/artisans/LevelConceptMap.coffee index 13c1183c2..ed5f110a8 100644 --- a/app/views/artisans/LevelConceptMap.coffee +++ b/app/views/artisans/LevelConceptMap.coffee @@ -7,7 +7,8 @@ Campaign = require 'models/Campaign' CocoCollection = require 'collections/CocoCollection' Campaigns = require 'collections/Campaigns' Levels = require 'collections/Levels' -parser = new esper().realm.parser +unless typeof esper is 'undefined' + parser = new esper().realm.parser module.exports = class LevelConceptMap extends RootView template: template diff --git a/app/views/play/level/tome/editor/snippets.coffee b/app/views/play/level/tome/editor/snippets.coffee index a32122fa9..6e234def8 100644 --- a/app/views/play/level/tome/editor/snippets.coffee +++ b/app/views/play/level/tome/editor/snippets.coffee @@ -140,16 +140,6 @@ module.exports = (SnippetManager, autoLineEndings) -> @completions = 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 SnippetManager.getActiveScopes(editor).forEach (scope) -> @@ -165,6 +155,13 @@ module.exports = (SnippetManager, autoLineEndings) -> score: fuzzScore * s.importance ? 1.0 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 @completions = completions callback null, completions