Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 09:29:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

stray tabs changed to spaces, and long comment split to multiple lines

Browse source
This commit is contained in:
jmo 2017-07-27 15:21:58 -06:00
parent a2b1b2e0f9
commit 003c483ec6
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/system/html/js/entityProperties.js
View file

@ -479,7 +479,7 @@ function loaded() {
openEventBridge(function() { openEventBridge(function() {
var allSections = []; var allSections = [];
var elPropertiesList = document.getElementById("properties-list"); var elPropertiesList = document.getElementById("properties-list");
var elID = document.getElementById("property-id"); var elID = document.getElementById("property-id");
var elType = document.getElementById("property-type"); var elType = document.getElementById("property-type");
var elTypeIcon = document.getElementById("type-icon"); var elTypeIcon = document.getElementById("type-icon");
@ -566,8 +566,8 @@ function loaded() {
var elJSONEditor = document.getElementById("userdata-editor"); var elJSONEditor = document.getElementById("userdata-editor");
var elNewJSONEditor = document.getElementById('userdata-new-editor'); var elNewJSONEditor = document.getElementById('userdata-new-editor');
var elColorSections = document.querySelectorAll(".color-section"); var elColorSections = document.querySelectorAll(".color-section");
var elColorControl1 = document.getElementById("property-color-control1"); var elColorControl1 = document.getElementById("property-color-control1");
var elColorControl2 = document.getElementById("property-color-control2"); var elColorControl2 = document.getElementById("property-color-control2");
var elColorRed = document.getElementById("property-color-red"); var elColorRed = document.getElementById("property-color-red");
var elColorGreen = document.getElementById("property-color-green"); var elColorGreen = document.getElementById("property-color-green");
var elColorBlue = document.getElementById("property-color-blue"); var elColorBlue = document.getElementById("property-color-blue");
@ -681,7 +681,9 @@ function loaded() {
data = JSON.parse(data); data = JSON.parse(data);
if (data.type == "server_script_status") { if (data.type == "server_script_status") {
elServerScriptError.value = data.errorInfo; elServerScriptError.value = data.errorInfo;
// If we just set elServerScriptError's diplay to block or none, we still end up with it's parent contributing 21px bottom padding even when elServerScriptError is display:none. So set it's parent to block or none // If we just set elServerScriptError's diplay to block or none, we still end up with
//it's parent contributing 21px bottom padding even when elServerScriptError is display:none.
// So set it's parent to block or none
elServerScriptError.parentElement.style.display = data.errorInfo ? "block" : "none"; elServerScriptError.parentElement.style.display = data.errorInfo ? "block" : "none";
if (data.statusRetrieved === false) { if (data.statusRetrieved === false) {
elServerScriptStatus.innerText = "Failed to retrieve status"; elServerScriptStatus.innerText = "Failed to retrieve status";
@ -1194,11 +1196,11 @@ function loaded() {
$(el).css('background-color', '#' + hex); $(el).css('background-color', '#' + hex);
$(el).colpickHide(); $(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b); emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
// Keep the companion control in sync // Keep the companion control in sync
elColorControl2.style.backgroundColor = "rgb(" + rgb.r + "," + rgb.g + "," + rgb.b + ")"; elColorControl2.style.backgroundColor = "rgb(" + rgb.r + "," + rgb.g + "," + rgb.b + ")";
} }
})); }));
colorPickers.push($('#property-color-control2').colpick({ colorPickers.push($('#property-color-control2').colpick({
colorScheme: 'dark', colorScheme: 'dark',
layout: 'hex', layout: 'hex',
color: '000000', color: '000000',
@ -1212,8 +1214,8 @@ function loaded() {
$(el).css('background-color', '#' + hex); $(el).css('background-color', '#' + hex);
$(el).colpickHide(); $(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b); emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
// Keep the companion control in sync // Keep the companion control in sync
elColorControl1.style.backgroundColor = "rgb(" + rgb.r + "," + rgb.g + "," + rgb.b + ")"; elColorControl1.style.backgroundColor = "rgb(" + rgb.r + "," + rgb.g + "," + rgb.b + ")";
} }
})); }));
@ -1478,9 +1480,9 @@ function loaded() {
var elCollapsible = document.getElementsByClassName("section-header"); var elCollapsible = document.getElementsByClassName("section-header");
var toggleCollapsedEvent = function(event) { var toggleCollapsedEvent = function(event) {
var element = event.target.parentNode.parentNode; var element = event.target.parentNode.parentNode;
var isCollapsed = element.dataset.collapsed !== "true"; var isCollapsed = element.dataset.collapsed !== "true";
element.dataset.collapsed = isCollapsed ? "true" : false element.dataset.collapsed = isCollapsed ? "true" : false
element.setAttribute("collapsed", isCollapsed ? "true" : "false"); element.setAttribute("collapsed", isCollapsed ? "true" : "false");
element.getElementsByTagName("span")[0].textContent = isCollapsed ? "L" : "M"; element.getElementsByTagName("span")[0].textContent = isCollapsed ? "L" : "M";
}; };