From dbc8a59ae8c05d51d533d83aee242bb0171c8ec8 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Wed, 19 Jun 2013 09:58:09 -0700 Subject: [PATCH] Cleaned out dead code in scheduleUpdate and updateMulti MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … as pointed out by @ventero --- src/viewer.js | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/viewer.js b/src/viewer.js index 7ea9b740..35ee5e30 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -1243,23 +1243,7 @@ function openTileSource( viewer, source ) { /////////////////////////////////////////////////////////////////////////////// // Schedulers provide the general engine for animation /////////////////////////////////////////////////////////////////////////////// -function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){ - var currentTime, - targetTime, - deltaTime; - - if ( THIS[ viewer.hash ].animating ) { - return $.requestAnimationFrame( function(){ - updateFunc( viewer ); - } ); - } - - currentTime = +new Date(); - prevUpdateTime = prevUpdateTime ? prevUpdateTime : currentTime; - // 60 frames per second is ideal - targetTime = prevUpdateTime + 1000 / 60; - deltaTime = Math.max( 1, targetTime - currentTime ); - +function scheduleUpdate( viewer, updateFunc ){ return $.requestAnimationFrame( function(){ updateFunc( viewer ); } ); @@ -1465,21 +1449,16 @@ function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny ) /////////////////////////////////////////////////////////////////////////////// function updateMulti( viewer ) { - - var beginTime; - if ( !viewer.source ) { viewer._updateRequestId = null; return; } - beginTime = +new Date(); updateOnce( viewer ); // Request the next frame, unless we've been closed during the updateOnce() if ( viewer.source ) { - viewer._updateRequestId = scheduleUpdate( viewer, - arguments.callee, beginTime ); + viewer._updateRequestId = scheduleUpdate( viewer, updateMulti ); } }