diff options
| author | arjunroychowdhury <arjun@hsc.com> | 2016-01-21 20:27:05 -0500 |
|---|---|---|
| committer | arjunroychowdhury <arjun@hsc.com> | 2016-01-21 20:27:05 -0500 |
| commit | e69c02e5b93b80cf05d59efb6ab247f566f55895 (patch) | |
| tree | 0a0d339664d94854e0d9a9d7953739ea48fbf9e3 | |
| parent | b69a0063ce453662b4363a0f6574af32609ae0ae (diff) | |
fixed montage problem in native chrome - duplicate data
Former-commit-id: 1cf33a888ab4c0745551e4cf80d089ad2de13f6e
| -rw-r--r-- | www/js/MontageCtrl.js | 1 | ||||
| -rw-r--r-- | www/templates/montage.html | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 1551a18d..93d771a7 100644 --- 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 index de426b45..06b9ba65 100644 --- 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" |