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

Forward progress, need to resolve script loading timing

Browse Source
This commit is contained in:
Nathan Leniz
2015-02-14 17:28:07 -05:00
parent fb971ab080
commit 693b8fbb33
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
View File

@ -62,24 +62,18 @@ function updatePreview() {
var previewFrame = document.getElementById('preview'); var previewFrame = document.getElementById('preview');
var preview = previewFrame.contentDocument || previewFrame.contentWindow.document; var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
preview.open(); preview.open();
preview.write(libraryIncludes + editor.getValue()); preview.write(libraryIncludes + editor.getValue() + otherTestsForNow);
preview.close(); preview.close();
} }
setTimeout(updatePreview, 300); setTimeout(updatePreview, 300);
/** /**
* Window postMessage receiving funtionality * "post" methods
*/ */
var eventMethod = window.addEventListener ? "addEventListener" : "attachEvent";
var eventer = window[eventMethod];
var messageEvent = eventMethod == "attachEvent" ? "onmessage" : "message";
// Listen to message from child window var postSuccess = function() {
eventer(messageEvent,function(e) { showCompletion();
if (e.data === 'CompleteAwesomeSauce') { };
showCompletion();
}
},false);
var postError = function(data) { var postError = function(data) {
console.log(Object.keys(data)); console.log(Object.keys(data));
@ -128,7 +122,6 @@ function showCompletion() {
ga('send', 'event', 'Challenge', 'solved', challengeName + ', Time: ' + time); ga('send', 'event', 'Challenge', 'solved', challengeName + ', Time: ' + time);
$('#next-courseware-button').removeAttr('disabled'); $('#next-courseware-button').removeAttr('disabled');
$('#next-courseware-button').addClass('animated tada'); $('#next-courseware-button').addClass('animated tada');
console.log(!userLoggedIn);
if (!userLoggedIn) { if (!userLoggedIn) {
$('#complete-courseware-dialog').modal('show'); $('#complete-courseware-dialog').modal('show');
} }

7
public/js/lib/coursewares/iFrameScripts.js
View File

@ -8,11 +8,14 @@
try { try {
eval(tests[i]); eval(tests[i]);
} catch (err) { } catch (err) {
parent.postError(err);
allTestsGood = false; allTestsGood = false;
console.log('All tests are good?', allTestsGood);
parent.postError(err);
} finally { } finally {
if (allTestsGood) { if (allTestsGood) {
parent.postMessage('CompleteAwesomeSauce', parent.nodeEnv); console.log('You should not be able to see me if there are errors on teh screen!', allTestsGood);
parent.postSuccess();
} }
} }
} }

5
views/coursewares/showHTML.jade
View File

@ -71,7 +71,6 @@ block content
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView
textarea#codeEditor(autofocus=true) textarea#codeEditor(autofocus=true)
script(src='/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js')
.col-md-4.col-lg-3 .col-md-4.col-lg-3
.hidden-xs.hidden-sm .hidden-xs.hidden-sm
img.iphone-position(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png") img.iphone-position(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png")
@ -89,3 +88,7 @@ block content
.animated.zoomInDown.delay-half .animated.zoomInDown.delay-half
span.completion-icon.ion-checkmark-circled.text-primary span.completion-icon.ion-checkmark-circled.text-primary
a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script.
$(document).ready(function() {
script(src='/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js')
});