From 5dbfbfcf574de448ac72aefbb30813c8539d0262 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 6 Nov 2015 16:35:57 -0800 Subject: [PATCH] Add head/tail to challenge spec. Lint EVERYTHING! --- client/commonFramework.js | 52 +- client/main.js | 1054 ++++++++++--------- common/models/challenge.json | 10 + seed/challenges/basic-javascript.json | 11 +- server/boot/challenge.js | 23 +- server/views/coursewares/showBonfire.jade | 39 +- server/views/coursewares/showHTML.jade | 35 +- server/views/coursewares/showJS.jade | 33 +- server/views/coursewares/showStep.jade | 3 +- server/views/coursewares/showVideo.jade | 15 +- server/views/partials/challenge-footer.jade | 5 + server/views/partials/challenge-modals.jade | 4 - server/views/partials/scripts.jade | 1 - server/views/stories/hot-stories.jade | 3 - server/views/stories/submit-story.jade | 10 +- 15 files changed, 724 insertions(+), 574 deletions(-) create mode 100644 server/views/partials/challenge-footer.jade diff --git a/client/commonFramework.js b/client/commonFramework.js index acbe741d4b..613f644c65 100644 --- a/client/commonFramework.js +++ b/client/commonFramework.js @@ -7,23 +7,25 @@ var common = (function() { init: [] }; - common.challengeName = common.challengeName || window.challenge_Name ? - window.challenge_Name : - ''; + common.challengeName = common.challengeName || window.challenge_Name || ''; - common.challengeType = common.challengeType || window.challengeType ? - window.challengeType : - 0; + common.challengeType = common.challengeType || window.challengeType || 0; common.challengeId = common.challengeId || window.challenge_Id; - common.challengeSeed = common.challengeSeed || window.challengeSeed ? - window.challengeSeed : - []; + common.challengeSeed = common.challengeSeed || window.challengeSeed || []; - common.seed = common.challengeSeed.reduce(function(seed, line) { - return seed + line + '\n'; - }, ''); + common.head = common.head || ''; + common.tail = common.tail || ''; + + common.convertSeed = function(seedData) { + seedData = seedData || []; + return seedData.reduce(function(seed, line) { + return seed + line + '\n'; + }, ''); + }; + + common.seed = common.convertSeed(common.challengeSeed); common.replaceScriptTags = function replaceScriptTags(value) { return value @@ -482,7 +484,7 @@ var editor = (function(CodeMirror, emmetCodeMirror, common) { }(window.CodeMirror, window.emmetCodeMirror, common)); -var tests = tests || []; +var tests = common.tests || []; var libraryIncludes = "