gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix mainjs resetEditor

Browse Source
This commit is contained in:
Berkeley Martinez
2015-06-20 22:48:59 -07:00
parent 0623ace259
commit 742a49b70d
4 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
View File

@ -1,3 +1,7 @@
$(document).ready(function() {
$('#reset-button').on('click', resetEditor);
});
var widgets = []; var widgets = [];
var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor"), { var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor"), {
lineNumbers: true, lineNumbers: true,
@ -69,8 +73,15 @@ codeStorage.setSaveKey = function(key){
codeStorage.keyValue = key + 'Val'; codeStorage.keyValue = key + 'Val';
}; };
codeStorage.getEditorValue = function(){ codeStorage.getEditorValue = function(){
return localStorage.getItem(codeStorage.keyValue); return ('' + localStorage.getItem(codeStorage.keyValue));
}; };
codeStorage.isAlive = function() {
var val = this.getEditorValue()
return val !== 'null' &&
val !== 'undefined' &&
(val && val.length > 0);
}
codeStorage.updateStorage = function(){ codeStorage.updateStorage = function(){
if(typeof(Storage) !== undefined) { if(typeof(Storage) !== undefined) {
var value = editor.getValue(); var value = editor.getValue();
@ -114,9 +125,10 @@ if (attempts) {
attempts = 0; attempts = 0;
} }
var resetEditor = function() { var resetEditor = function resetEditor() {
editor.setValue(allSeeds); editor.setValue(allSeeds);
codeStorage.updateStorage(); codeStorage.updateStorage();
}; };
var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), { var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), {

1
public/js/main_0.0.2.js
View File

@ -331,7 +331,6 @@ $(document).ready(function() {
$('#story-submit').on('click', storySubmitButtonHandler); $('#story-submit').on('click', storySubmitButtonHandler);
// $('#reset-button').on('click', resetEditor);
var commentSubmitButtonHandler = function commentSubmitButtonHandler() { var commentSubmitButtonHandler = function commentSubmitButtonHandler() {
$('#comment-button').unbind('click'); $('#comment-button').unbind('click');

1
server/boot/challenge.js
View File

@ -335,7 +335,6 @@ module.exports = function(app) {
// save user // save user
.flatMap(function(user) { .flatMap(function(user) {
// save user will do nothing if user is falsey // save user will do nothing if user is falsey
debug('saving user', user.username);
return saveUser(user); return saveUser(user);
}) })
.subscribe( .subscribe(

2
server/views/coursewares/showBonfire.jade
View File

@ -84,7 +84,7 @@ block content
label.negative-10.btn.btn-primary.btn-block#submitButton label.negative-10.btn.btn-primary.btn-block#submitButton
i.fa.fa-play i.fa.fa-play
|   Run code (ctrl + enter) |   Run code (ctrl + enter)
#resetButton.btn.btn-danger.btn-big.btn-block(data-toggle='modal', data-target='#reset-modal', data-backdrop='true') Reset Code #trigger-reset-modal.btn.btn-danger.btn-big.btn-block(data-toggle='modal', data-target='#reset-modal', data-backdrop='true') Reset Code
if (user && user.sentSlackInvite) if (user && user.sentSlackInvite)
.button-spacer .button-spacer
.btn-group.input-group.btn-group-justified .btn-group.input-group.btn-group-justified