ivan-igorevich
/
bmstu-mt-wp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

progress bar reverted; preventDefault usage optimized

This commit is contained in:
Vadim Makeev 2011-07-16 14:01:16 +04:00
parent 5094e9831d
commit 9974f8f02f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/script.js
View File

@ -30,34 +30,36 @@
var current = slideList.indexOf(url.hash.substr(1)); var current = slideList.indexOf(url.hash.substr(1));
if(e) { if(e) {
if(e.type == 'keydown') { if(e.type == 'keydown') {
var prevent = true;
switch(e.which) { switch(e.which) {
case 33 : // PgUp case 33 : // PgUp
case 38 : // Up case 38 : // Up
case 37 : // Left case 37 : // Left
case 75 : // k case 75 : // k
current--; current--;
e.preventDefault();
break; break;
case 34 : // PgDown case 34 : // PgDown
case 40 : // Down case 40 : // Down
case 39 : // Right case 39 : // Right
case 74 : // j case 74 : // j
current++; current++;
e.preventDefault();
break; break;
case 36 : // Home case 36 : // Home
current = 0; current = 0;
e.preventDefault();
break; break;
case 35 : // End case 35 : // End
current = slideList.length-1; current = slideList.length-1;
e.preventDefault();
break; break;
case 32 : // Space case 32 : // Space
current += e.shiftKey ? -1 : 1; current += e.shiftKey ? -1 : 1;
e.preventDefault();
break; break;
case 13 : // Enter
if(!current+1) enterFull();
break;
default:
prevent = false;
} }
if(prevent) e.preventDefault();
} }
if(e.type == 'click') { if(e.type == 'click') {
current = slideList.indexOf(e.target.parentNode.id); current = slideList.indexOf(e.target.parentNode.id);
@ -67,12 +69,14 @@
} }
target = slideList[current]; target = slideList[current];
if(target) url.hash = target; if(target) url.hash = target;
updateProgress();
} }
function enterFull(e) { function enterFull(e) {
body.className = 'full'; body.className = 'full';
resizeFull(true); resizeFull(true);
turnSlide(e); turnSlide(e);
updateProgress();
if(!isFull()) history.pushState(null, null, url.pathname + '?full' + url.hash); if(!isFull()) history.pushState(null, null, url.pathname + '?full' + url.hash);
window.addEventListener('resize', resizeFull, false); window.addEventListener('resize', resizeFull, false);
document.addEventListener('keyup', exitFullEsc, false); document.addEventListener('keyup', exitFullEsc, false);
@ -81,7 +85,9 @@
function exitFull() { function exitFull() {
body.className = 'list'; body.className = 'list';
resizeFull(false); resizeFull(false);
history.pushState(null, null, url.href.replace('?full', '')); var hash = url.hash;
history.pushState(null, null, url.pathname.replace('?full', ''));
url.hash = hash;
window.removeEventListener('resize', resizeFull, false); window.removeEventListener('resize', resizeFull, false);
document.removeEventListener('keyup', exitFullEsc, false); document.removeEventListener('keyup', exitFullEsc, false);
} }
@ -95,6 +101,11 @@
return url.search.substr(1) == 'full'; return url.search.substr(1) == 'full';
} }
function updateProgress() {
if(!progress) return;
progress.style.width = (100/(slideList.length-1) * slideList.indexOf(url.hash.substr(1))).toFixed(2) + '%';
}
window.addEventListener('DOMContentLoaded', function() { window.addEventListener('DOMContentLoaded', function() {
if(isFull()) enterFull(); if(isFull()) enterFull();
}, false); }, false);