From 328e75812a278c2da4dfa50751e1a14b40473239 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 6 Nov 2015 17:48:17 -0800 Subject: [PATCH] Fix lint issues with gist saving --- client/main.js | 65 ++++++++++++++--------- server/views/coursewares/showBonfire.jade | 4 +- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/client/main.js b/client/main.js index 5af41f2a86..b0636fd9db 100644 --- a/client/main.js +++ b/client/main.js @@ -300,34 +300,49 @@ $(document).ready(function() { } var request = createCORSRequest('post', 'https://api.github.com/gists'); - if (request) { - request.onload = function() { - if (request.readyState === 4 && - request.status === 201 && - request.statusText === 'Created') { - gistWindow.location.href = JSON.parse(request.responseText)['html_url']; - } - }; - var data = { - description: (username ? 'http://www.freecodecamp.com/' + username + - ' \'s s' : 'S') + 'olution for ' + (challenge_Name || challengeName), - public: true, - files: {} - }, - queryIssue = window.location.href.toString().split('#?')[0], - filename = queryIssue + if (!request) { + return null; + } + + request.onload = function() { + if ( + request.readyState === 4 && + request.status === 201 && + request.statusText === 'Created' + ) { + gistWindow.location.href = + JSON.parse(request.responseText)['html_url']; + } + }; + + var description = common.username ? + 'http://www.freecodecamp.com/' + common.username + ' \'s s' : + 'S'; + + var data = { + description: description + 'olution for ' + common.challengeName, + public: true, + files: {} + }; + var queryIssue = window.location.href.toString().split('#?')[0]; + var filename = queryIssue .substr(queryIssue.lastIndexOf('challenges/') + 11) .replace('/', '') + '.js'; - data['files'][filename] = { - content: '// ' + (challenge_Name || challengeName) + '\n' + - (username ? '// Author: @' + username + '\n' : '') + - '// Challenge: ' + queryIssue + '\n' + - '// Learn to Code at Free Code Camp (www.freecodecamp.com)' + - '\n\n' + editor.getValue().trim() - }; - request.send(JSON.stringify(data)); - } + data.files[filename] = { + content: '// ' + + common.challengeName + + '\n' + + (common.username ? '// Author: @' + common.username + '\n' : '') + + '// Challenge: ' + + queryIssue + + '\n' + + '// Learn to Code at Free Code Camp (www.freecodecamp.com)' + + '\n\n' + + window.editor.getValue().trim() + }; + + request.send(JSON.stringify(data)); }); $('#help-ive-found-a-bug-wiki-article').unbind('click'); diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 07e83537aa..c5047c6b44 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -125,9 +125,7 @@ block content common.dashedName = !{JSON.stringify(dashedName)}; common.started = Math.floor(Date.now()); - if (user) { - common.username = !{JSON.stringify(user.username)}; - } + common.username = !{JSON.stringify(user && user.username || '')}; include ../partials/challenge-footer script.