From ed68361886d10dfdf27fe16a81361f6bd60eaa43 Mon Sep 17 00:00:00 2001 From: Marco De Donno Date: Thu, 7 Jun 2018 16:42:32 +0200 Subject: [PATCH] Remove the global variable, and replace it with the dedicated pianos function call --- js/viewTracker.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/js/viewTracker.js b/js/viewTracker.js index efd24f1..c317993 100644 --- a/js/viewTracker.js +++ b/js/viewTracker.js @@ -1,10 +1,3 @@ -var phase = null; - -setTimeout( function() -{ - phase = pianos.getParams().phase; -}, 0 ); - /******************************************************************************\ * * View Box tracking functions @@ -17,7 +10,7 @@ viewDataOld = {}; var viewTracker = function() { var markViewData = $( '.pianos4_mark > .pianos4_view_canvas > svg' )[ 0 ].viewBox.baseVal; - if( phase == "comparison" ) + if( pianos.getParams().phase == "comparison" ) var printViewData = $( '.pianos4_print > .pianos4_view_canvas > svg' )[ 0 ].viewBox.baseVal; var projectViewData = function( indata, rot ) @@ -36,11 +29,11 @@ var viewTracker = function() mark: projectViewData( markViewData, rotationView.mark ), } - if( phase == "comparison" ) + if( pianos.getParams().phase == "comparison" ) viewData.print = projectViewData( printViewData, rotationView.print ); var isnewdata = JSON.stringify( viewData.mark ) === JSON.stringify( viewDataOld.mark ); - if( phase == "comparison" ) + if( pianos.getParams().phase == "comparison" ) isnewdata = isnewdata & ( JSON.stringify( viewData.print ) === JSON.stringify( viewDataOld.print ) ); if( Object.keys( viewDataOld ).length == 0 ) -- GitLab