diff options
| author | Jules Laplace <jules@okfoc.us> | 2012-12-29 23:33:01 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2012-12-29 23:33:01 -0500 |
| commit | 00404603de74e15ba916898d1f3d9f8cda8400ad (patch) | |
| tree | e47f5a66047bc2608c55685662e5787f3c0521dd /static/js | |
| parent | 064860c2948c19b967e15baf081daed93d77e7b8 (diff) | |
| parent | c422e5bead4dd4ed9da274947df8edfb473537ea (diff) | |
Merge branch 'master' of dumpfm:/pichat/repo
Diffstat (limited to 'static/js')
| -rw-r--r-- | static/js/admin.js | 4 | ||||
| -rw-r--r-- | static/js/pichat.js | 12 | ||||
| -rw-r--r-- | static/js/pichat2.js | 12 | ||||
| -rw-r--r-- | static/js/src/util.js | 12 |
4 files changed, 39 insertions, 1 deletions
diff --git a/static/js/admin.js b/static/js/admin.js index 948fa99..422f818 100644 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -63,6 +63,8 @@ Admin.mute = function(nick) { }; Admin.cancelMute = function(id, nick) { + alert ("cancelling mutes disabled w/e"); + return; var reason = $('<textarea name="reason" rows="4" cols="30">'); var html = $('<div>') .append($('<div>').text('Cancelling mute for ' + nick)) @@ -120,4 +122,4 @@ $('.msgDiv').live('mouseleave', function() { }) -*/
\ No newline at end of file +*/ diff --git a/static/js/pichat.js b/static/js/pichat.js index ad48981..5f20803 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -2335,6 +2335,18 @@ function timeFunc(f){ // console.log((new Date().getTime()) - start + " msecs"); return res; } + +window.requestAnimFrame = (function(){ + return window.requestAnimationFrame || + window.webkitRequestAnimationFrame || + window.mozRequestAnimationFrame || + window.oRequestAnimationFrame || + window.msRequestAnimationFrame || + function( callback ){ + window.setTimeout(callback, 1000 / 60); + }; +})(); + Youtube = { "timer": 0, diff --git a/static/js/pichat2.js b/static/js/pichat2.js index ad48981..5f20803 100644 --- a/static/js/pichat2.js +++ b/static/js/pichat2.js @@ -2335,6 +2335,18 @@ function timeFunc(f){ // console.log((new Date().getTime()) - start + " msecs"); return res; } + +window.requestAnimFrame = (function(){ + return window.requestAnimationFrame || + window.webkitRequestAnimationFrame || + window.mozRequestAnimationFrame || + window.oRequestAnimationFrame || + window.msRequestAnimationFrame || + function( callback ){ + window.setTimeout(callback, 1000 / 60); + }; +})(); + Youtube = { "timer": 0, diff --git a/static/js/src/util.js b/static/js/src/util.js index fdfd1c9..814c81b 100644 --- a/static/js/src/util.js +++ b/static/js/src/util.js @@ -78,3 +78,15 @@ function timeFunc(f){ // console.log((new Date().getTime()) - start + " msecs"); return res; } + +window.requestAnimFrame = (function(){ + return window.requestAnimationFrame || + window.webkitRequestAnimationFrame || + window.mozRequestAnimationFrame || + window.oRequestAnimationFrame || + window.msRequestAnimationFrame || + function( callback ){ + window.setTimeout(callback, 1000 / 60); + }; +})(); + |