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

Attempt to sorta fix the scroll locker resetting

Browse Source
This commit is contained in:
benmcmahon100
2015-08-20 16:48:46 +01:00
parent 27cac3067a
commit d52a2d8da0
6 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
View File

@ -200,6 +200,7 @@ codeStorage.isAlive = function() {
(val && val.length > 0); (val && val.length > 0);
} }
codeStorage.updateStorage = function(){ codeStorage.updateStorage = function(){
document.getElementById('scroll-locker').dispatchEvent(new CustomEvent('previewUpdateSpy', {'detail': $('.scroll-locker').scrollTop()}));
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);
@ -256,10 +257,14 @@ editor.setValue(editorValue.replace((/fccss/gi), '<script>').replace((/fcces/gi)
editor.refresh(); editor.refresh();
var resetEditor = function resetEditor() { var resetEditor = function resetEditor() {
document.getElementById('scroll-locker').dispatchEvent(new CustomEvent('previewUpdateSpy', {'detail': $('.scroll-locker').scrollTop()}));
editor.setValue(allSeeds.replace((/fccss/gi), '<script>').replace((/fcces/gi), '</script>')); editor.setValue(allSeeds.replace((/fccss/gi), '<script>').replace((/fcces/gi), '</script>'));
updatePreview(); updatePreview();
codeStorage.updateStorage(); codeStorage.updateStorage();
}; };
/* /*
var challengeSeed = challengeSeed || null; var challengeSeed = challengeSeed || null;
var allSeeds = ''; var allSeeds = '';

1
public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
View File

@ -330,6 +330,7 @@ codeStorage.isAlive = function() {
(val && val.length > 0); (val && val.length > 0);
} }
codeStorage.updateStorage = function(){ codeStorage.updateStorage = function(){
document.getElementById('scroll-locker').dispatchEvent(new CustomEvent('previewUpdateSpy', {'detail': $('.scroll-locker').scrollTop()}));
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);

15
public/js/main_0.0.3.js
View File

@ -383,6 +383,21 @@ $(document).ready(function() {
lockTop(); lockTop();
}); });
} }
var execInProgress = false;
document.getElementById('scroll-locker').addEventListener('previewUpdateSpy', function(e){
if (!execInProgress){
execInProgress = true;
setTimeout(function(){
if($($('.scroll-locker').children()[0]).height()-800 > e.detail){
$('.scroll-locker').scrollTop(e.detail);
}
else {
$('.scroll-locker').animate({"scrollTop":$($('.scroll-locker').children()[0]).height()}, 175);
}
execInProgress = false;
}, 750);
}
}, false);
} }
}); });

2
server/views/coursewares/showBonfire.jade
View File

@ -18,7 +18,7 @@ block content
.row(ng-controller="pairedWithController") .row(ng-controller="pairedWithController")
.col-xs-12.col-sm-12.col-md-4.col-lg-3 .col-xs-12.col-sm-12.col-md-4.col-lg-3
.scroll-locker .scroll-locker(id = "scroll-locker")
#testCreatePanel.well #testCreatePanel.well
h3.text-center.negative-10= name h3.text-center.negative-10= name
.positive-15.positive-15-bottom .positive-15.positive-15-bottom

2
server/views/coursewares/showHTML.jade
View File

@ -21,7 +21,7 @@ block content
script(src='/js/lib/codemirror/addon/emmet/emmet.js') script(src='/js/lib/codemirror/addon/emmet/emmet.js')
.row.courseware-height .row.courseware-height
.col-xs-12.col-sm-12.col-md-3.col-lg-3 .col-xs-12.col-sm-12.col-md-3.col-lg-3
.scroll-locker .scroll-locker(id = "scroll-locker")
.innerMarginFix(style = "width: 99%;") .innerMarginFix(style = "width: 99%;")
.well .well
.row .row

2
server/views/coursewares/showJS.jade
View File

@ -16,7 +16,7 @@ block content
script(type='text/javascript', src='/js/lib/coursewares/sandbox.js') script(type='text/javascript', src='/js/lib/coursewares/sandbox.js')
.row(ng-controller="pairedWithController") .row(ng-controller="pairedWithController")
.col-xs-12.col-sm-12.col-md-4.col-lg-3 .col-xs-12.col-sm-12.col-md-4.col-lg-3
.scroll-locker .scroll-locker(id = "scroll-locker")
.innerMarginFix(style = "width: 99%;") .innerMarginFix(style = "width: 99%;")
#testCreatePanel.well #testCreatePanel.well
h3.text-center.negative-10= name h3.text-center.negative-10= name