Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

This commit is contained in:
Quincy Larson
2015-05-28 17:24:00 -07:00
3 changed files with 7 additions and 3 deletions

View File

@ -51,7 +51,7 @@ var libraryIncludes = "<script src='//ajax.googleapis.com/ajax/libs/jquery/2.1.3
var editorValueForIFrame; var editorValueForIFrame;
var iFrameScript = "<script src='/js/lib/coursewares/iFrameScripts_0.0.3.js'></script>"; var iFrameScript = "<script src='/js/lib/coursewares/iFrameScripts_0.0.4.js'></script>";
var delay; var delay;
// Initialize CodeMirror editor with a nice html5 canvas demo. // Initialize CodeMirror editor with a nice html5 canvas demo.
@ -106,7 +106,11 @@ var allSeeds = '';
allSeeds += elem.replace(/fccss/g, '<script>').replace(/fcces/g,'</script>') + '\n'; allSeeds += elem.replace(/fccss/g, '<script>').replace(/fcces/g,'</script>') + '\n';
}); });
editor.setValue(allSeeds); editor.setValue(allSeeds);
editor.setCursor(15); (function() {
setTimeout(function() {
editor.refresh();
}, 200);
})();
})(); })();

View File

@ -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.5.js") script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.7.js")