Skip to content

Commit 4810f3a

Browse files
SalvialfSalvialf
authored
Merge pull request #3439 from jeedom/fix/resizeEnd-stop
Fix resize stop callback not firing
2 parents 2ebad67 + 0a5c179 commit 4810f3a

3 files changed

Lines changed: 35 additions & 33 deletions

File tree

‎core/dom/dom.ui.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2398,8 +2398,8 @@ var jeeResize = function(_selector, _options) {
23982398
document.body.removeEventListener('touchend', resizeEnd, false)
23992399
document.body.removeEventListener('pointermove', resizing, false)
24002400
document.body.removeEventListener('touchmove', resizing, false)
2401-
if (currentRszr.options.end) {
2402-
currentRszr.options.end.apply(currentRszr.rszElement, [event, currentRszr.element])
2401+
if (currentRszr.options.stop) {
2402+
currentRszr.options.stop.apply(currentRszr.rszElement, [event, currentRszr.element])
24032403
}
24042404
}
24052405

‎desktop/js/dashboard.js‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if (!jeeFrontEnd.dashboard) {
157157
document.getElementById('in_searchDashboard').readOnly = false
158158
if (!isset(_save) || _save) document.getElementById('md_dashEdit')?.remove()
159159
} else { //Enter edit mode!
160-
document.getElementById('div_displayObject').style.height = (document.getElementById('div_displayObject').offsetHeight*1.2)+'px'
160+
document.getElementById('div_displayObject').style.height = (document.getElementById('div_displayObject').offsetHeight * 1.2) + 'px'
161161
document.querySelectorAll('.widget-name a.reportModeHidden, .scenario-widget .widget-name a').addClass('disabled')
162162
jeedomUI.isEditing = true
163163
jeedom.cmd.disableExecute = true
@@ -177,7 +177,8 @@ if (!jeeFrontEnd.dashboard) {
177177
Packery.data(element.closest('.div_displayEquipement')).layout()
178178
},
179179
stop: function(event, element) {
180-
jeedomUtils.positionEqLogic(element.getAttribute('data-eqlogic_id'), false)
180+
if (element.hasAttribute('data-eqlogic_id')) jeedomUtils.positionEqLogic(element.getAttribute('data-eqlogic_id'), false, false)
181+
if (element.hasAttribute('data-scenario_id')) jeedomUtils.positionEqLogic(element.getAttribute('data-scenario_id'), false, true)
181182
Packery.data(element.closest('.div_displayEquipement')).layout()
182183
}
183184
})
@@ -288,7 +289,7 @@ if (!jeeFrontEnd.dashboard) {
288289
if (nbEqs == 0) {
289290
jeedomUtils.positionEqLogic()
290291
domUtils.hideLoading()
291-
new Packery(dom_divDisplayEq, {isLayoutInstant: true, transitionDuration: 0})
292+
new Packery(dom_divDisplayEq, { isLayoutInstant: true, transitionDuration: 0 })
292293

293294
if (Array.from(dom_divDisplayEq.querySelectorAll('div.eqLogic-widget, div.scenario-widget')).filter(item => item.isVisible()).length == 0) {
294295
dom_divDisplayEq.closest('.div_object').remove()
@@ -340,7 +341,7 @@ if (!jeeFrontEnd.dashboard) {
340341
}
341342

342343
jeedomUtils.positionEqLogic()
343-
new Packery(dom_divDisplayEq, {isLayoutInstant: true, transitionDuration: 0})
344+
new Packery(dom_divDisplayEq, { isLayoutInstant: true, transitionDuration: 0 })
344345

345346
//synch category filter:
346347
if (self.url_category != 'all') {
@@ -459,7 +460,7 @@ document.getElementById('in_searchDashboard')?.addEventListener('keyup', functio
459460
})
460461
document.getElementById('bt_resetDashboardSearch')?.addEventListener('click', function(event) {
461462
if (jeedomUI.isEditing) return
462-
document.querySelectorAll('#categoryfilter li .catFilterKey').forEach(cat => { cat.checked = true})
463+
document.querySelectorAll('#categoryfilter li .catFilterKey').forEach(cat => { cat.checked = true })
463464
document.querySelectorAll('#dashTopBar button.dropdown-toggle').removeClass('warning')
464465
document.getElementById('in_searchDashboard').jeeValue('').triggerEvent('keyup')
465466
})
@@ -470,20 +471,20 @@ document.getElementById('div_pageContainer').addEventListener('click', function(
470471
let _target = null
471472
if (_target = event.target.closest('#bt_editDashboardWidgetOrder')) {
472473
if (_target.getAttribute('data-mode') == 1) {
473-
_target.setAttribute('data-mode', 0)
474-
jeedomUtils.hideAlert()
475-
jeeFrontEnd.modifyWithoutSave = false
476-
jeedomUtils.enableTooltips()
477-
document.querySelectorAll('div.div_object .bt_editDashboardTilesAutoResizeUp, div.div_object .bt_editDashboardTilesAutoResizeDown').unseen()
478-
document.querySelectorAll('.counterReorderJeedom').remove()
479-
jeeP.editWidgetMode(0)
480-
document.querySelectorAll('div.div_displayEquipement').forEach(_div => { Packery.data(_div).layout() })
481-
} else {
482-
_target.setAttribute('data-mode', 1)
483-
jeedomUtils.disableTooltips()
484-
document.querySelectorAll('div.div_object .bt_editDashboardTilesAutoResizeUp, div.div_object .bt_editDashboardTilesAutoResizeDown').seen()
485-
jeeP.editWidgetMode(1)
486-
}
474+
_target.setAttribute('data-mode', 0)
475+
jeedomUtils.hideAlert()
476+
jeeFrontEnd.modifyWithoutSave = false
477+
jeedomUtils.enableTooltips()
478+
document.querySelectorAll('div.div_object .bt_editDashboardTilesAutoResizeUp, div.div_object .bt_editDashboardTilesAutoResizeDown').unseen()
479+
document.querySelectorAll('.counterReorderJeedom').remove()
480+
jeeP.editWidgetMode(0)
481+
document.querySelectorAll('div.div_displayEquipement').forEach(_div => { Packery.data(_div).layout() })
482+
} else {
483+
_target.setAttribute('data-mode', 1)
484+
jeedomUtils.disableTooltips()
485+
document.querySelectorAll('div.div_object .bt_editDashboardTilesAutoResizeUp, div.div_object .bt_editDashboardTilesAutoResizeDown').seen()
486+
jeeP.editWidgetMode(1)
487+
}
487488
return
488489
}
489490

@@ -581,7 +582,7 @@ document.getElementById('div_pageContainer').addEventListener('click', function(
581582
jeeP.displayChildObject(object_id, false)
582583
jeedomUtils.addOrUpdateUrl('object_id', object_id)
583584
return
584-
} else if (_target.querySelector('a[data-object_id]') != null) {
585+
} else if (_target.querySelector('a[data-object_id]') != null) {
585586
jeedomUtils.loadPage(_target.querySelector('a[data-object_id]').getAttribute('data-href'))
586587
return
587588
}
@@ -606,15 +607,15 @@ document.getElementById('div_pageContainer').addEventListener('click', function(
606607
event.target.focus()
607608
return
608609
}
609-
}, {buble: true})
610+
}, { buble: true })
610611

611612
document.getElementById('div_pageContainer').addEventListener('mouseenter', function(event) {
612613
let _target = null
613614
if (_target = event.target.closest('#bt_overview')) { //bt_overview arrow:
614615
event.stopImmediatePropagation()
615616
event.stopPropagation()
616617
if (jeedomUI.isEditing) return
617-
if (document.getElementById('dashOverviewPrev').isVisible()) return
618+
if (document.getElementById('dashOverviewPrev').isVisible()) return
618619
jeeP.btOverviewTimer = setTimeout(function() {
619620
document.getElementById('dashOverviewPrev').seen()
620621
}, 300)
@@ -640,7 +641,7 @@ document.getElementById('div_pageContainer').addEventListener('mouseenter', func
640641
Object.assign(summary.style, css)
641642
return
642643
}
643-
}, {capture: true})
644+
}, { capture: true })
644645

645646
document.getElementById('div_pageContainer').addEventListener('mouseleave', function(event) {
646647
let _target = null
@@ -658,15 +659,15 @@ document.getElementById('div_pageContainer').addEventListener('mouseleave', func
658659
}
659660
return
660661
}
661-
}, {capture: true})
662+
}, { capture: true })
662663

