Update framework version, set cursor to line 15 on load to force full display. Closes #653
This commit is contained in:
terakilobyte
@ -1,154 +0,0 @@
|
|||||||
/**
|
|
||||||
* Created by nathanleniz on 2/2/15.
|
|
||||||
*/
|
|
||||||
|
|
||||||
var widgets = [];
|
|
||||||
var editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), {
|
|
||||||
lineNumbers: true,
|
|
||||||
mode: "text/html",
|
|
||||||
theme: 'monokai',
|
|
||||||
runnable: true,
|
|
||||||
matchBrackets: true,
|
|
||||||
autoCloseBrackets: true,
|
|
||||||
scrollbarStyle: 'null',
|
|
||||||
lineWrapping: true,
|
|
||||||
gutters: ["CodeMirror-lint-markers"],
|
|
||||||
onKeyEvent: doLinting
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// Hijack tab key to insert two spaces instead
|
|
||||||
editor.setOption("extraKeys", {
|
|
||||||
Tab: function(cm) {
|
|
||||||
if (cm.somethingSelected()){
|
|
||||||
cm.indentSelection("add");
|
|
||||||
} else {
|
|
||||||
var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
|
|
||||||
cm.replaceSelection(spaces);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Shift-Tab": function(cm) {
|
|
||||||
if (cm.somethingSelected()){
|
|
||||||
cm.indentSelection("subtract");
|
|
||||||
} else {
|
|
||||||
var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
|
|
||||||
cm.replaceSelection(spaces);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
editor.setSize("100%", "auto");
|
|
||||||
|
|
||||||
var libraryIncludes = "<script src='//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>" +
|
|
||||||
"<script src='/js/lib/chai/chai.js'></script>" +
|
|
||||||
"<script src='/js/lib/chai/chai-jquery.js'></script>" +
|
|
||||||
"<script src='//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js'></script>" +
|
|
||||||
"<link rel='stylesheet' href='//cdnjs.cloudflare.com/ajax/libs/animate.css/3.2.0/animate.min.css'/>" +
|
|
||||||
"<link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'/>" +
|
|
||||||
"<link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'/>" +
|
|
||||||
"<style>body { padding: 0px 3px 0px 3px; }</style>" +
|
|
||||||
"<script>var expect = chai.expect; var should = chai.should(); var assert = chai.assert;</script>";
|
|
||||||
|
|
||||||
var allTests = '';
|
|
||||||
(function() {
|
|
||||||
tests.forEach(function(elem) {
|
|
||||||
allTests += elem + ' ';
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
|
|
||||||
var otherTestsForNow = "<script src='/js/lib/coursewares/iFrameScripts_0.0.2.js'></script>";
|
|
||||||
|
|
||||||
var delay;
|
|
||||||
// Initialize CodeMirror editor with a nice html5 canvas demo.
|
|
||||||
editor.on("keypress", function () {
|
|
||||||
clearTimeout(delay);
|
|
||||||
delay = setTimeout(updatePreview, 300);
|
|
||||||
});
|
|
||||||
var nodeEnv = prodOrDev === 'production' ? 'http://www.freecodecamp.com' : 'http://localhost:3001';
|
|
||||||
function updatePreview() {
|
|
||||||
goodTests = 0;
|
|
||||||
var previewFrame = document.getElementById('preview');
|
|
||||||
var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
|
|
||||||
preview.open();
|
|
||||||
$('#testSuite').empty();
|
|
||||||
preview.write(libraryIncludes + editor.getValue() + otherTestsForNow);
|
|
||||||
preview.close();
|
|
||||||
|
|
||||||
}
|
|
||||||
setTimeout(updatePreview, 300);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* "post" methods
|
|
||||||
*/
|
|
||||||
|
|
||||||
var postSuccess = function(data) {
|
|
||||||
var testDoc = document.createElement("div");
|
|
||||||
$(testDoc)
|
|
||||||
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>")
|
|
||||||
.appendTo($('#testSuite'));
|
|
||||||
testSuccess();
|
|
||||||
};
|
|
||||||
|
|
||||||
var postError = function(data) {
|
|
||||||
var testDoc = document.createElement("div");
|
|
||||||
$(testDoc)
|
|
||||||
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>")
|
|
||||||
.prependTo($('#testSuite'))
|
|
||||||
};
|
|
||||||
var goodTests = 0;
|
|
||||||
var testSuccess = function() {
|
|
||||||
goodTests++;
|
|
||||||
if (goodTests === tests.length) {
|
|
||||||
showCompletion();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
var challengeSeed = challengeSeed || null;
|
|
||||||
var tests = tests || [];
|
|
||||||
var allSeeds = '';
|
|
||||||
(function() {
|
|
||||||
challengeSeed.forEach(function(elem) {
|
|
||||||
allSeeds += elem.replace(/fccss/g, '<script>').replace(/fcces/g,'</script>') + '\n';
|
|
||||||
});
|
|
||||||
editor.setValue(allSeeds);
|
|
||||||
})();
|
|
||||||
|
|
||||||
|
|
||||||
function doLinting () {
|
|
||||||
editor.operation(function () {
|
|
||||||
for (var i = 0; i < widgets.length; ++i)
|
|
||||||
editor.removeLineWidget(widgets[i]);
|
|
||||||
widgets.length = 0;
|
|
||||||
JSHINT(editor.getValue());
|
|
||||||
for (var i = 0; i < JSHINT.errors.length; ++i) {
|
|
||||||
var err = JSHINT.errors[i];
|
|
||||||
if (!err) continue;
|
|
||||||
var msg = document.createElement("div");
|
|
||||||
var icon = msg.appendChild(document.createElement("span"));
|
|
||||||
icon.innerHTML = "!!";
|
|
||||||
icon.className = "lint-error-icon";
|
|
||||||
msg.appendChild(document.createTextNode(err.reason));
|
|
||||||
msg.className = "lint-error";
|
|
||||||
widgets.push(editor.addLineWidget(err.line - 1, msg, {
|
|
||||||
coverGutter: false,
|
|
||||||
noHScroll: true
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
//$('#testSuite').empty();
|
|
||||||
function showCompletion() {
|
|
||||||
var time = Math.floor(Date.now()) - started;
|
|
||||||
ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time);
|
|
||||||
$('#next-courseware-button').removeAttr('disabled');
|
|
||||||
$('#next-courseware-button').addClass('animated tada');
|
|
||||||
if (!userLoggedIn) {
|
|
||||||
$('#complete-courseware-dialog').modal('show');
|
|
||||||
}
|
|
||||||
$('body').keydown(function(e) {
|
|
||||||
if (e.ctrlKey && e.keyCode == 13) {
|
|
||||||
$('#next-courseware-button').click();
|
|
||||||
$('#next-courseware-button').unbind('click');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
155
public/js/lib/coursewares/coursewaresHCJQFramework_0.1.4.js
Normal file
155
public/js/lib/coursewares/coursewaresHCJQFramework_0.1.4.js
Normal file
@ -0,0 +1,155 @@
|
|||||||
|
/**
|
||||||
|
* Created by nathanleniz on 2/2/15.
|
||||||
|
*/
|
||||||
|
|
||||||
|
var widgets = [];
|
||||||
|
var editor = CodeMirror.fromTextArea(document.getElementById("codeEditor"), {
|
||||||
|
lineNumbers: true,
|
||||||
|
mode: "text/html",
|
||||||
|
theme: 'monokai',
|
||||||
|
runnable: true,
|
||||||
|
matchBrackets: true,
|
||||||
|
autoCloseBrackets: true,
|
||||||
|
scrollbarStyle: 'null',
|
||||||
|
lineWrapping: true,
|
||||||
|
gutters: ["CodeMirror-lint-markers"],
|
||||||
|
onKeyEvent: doLinting
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// Hijack tab key to insert two spaces instead
|
||||||
|
editor.setOption("extraKeys", {
|
||||||
|
Tab: function(cm) {
|
||||||
|
if (cm.somethingSelected()){
|
||||||
|
cm.indentSelection("add");
|
||||||
|
} else {
|
||||||
|
var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
|
||||||
|
cm.replaceSelection(spaces);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Shift-Tab": function(cm) {
|
||||||
|
if (cm.somethingSelected()){
|
||||||
|
cm.indentSelection("subtract");
|
||||||
|
} else {
|
||||||
|
var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
|
||||||
|
cm.replaceSelection(spaces);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
editor.setSize("100%", "auto");
|
||||||
|
|
||||||
|
var libraryIncludes = "<script src='//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>" +
|
||||||
|
"<script src='/js/lib/chai/chai.js'></script>" +
|
||||||
|
"<script src='/js/lib/chai/chai-jquery.js'></script>" +
|
||||||
|
"<script src='//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js'></script>" +
|
||||||
|
"<link rel='stylesheet' href='//cdnjs.cloudflare.com/ajax/libs/animate.css/3.2.0/animate.min.css'/>" +
|
||||||
|
"<link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'/>" +
|
||||||
|
"<link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'/>" +
|
||||||
|
"<style>body { padding: 0px 3px 0px 3px; }</style>" +
|
||||||
|
"<script>var expect = chai.expect; var should = chai.should(); var assert = chai.assert;</script>";
|
||||||
|
|
||||||
|
var allTests = '';
|
||||||
|
(function() {
|
||||||
|
tests.forEach(function(elem) {
|
||||||
|
allTests += elem + ' ';
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
|
||||||
|
var otherTestsForNow = "<script src='/js/lib/coursewares/iFrameScripts_0.0.2.js'></script>";
|
||||||
|
|
||||||
|
var delay;
|
||||||
|
// Initialize CodeMirror editor with a nice html5 canvas demo.
|
||||||
|
editor.on("keypress", function () {
|
||||||
|
clearTimeout(delay);
|
||||||
|
delay = setTimeout(updatePreview, 300);
|
||||||
|
});
|
||||||
|
var nodeEnv = prodOrDev === 'production' ? 'http://www.freecodecamp.com' : 'http://localhost:3001';
|
||||||
|
function updatePreview() {
|
||||||
|
goodTests = 0;
|
||||||
|
var previewFrame = document.getElementById('preview');
|
||||||
|
var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
|
||||||
|
preview.open();
|
||||||
|
$('#testSuite').empty();
|
||||||
|
preview.write(libraryIncludes + editor.getValue() + otherTestsForNow);
|
||||||
|
preview.close();
|
||||||
|
|
||||||
|
}
|
||||||
|
setTimeout(updatePreview, 300);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "post" methods
|
||||||
|
*/
|
||||||
|
|
||||||
|
var postSuccess = function(data) {
|
||||||
|
var testDoc = document.createElement("div");
|
||||||
|
$(testDoc)
|
||||||
|
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>")
|
||||||
|
.appendTo($('#testSuite'));
|
||||||
|
testSuccess();
|
||||||
|
};
|
||||||
|
|
||||||
|
var postError = function(data) {
|
||||||
|
var testDoc = document.createElement("div");
|
||||||
|
$(testDoc)
|
||||||
|
.html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>")
|
||||||
|
.prependTo($('#testSuite'))
|
||||||
|
};
|
||||||
|
var goodTests = 0;
|
||||||
|
var testSuccess = function() {
|
||||||
|
goodTests++;
|
||||||
|
if (goodTests === tests.length) {
|
||||||
|
showCompletion();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
var challengeSeed = challengeSeed || null;
|
||||||
|
var tests = tests || [];
|
||||||
|
var allSeeds = '';
|
||||||
|
(function() {
|
||||||
|
challengeSeed.forEach(function(elem) {
|
||||||
|
allSeeds += elem.replace(/fccss/g, '<script>').replace(/fcces/g,'</script>') + '\n';
|
||||||
|
});
|
||||||
|
editor.setValue(allSeeds);
|
||||||
|
editor.setCursor(15);
|
||||||
|
})();
|
||||||
|
|
||||||
|
|
||||||
|
function doLinting () {
|
||||||
|
editor.operation(function () {
|
||||||
|
for (var i = 0; i < widgets.length; ++i)
|
||||||
|
editor.removeLineWidget(widgets[i]);
|
||||||
|
widgets.length = 0;
|
||||||
|
JSHINT(editor.getValue());
|
||||||
|
for (var i = 0; i < JSHINT.errors.length; ++i) {
|
||||||
|
var err = JSHINT.errors[i];
|
||||||
|
if (!err) continue;
|
||||||
|
var msg = document.createElement("div");
|
||||||
|
var icon = msg.appendChild(document.createElement("span"));
|
||||||
|
icon.innerHTML = "!!";
|
||||||
|
icon.className = "lint-error-icon";
|
||||||
|
msg.appendChild(document.createTextNode(err.reason));
|
||||||
|
msg.className = "lint-error";
|
||||||
|
widgets.push(editor.addLineWidget(err.line - 1, msg, {
|
||||||
|
coverGutter: false,
|
||||||
|
noHScroll: true
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
//$('#testSuite').empty();
|
||||||
|
function showCompletion() {
|
||||||
|
var time = Math.floor(Date.now()) - started;
|
||||||
|
ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time);
|
||||||
|
$('#next-courseware-button').removeAttr('disabled');
|
||||||
|
$('#next-courseware-button').addClass('animated tada');
|
||||||
|
if (!userLoggedIn) {
|
||||||
|
$('#complete-courseware-dialog').modal('show');
|
||||||
|
}
|
||||||
|
$('body').keydown(function(e) {
|
||||||
|
if (e.ctrlKey && e.keyCode == 13) {
|
||||||
|
$('#next-courseware-button').click();
|
||||||
|
$('#next-courseware-button').unbind('click');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@ -91,4 +91,4 @@ 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(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.3.js")
|
script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.4.js")
|
||||||
|
|||||||
Reference in New Issue
Block a user