简柏林 / thingskit · Commits

Commit c06d15745da58c5fa8299dd52ec2153017f12a7a

Authored by Igor Kulikov
2 parents 0c0b3dad 8d7fe505

Merge branch 'master' into feature/TB-61

Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
... ... @@ -140,10 +140,10 @@ export default function DashboardController(types, utils, dashboardUtils, widget
140 140 }
141 141
142 142 vm.mainLayoutHeight = function() {
143   - if (vm.isEditingWidget && vm.editingLayoutCtx.id === 'main') {
  143 + if (!vm.isEditingWidget || vm.editingLayoutCtx.id === 'main') {
144 144 return '100%';
145 145 } else {
146   - return 'auto';
  146 + return '0px';
147 147 }
148 148 }
149 149
... ... @@ -156,10 +156,10 @@ export default function DashboardController(types, utils, dashboardUtils, widget
156 156 }
157 157
158 158 vm.rightLayoutHeight = function() {
159   - if (vm.isEditingWidget && vm.editingLayoutCtx.id === 'right') {
  159 + if (!vm.isEditingWidget || vm.editingLayoutCtx.id === 'right') {
160 160 return '100%';
161 161 } else {
162   - return 'auto';
  162 + return '0px';
163 163 }
164 164 }
165 165
... ...