Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 07:12:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1519 from AleziaKurdis/CreateApp-Bundle_December_2021

Browse source 
Create App - "Add All Zones" on renderWithZones selector.
This commit is contained in:
Dale Glass 2021-12-18 20:27:14 +01:00 committed by GitHub
commit 293af1aea8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/system/create/entityProperties/html/js/entityProperties.js
View file

@ -3712,8 +3712,16 @@ function addZoneToZonesSelection(propertyId, id) {
hiddenField.value = "[]";
}
let selectedZones = JSON.parse(hiddenField.value);
if (!selectedZones.includes(id)) {
selectedZones.push(id);
if (id === "ALL") {
for (let i = 0; i < zonesList.length; i++) {
if (!selectedZones.includes(zonesList[i].id)) {
selectedZones.push(zonesList[i].id);
}
}
} else {
if (!selectedZones.includes(id)) {
selectedZones.push(id);
}
}
hiddenField.value = JSON.stringify(selectedZones);
displaySelectedZones(propertyId, true);
@ -3813,7 +3821,10 @@ function setZonesSelectionData(element, isEditable) {
zoneSelector += "<input type='button' value = 'Add a Zone' id='zones-select-add-" + element.id + "' onClick='document.getElementById(";
zoneSelector += '"' + "zones-select-selector-list-panel-" + element.id + '"' + ").style.display = " + '"' + "block" + '"' + ";'>";
zoneSelector += "<div class = 'zoneSelectorListPanel' id='zones-select-selector-list-panel-" + element.id + "'>";
zoneSelector += "<div class='zoneSelectListHeader'>Select the Zone to add: </div>";
zoneSelector += "<div class='zoneSelectListHeader'>Select the Zone to add:";
zoneSelector += "<input type='button' id='zones-select-add-all-" + element.id + "' class='blue forceAlignRight' value = 'Add All Zones'";
zoneSelector += "onClick='addZoneToZonesSelection(" + '"' + element.id + '", "ALL"' + ");'>";
zoneSelector += "</div>";
zoneSelector += "<div class='zoneSelectList' id = 'zones-select-selector-list-" + element.id + "'>";
let i, name;
for (i = 0; i < zonesList.length; i++) {

2
scripts/system/create/modules/brokenURLReport.js
View file

@ -31,7 +31,7 @@ function brokenURLReportRequestUrlValidityCheck(no) {
function brokenURLReportGetResponseStatus() {
if (brokenURLReportHttpRequest.status === 0 || brokenURLReportHttpRequest.status > 299) {
if (brokenURLReportHttpRequest.status === 0) {
brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = "0 - URL not well-formed";
brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = "0 - Server not found";
} else {
brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = brokenURLReportHttpRequest.status + " - " + brokenURLReportHttpRequest.statusText;
}

4
scripts/system/html/css/edit-style.css
View file

@ -2029,6 +2029,10 @@ div.zoneSelectListFooter {
text-align: right;
}
.forceAlignRight {
float: right;
}
#menuBackgroundOverlay{
background-color:transparent;
position:fixed;