fixed montage problem in native chrome - duplicate data

ZoneMinder · Jan 22, 2016 · 84de30a · 84de30a · pliablepixels · Jan 22, 2016
1 parent 59f9056
commit 84de30a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
@@ -709,6 +709,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         $scope.packMontage = !$scope.packMontage;
         loginData.packMontage = $scope.packMontage;
         ZMDataModel.setLogin(loginData);
+        console.log ("Switching orientation");
     };
 
     //---------------------------------------------------------------------

diff --git a/www/templates/montage.html b/www/templates/montage.html
@@ -42,7 +42,9 @@
                 </div>
         </span>
 
-       <div ng-style="packMontage ? {'-webkit-column-count':slider.monsize,'-webkit-column-gap':'0px','line-height':'0px'}:{'-webkit-column-count':slider.monsize,'-webkit-column-gap':'0px','line-height':'0px','display':'flex','display':'-webkit-flex','-webkit-flex-direction':'row','flex-direction':'row', 'flex-wrap':'wrap'}">
+       <div ng-style="packMontage ? { '-webkit-column-count':slider.monsize,'-webkit-column-gap':'0px','line-height':'0px' } : {'-webkit-column-count':slider.monsize,'-webkit-column-gap':'0px','line-height':'0px','display':'-webkit-flex','-webkit-flex-direction':'row','flex-direction':'row', 'flex-wrap':'wrap' }">
+
+              <!--<div ng-style="packMontage ? { '-webkit-column-count':slider.monsize, '-webkit-column-gap':'0px','line-height':'0px' } : { 'flex':'display', '-webkit-column-count':slider.monsize }">-->
 
 
             <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit"