fix mainjs resetEditor

public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js

@@ -1,3 +1,7 @@
+$(document).ready(function() {
+  $('#reset-button').on('click', resetEditor);
+});
+
 var widgets = [];
 var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("codeEditor"), {
   lineNumbers: true,
@@ -41,61 +45,68 @@ editor.setOption("extraKeys", {
 
 
 /*
-	Local Storage Update System By Andrew Cay(Resto)
+  Local Storage Update System By Andrew Cay(Resto)
-	codeStorage: singleton object that contains properties and methods related to
+  codeStorage: singleton object that contains properties and methods related to
-		dealing with the localStorage system.
+    dealing with the localStorage system.
-	The keys work off of the variable challenge_name to make unique identifiers per bonfire
+  The keys work off of the variable challenge_name to make unique identifiers per bonfire
 
-	Two extra functionalities:
+  Two extra functionalities:
-	Added anonymous version checking system incase of future updates to the system
+  Added anonymous version checking system incase of future updates to the system
-	Added keyup listener to editor(myCodeMirror) so the last update has been saved to storage
+  Added keyup listener to editor(myCodeMirror) so the last update has been saved to storage
 */
 var codeStorage = {
-	version: 0.01,
+  version: 0.01,
-	keyVersion:"saveVersion",
+  keyVersion:"saveVersion",
-	keyValue: null,//where the value of the editor is saved
+  keyValue: null,//where the value of the editor is saved
-	updateWait: 2000,// 2 seconds
+  updateWait: 2000,// 2 seconds
-	updateTimeoutId: null,
+  updateTimeoutId: null,
-	eventArray: []//for firing saves
+  eventArray: []//for firing saves
 };
 // Returns true if the editor code was saved since last key press (use this if you want to make a "saved" notification somewhere")
 codeStorage.hasSaved = function(){
-	return ( updateTimeoutId === null );
+  return ( updateTimeoutId === null );
 };
 codeStorage.onSave = function(func){
-	codeStorage.eventArray.push(func);
+  codeStorage.eventArray.push(func);
 };
 codeStorage.setSaveKey = function(key){
-	codeStorage.keyValue = key + 'Val';
+  codeStorage.keyValue = key + 'Val';
 };
 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(){
-	if(typeof(Storage) !== undefined) {
+  if(typeof(Storage) !== undefined) {
-		var value = editor.getValue();
+    var value = editor.getValue();
-		localStorage.setItem(codeStorage.keyValue, value);
+    localStorage.setItem(codeStorage.keyValue, value);
-	} else {
+  } else {
-		var debugging = false;
+    var debugging = false;
-		if( debugging ){
+    if( debugging ){
-			console.log('no web storage');
+      console.log('no web storage');
-		}
+    }
-	}
+  }
-	codeStorage.updateTimeoutId = null;
+  codeStorage.updateTimeoutId = null;
-	codeStorage.eventArray.forEach(function(func){
+  codeStorage.eventArray.forEach(function(func){
-		func();
+    func();
-	});
+  });
 };
 //Update Version
 (function(){
-	var savedVersion = localStorage.getItem('saveVersion');
+  var savedVersion = localStorage.getItem('saveVersion');
-	if( savedVersion === null ){
+  if( savedVersion === null ){
-		localStorage.setItem(codeStorage.keyVersion, codeStorage.version);//just write current version
+    localStorage.setItem(codeStorage.keyVersion, codeStorage.version);//just write current version
-	}else{
+  }else{
-		if( savedVersion !== codeStorage.version ){
+    if( savedVersion !== codeStorage.version ){
-			//Update version
+      //Update version
-		}
+    }
-	}
+  }
 })();
 
 
@@ -104,8 +115,8 @@ codeStorage.updateStorage = function(){
 /// Update local save when editor has changed 
 codeStorage.setSaveKey(challenge_Name);
 editor.on('keyup', function(){
-	window.clearTimeout(codeStorage.updateTimeoutId);
+  window.clearTimeout(codeStorage.updateTimeoutId);
-	codeStorage.updateTimeoutId = window.setTimeout(codeStorage.updateStorage, codeStorage.updateWait);
+  codeStorage.updateTimeoutId = window.setTimeout(codeStorage.updateStorage, codeStorage.updateWait);
 });
 
 
@@ -114,9 +125,10 @@ if (attempts) {
   attempts = 0;
 }
 
-var resetEditor = function() {
+var resetEditor = function resetEditor() {
   editor.setValue(allSeeds);
   codeStorage.updateStorage();
+
 };
 
 var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), {
@@ -150,7 +162,7 @@ var tests = tests || [];
 var allSeeds = '';
 (function() {
   challengeSeed.forEach(function(elem) {
-	allSeeds += elem + '\n';
+  allSeeds += elem + '\n';
   });
 })();
 

public/js/main_0.0.2.js

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

server/boot/challenge.js

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

server/views/coursewares/showBonfire.jade

@@ -84,7 +84,7 @@ block content
             label.negative-10.btn.btn-primary.btn-block#submitButton
                 i.fa.fa-play
                     |   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)
                 .button-spacer
                 .btn-group.input-group.btn-group-justified