663664
document.getElementById('div_pageContainer').addEventListener('mouseup', function(event) {
664665
let _target = null
665666
if (_target = event.target.closest('.objectPreview')) {
666667
if (event.which == 2) {
667668
event.preventDefault()
668669
const id = _target.getAttribute('data-object_id')
669-
document.querySelector('.objectPreview[data-object_id="' + id + '"] .name').triggerEvent('click', {detail: {ctrlKey: true}})
670+
document.querySelector('.objectPreview[data-object_id="' + id + '"] .name').triggerEvent('click', { detail: { ctrlKey: true } })
670671
}
671672
return
672673
}
@@ -714,8 +715,8 @@ document.getElementById('div_pageContainer').addEventListener('mousedown', funct
714715
//Event for App Mobile:
715716
document.body.addEventListener('jeeObject::summary::update', function(_event) {
716717
for (const i in _event.detail) {
717-
if(isset(_event.detail[i].force) && _event.detail[i].force == 1) continue
718-
if(_event.detail[i].object_id == 'global') {
718+
if (isset(_event.detail[i].force) && _event.detail[i].force == 1) continue
719+
if (_event.detail[i].object_id == 'global') {
719720
/* SEND UPDATE SUMMARY TO APP */
720721
jeedom.appMobile.postToApp('updateSummary', _event.detail[i].keys)
721722
}

‎desktop/js/view.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ if (!jeeFrontEnd.view) {
8383
var pckry = new Packery(_zone, {
8484
isLayoutInstant: true,
8585
transitionDuration: 0,
86-
})
86+
})
8787
pckry.getItemElements().forEach(function(itemElem, idx) {
8888
itemElem.setAttribute('data-vieworder', idx + 1)
8989
})
@@ -223,7 +223,8 @@ if (!jeeFrontEnd.view) {
223223
Packery.data(element.closest('.eqLogicZone')).layout()
224224
},
225225
stop: function(event, element) {
226-
jeedomUtils.positionEqLogic(element.getAttribute('data-eqlogic_id'), false)
226+
if (element.hasAttribute('data-eqlogic_id')) jeedomUtils.positionEqLogic(element.getAttribute('data-eqlogic_id'), false, false)
227+
if (element.hasAttribute('data-scenario_id')) jeedomUtils.positionEqLogic(element.getAttribute('data-scenario_id'), false, true)
227228
Packery.data(element.closest('.eqLogicZone')).layout()
228229
}
229230
})
@@ -237,8 +238,8 @@ jeeFrontEnd.view.init()
237238
//Event for App Mobile:
238239
document.body.addEventListener('jeeObject::summary::update', function(_event) {
239240
for (var i in _event.detail) {
240-
if(isset(_event.detail[i].force) && _event.detail[i].force == 1) continue
241-
if(_event.detail[i].object_id == 'global') {
241+
if (isset(_event.detail[i].force) && _event.detail[i].force == 1) continue
242+
if (_event.detail[i].object_id == 'global') {
242243
/* SEND UPDATE SUMMARY TO APP */
243244
jeedom.appMobile.postToApp('updateSummary', _event.detail[i].keys)
244245
}

0 commit comments

Comments
 (0)