diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php index 97eab55a2..fc9a96b03 100644 --- a/web/skins/classic/views/js/montage.js.php +++ b/web/skins/classic/views/js/montage.js.php @@ -28,6 +28,7 @@ var canStreamNative = ; var monitorData = new Array(); monitorData[monitorData.length] = { @@ -46,6 +47,7 @@ monitorData[monitorData.length] = { layouts = new Array(); layouts[0] = {}; // reserved, should hold which fields to clear when transitioning layouts[Id() ?>] = {"Name":"Name()?>","Positions":Positions() ?>}; diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php index 4e3db5665..167ee0f90 100644 --- a/web/skins/classic/views/js/montagereview.js.php +++ b/web/skins/classic/views/js/montagereview.js.php @@ -4,6 +4,18 @@ $TimeZone = new DateTimeZone( ini_get('date.timezone') ); $now = new DateTime('now', $TimeZone); $offset = $TimeZone->getOffset($now); echo $offset.'; // '.floor($offset / 3600).' hours '; + +global $defaultScale; +global $liveMode; +global $fitMode; +global $speeds; +global $speedIndex; +global $initialDisplayInterval; +global $minTimeSecs; +global $maxTimeSecs; +global $minTime; +global $maxTime; +global $monitors; ?> var currentScale=; @@ -146,7 +158,6 @@ foreach ( ZM\Server::find() as $Server ) { echo 'Servers[' . $Server->Id() . '] = new Server(' . $Server->to_json(). ");\n"; } - echo ' var monitorName = []; var monitorLoading = []; @@ -167,8 +178,8 @@ var monitorCanvasCtx = []; var monitorPtr = []; // monitorName[monitorPtr[0]] is first monitor '; -$numMonitors=0; // this array is indexed by the monitor ID for faster access later, so it may be sparse -$avgArea=floatval(0); // Calculations the normalizing scale +$numMonitors = 0; // this array is indexed by the monitor ID for faster access later, so it may be sparse +$avgArea = floatval(0); // Calculations the normalizing scale foreach ( $monitors as $m ) { $avgArea = $avgArea + floatval($m->Width() * $m->Height());