Skip to content

Commit f72993d

Browse files
m1ch4stas-demydiuk
m1ch4
authored and
stas-demydiuk
committed
jQuery 3.5.1 compatibility: Unclose empty elements and close others with close-tag
1 parent ad29758 commit f72993d

File tree

1 file changed

+22
-34
lines changed

1 file changed

+22
-34
lines changed

‎frontend/zigbee2mqtt.html‎

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="plugin-view"></div>
22

3-
<link rel="stylesheet" href="/templates/zigbee2mqtt/leaflet.css"/>
3+
<link rel="stylesheet" href="/templates/zigbee2mqtt/leaflet.css">
44

55
<style>
66
.leaflet-container {
@@ -40,7 +40,7 @@
4040
<input type="checkbox"
4141
class="noscheck"
4242
ng-model="$ctrl.controllerInfo.permit_join"
43-
ng-change="$ctrl.togglePermitJoin()"/>
43+
ng-change="$ctrl.togglePermitJoin()">
4444
Allow new zigbee devices to join
4545
</label>
4646
</div>
@@ -61,38 +61,36 @@ <h2 class="page-header">Zigbee2Mqtt</h2>
6161

6262
<div class="tab-content">
6363
<div class="tab-pane active" id="zigbee-devices">
64-
<page-loading-indicator ng-hide="$ctrl.zigbeeDevices"/>
64+
<page-loading-indicator ng-hide="$ctrl.zigbeeDevices"></page-loading-indicator>
6565

6666
<zigbee2mqtt-devices
6767
ng-if="$ctrl.zigbeeDevices"
6868
zigbee-devices="$ctrl.zigbeeDevices"
6969
domoticz-devices="$ctrl.devices"
7070
on-update="$ctrl.fetchZigbeeDevices()"
71-
on-update-domoticz-device="$ctrl.refreshDomoticzDevices()"
72-
/>
71+
on-update-domoticz-device="$ctrl.refreshDomoticzDevices()"></zigbee2mqtt-devices>
7372
</div>
7473

7574
<div class="tab-pane" id="zigbee-groups">
76-
<page-loading-indicator ng-show="!$ctrl.zigbeeGroups"/>
75+
<page-loading-indicator ng-show="!$ctrl.zigbeeGroups"></page-loading-indicator>
7776

7877
<zigbee2mqtt-groups
7978
ng-if="$ctrl.zigbeeGroups"
8079
groups="$ctrl.zigbeeGroups"
8180
zigbee-devices="$ctrl.zigbeeDevices"
8281
domoticz-devices="$ctrl.devices"
8382
on-update="$ctrl.fetchZigbeeGroups()"
84-
on-update-domoticz-device="$ctrl.refreshDomoticzDevices()"
85-
/>
83+
on-update-domoticz-device="$ctrl.refreshDomoticzDevices()"></zigbee2mqtt-groups>
8684
</div>
8785

8886
<div class="tab-pane" id="zigbee-map">
89-
<page-loading-indicator ng-hide="$ctrl.isMapLoaded"/>
87+
<page-loading-indicator ng-hide="$ctrl.isMapLoaded"></page-loading-indicator>
9088
<div id="image-map" style="height: calc(100vh - 235px);" ng-show="$ctrl.isMapLoaded"></div>
9189
</div>
9290
</div>
9391
</div>
9492

95-
<zigbee2mqtt-fake-devices ng-show="false" />
93+
<zigbee2mqtt-fake-devices ng-show="false"></zigbee2mqtt-fake-devices>
9694
</script>
9795

9896
<script type="text/ng-template" id="app/zigbee2mqtt/devices.html">
@@ -104,12 +102,11 @@ <h2 class="page-header">Zigbee2Mqtt</h2>
104102
<zigbee2mqtt-devices-table
105103
devices="$ctrl.zigbeeDevices"
106104
on-update="$ctrl.onUpdate()"
107-
on-select="$ctrl.selectZigbeeDevice(device)"
108-
/>
105+
on-select="$ctrl.selectZigbeeDevice(device)"></zigbee2mqtt-devices-table>
109106

110107
<section ng-if="$ctrl.associatedDevices.length > 0">
111108
<h2 class="page-header">{{:: 'Devices' | translate }}</h2>
112-
<devices-table devices="$ctrl.associatedDevices" on-update="$ctrl.onUpdateDomoticzDevice()" />
109+
<devices-table devices="$ctrl.associatedDevices" on-update="$ctrl.onUpdateDomoticzDevice()"></devices-table>
113110
</section>
114111
</script>
115112

@@ -121,8 +118,7 @@ <h2 class="page-header">{{:: 'Devices' | translate }}</h2>
121118
<zigbee2mqtt-groups-table
122119
groups="$ctrl.groups"
123120
on-update="$ctrl.onUpdate()"
124-
on-select="$ctrl.selectZigbeeGroup(group)"
125-
/>
121+
on-select="$ctrl.selectZigbeeGroup(group)"></zigbee2mqtt-groups-table>
126122

127123
<section ng-if="$ctrl.selectedGroup">
128124
<h2 class="page-header">{{:: 'Group' | translate }}: {{ $ctrl.selectedGroup.friendly_name }}</h2>
@@ -141,12 +137,11 @@ <h2 class="page-header">{{:: 'Group' | translate }}: {{ $ctrl.selectedGroup.frie
141137
<zigbee2mqtt-group-devices-table
142138
group="$ctrl.selectedGroup"
143139
devices="$ctrl.selectedGroupDevices"
144-
on-update="$ctrl.onUpdate()"
145-
/>
140+
on-update="$ctrl.onUpdate()"></zigbee2mqtt-group-devices-table>
146141
</div>
147142

148143
<div class="tab-pane" id="zigbee-group-devices">
149-
<devices-table devices="$ctrl.associatedDevices" on-update="$ctrl.onUpdateDomoticzDevice()" />
144+
<devices-table devices="$ctrl.associatedDevices" on-update="$ctrl.onUpdateDomoticzDevice()"></devices-table>
150145
</div>
151146
</div>
152147
</section>
@@ -167,8 +162,7 @@ <h3 class="modal-title">{{:: 'Rename Device' | translate }}</h3>
167162
required
168163
minlength="1"
169164
maxlength="100"
170-
ng-model="$ctrl.newName"
171-
/>
165+
ng-model="$ctrl.newName">
172166
</div>
173167
</div>
174168
</form>
@@ -205,8 +199,7 @@ <h3 class="modal-title">{{:: 'Set Device State' | translate }}</h3>
205199
minlength="1"
206200
maxlength="100"
207201
style="width: 100%; box-sizing: border-box;"
208-
ng-model="$ctrl.topic"
209-
/>
202+
ng-model="$ctrl.topic">
210203
</div>
211204
</div>
212205
<div class="control-group">
@@ -222,8 +215,7 @@ <h3 class="modal-title">{{:: 'Set Device State' | translate }}</h3>
222215
required
223216
rows="6"
224217
style="width: 100%; box-sizing: border-box;"
225-
ng-model="$ctrl.state"
226-
/>
218+
ng-model="$ctrl.state"></textarea>
227219
</div>
228220
</div>
229221
</form>
@@ -296,7 +288,7 @@ <h3 class="modal-title">{{:: 'Device Removal' | translate }}</h3>
296288
ng-model="$ctrl.removeDomoticzDevices"
297289
> Remove corresponding Domoticz devices
298290
</label>
299-
<br />
291+
<br>
300292
<label class="checkbox">
301293
<input type="checkbox"
302294
class="noscheck"
@@ -338,8 +330,7 @@ <h3 class="modal-title">{{:: 'Add new zigbee group' | translate }}</h3>
338330
required
339331
minlength="1"
340332
maxlength="100"
341-
ng-model="$ctrl.groupName"
342-
/>
333+
ng-model="$ctrl.groupName">
343334
</div>
344335
</div>
345336

@@ -349,8 +340,7 @@ <h3 class="modal-title">{{:: 'Add new zigbee group' | translate }}</h3>
349340
<input type="number"
350341
id="id"
351342
class="form-control"
352-
ng-model="$ctrl.groupId"
353-
/>
343+
ng-model="$ctrl.groupId">
354344
<span class="help-inline">(optional)</span>
355345
</div>
356346
</div>
@@ -387,8 +377,7 @@ <h3 class="modal-title">{{:: 'Add Device To Group' | translate }}</h3>
387377
class="form-control"
388378
required
389379
ng-model="$ctrl.device"
390-
ng-options="device.friendly_name as device.friendly_name for device in ::$ctrl.devices"
391-
/>
380+
ng-options="device.friendly_name as device.friendly_name for device in ::$ctrl.devices"></select>
392381
</div>
393382
</div>
394383

@@ -398,8 +387,7 @@ <h3 class="modal-title">{{:: 'Add Device To Group' | translate }}</h3>
398387
<input type="text"
399388
id="sub-device"
400389
class="form-control"
401-
ng-model="$ctrl.subDevice"
402-
/>
390+
ng-model="$ctrl.subDevice">
403391
<span class="help-inline">(optional)</span>
404392
</div>
405393
</div>
@@ -424,7 +412,7 @@ <h3 class="modal-title">{{:: 'Add Device To Group' | translate }}</h3>
424412
<script>
425413
require(['../templates/zigbee2mqtt'], function() {
426414
angular.element(document).injector().invoke(function($compile) {
427-
var $div = angular.element('<zigbee2mqtt-plugin />');
415+
var $div = angular.element('<zigbee2mqtt-plugin></zigbee2mqtt-plugin>');
428416
angular.element('#plugin-view').append($div);
429417

430418
var scope = angular.element($div).scope();

0 commit comments

Comments
 (0)