mmoser/skill-assessment-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Summary CRUD completed

Browse Source
This commit is contained in:
Derek Montgomery
2016-08-02 13:49:03 -05:00
parent 8e27fb8e01
commit 9ac58773df
4 changed files with 61 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/assets/javascripts/live-coder.js
View File

@ -1,17 +1,8 @@
function updateResults(includeJavascript) {
// var includeJavascript = includeJavascript;
//
// if (!(typeof(includeJavascript) != 'undefined' && includeJavascript == true)){
// includeJavascript = false;
// }
var resultsContainer = document.querySelectorAll('[data-id="results"]')[0];
var codeHtml = document.querySelectorAll('[data-id="code-html"]')[0].value.trim();
var codeCss = document.querySelectorAll('[data-id="code-css"]')[0].value.trim();
// if(includeJavascript == true){
var codeJs = document.querySelectorAll('[data-id="code-js"]')[0].value.trim();
// }
function updateResults(elem) {
var resultsContainer = $(elem).find('[data-id="results"]')[0];
var codeHtml = $(elem).find('.code-html')[0].value.trim();
var codeCss = $(elem).find('.code-css')[0].value.trim();
var codeJs = $(elem).find('.code-js')[0].value.trim();
resultsContainer.innerHTML = "";
var iDoc = document.createElement('html');
@ -33,13 +24,11 @@ function updateResults(includeJavascript) {
iBody.innerHTML = codeHtml;
iDoc.appendChild(iBody);
// if(includeJavascript == true){
var codeScript = document.createElement("script");
codeScript.setAttribute("type", "text/javascript");
var scriptNode = document.createTextNode(codeJs);
codeScript.appendChild(scriptNode);
iDoc.appendChild(codeScript);
// }
var codeScript = document.createElement("script");
codeScript.setAttribute("type", "text/javascript");
var scriptNode = document.createTextNode(codeJs);
codeScript.appendChild(scriptNode);
iDoc.appendChild(codeScript);
codeFrame.contentWindow.document.open();
codeFrame.contentWindow.document.appendChild(iDoc);
@ -98,39 +87,36 @@ function indentSelection(e){
}
}
function loadLiveCoders(){
$.each($('.answer-sec.live_code-type'), function(index, elem){
var qid = $(elem).data('qid');
$(elem).find("[data-id='live-coder-answer']").load("/live-coder-entry/" + qid, function(){
$(elem).find('.js-error').addClass('hidden');
$(elem).find(".code-input textarea").linedtextarea();
updateResults(this);
});
});
}
timer = 0;
$(function(){
// wait a half second before updating results
// restart the timer if they resume typing
$('html').on('keyup', '.code-input textarea', function(){
var elem = $(this).closest('.answer-sec.live_code-type');
if (timer) { clearTimeout(timer); }
timer = setTimeout(updateResults, 500);
timer = setTimeout(updateResults(elem), 500);
});
$("html").on('keydown', "textarea[data-id^=code-]", function(e){
indentSelection(e);
});
// If JavaScript is enabled, display the livecoder section dynamically
var qid = $('form#answer-form').data('qid');
$("[data-id='live-coder-answer']").load("/live-coder-entry/" + qid, function(){
// if it loads in, and hide "finish later" checkbox
$("[data-id='live-coder-finish-later']").addClass("hidden");
$('.js-error').addClass('hidden');
updateResults();
$(".code-input textarea").linedtextarea();
$.when(loadLiveCoders()).done(function(){
//simple live coder for summary page
$("[data-id=live-coder-no-js], [data-id=live-coder-finish-later]").addClass('hidden');
$("[data-id=live-coder]").removeClass('hidden');
});
$("[data-id=live-coder]").each(function(){
updateResults();
});
//simple live coder for summary page
$("[data-id=live-coder-no-js]").addClass('hidden');
$("[data-id=live-coder]").removeClass('hidden');
$(".code-input textarea").linedtextarea();
});

9
app/assets/javascripts/summary-edit.js
View File

@ -98,9 +98,11 @@ var saveClickHandler = function(e) {
var cssAnswer = $(thisEd.find('textarea.code-css')[0]).val();
var jsAnswer = $(thisEd.find('textarea.code-js')[0]).val();
data = {
'html': htmlAnswer,
'css': cssAnswer,
'js': jsAnswer
'live_code': {
'html': htmlAnswer,
'css': cssAnswer,
'js': jsAnswer
}
}
} else if(thisEd.hasClass('radio-type')) {
$(thisEd.find('input')).each(function() {
@ -136,7 +138,6 @@ var saveClickHandler = function(e) {
}),
success: function(data){
executeQuery = true;
//console.log(data);
},
error: function(data){
executeQuery = false;