Mercurial > hg > nodescore
diff www/m/js/nodescore-slides.js @ 54:66bf613fb818
pre clean up push - moved vars into scoreB.js - called up with requirejs
added requirejs dep
author | tzara <rc-web@kiben.net> |
---|---|
date | Wed, 19 Dec 2012 13:36:19 +0000 |
parents | ddb09f0a67fd |
children | 474c1ad1e811 |
line wrap: on
line diff
--- a/www/m/js/nodescore-slides.js Sun Oct 14 00:26:42 2012 +0000 +++ b/www/m/js/nodescore-slides.js Wed Dec 19 13:36:19 2012 +0000 @@ -83,22 +83,18 @@ }} /////////////////////////////////////// - function pageFlip(unit) { console.log("flipping page:"+ unit); $('#sections').trigger('goto', [parseFloat(unit)]); } - ///////////////////////////////////////////////// - // call the fancy jquery functions - -function slideTo (target) { $('#sections').trigger('goto', [target]); } +//function slideTo (target) { $('#sections').trigger('goto', [target]); } function pad2(number) { return (number < 10 ? '0' : '') + number } ///////////////////////////////////////////////// - +//var testSound = new buzz.sound( 'audio/testfile', { formats: [ 'ogg', 'mp3' ] } ); socket.on("pageFlipfromserver", pageTurn); function pageTurn (group,unit,time,mm) { var groupPage=document.getElementById('group').value; @@ -107,7 +103,7 @@ var p= pad2(unit); // pageFlip(unit); pageTurnB(unit) - + } else { console.log("not for this group... ignoring... for group:" + group ); @@ -117,7 +113,7 @@ function pageTurnB(unit) { var units=6; var next=(((unit+1)%units)+units)%units - //console.log("HOP TURN" + unit+ "next:" + next); + console.log("HOP TURN" + unit+ "next:" + next); $("#live").load("music.html #"+unit +" *"); $("#preview").html("<h3 style='background:transparent; position: relative; font-size:1.5em;top:14px; left:10px;';> n e x t : </h3><img src='thumbs/"+next + ".png" + "' width='315'>") }