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

Use jQuery correctly, other clean-up

Browse source
This commit is contained in:
Simon Walton 2018-07-11 10:27:17 -07:00
parent 7455f9fc18
commit 09b7787bc9
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
domain-server/resources/web/settings/js/settings.js
View file

@ -59,7 +59,7 @@ $(document).ready(function(){
Settings.handlePostSettings = function(formJSON) { Settings.handlePostSettings = function(formJSON) {
if (!checkAvatarHeights()) { if (!verifyAvatarHeights()) {
return false; return false;
} }
@ -211,7 +211,7 @@ $(document).ready(function(){
swal({ swal({
title: '', title: '',
type: 'error', type: 'error',
text: "There was a problem retreiving domain information from High Fidelity API.", text: "There was a problem retrieving domain information from High Fidelity API.",
confirmButtonText: 'Try again', confirmButtonText: 'Try again',
showCancelButton: true, showCancelButton: true,
closeOnConfirm: false closeOnConfirm: false
@ -292,7 +292,7 @@ $(document).ready(function(){
swal({ swal({
title: 'Create new domain ID', title: 'Create new domain ID',
type: 'input', type: 'input',
text: 'Enter a label this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>', text: 'Enter a label for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
showCancelButton: true, showCancelButton: true,
confirmButtonText: "Create", confirmButtonText: "Create",
closeOnConfirm: false, closeOnConfirm: false,
@ -673,7 +673,7 @@ $(document).ready(function(){
var spinner = createDomainSpinner(); var spinner = createDomainSpinner();
$('#' + Settings.PLACES_TABLE_ID).after($(spinner)); $('#' + Settings.PLACES_TABLE_ID).after($(spinner));
var errorEl = createDomainLoadingError("There was an error retreiving your places."); var errorEl = createDomainLoadingError("There was an error retrieving your places.");
$("#" + Settings.PLACES_TABLE_ID).after(errorEl); $("#" + Settings.PLACES_TABLE_ID).after(errorEl);
// do we have a domain ID? // do we have a domain ID?
@ -1096,25 +1096,31 @@ $(document).ready(function(){
$('#settings_backup .panel-body').html(html); $('#settings_backup .panel-body').html(html);
} }
function checkAvatarHeights() { function verifyAvatarHeights() {
var errorString = ''; var errorString = '';
var minAllowedHeight = 0.009; var minAllowedHeight = 0.009;
var maxAllowedHeight = 1755; var maxAllowedHeight = 1755;
var currentForm = form2js('settings-form'); var alertCss = { backgroundColor: '#ffa0a0' };
var minHeight = currentForm.avatars.min_avatar_height; var minHeightElement = $('input[name="avatars.min_avatar_height"]');
var maxHeight = currentForm.avatars.max_avatar_height; var maxHeightElement = $('input[name="avatars.max_avatar_height"]');
//var minHeight = Number($('input[name="avatars.min_avatar_height"]').attr('value'));
//var maxHeight = Number($('input[name="avatars.max_avatar_height"]').attr('value')); var minHeight = Number(minHeightElement.val());
var maxHeight = Number(maxHeightElement.val());
if (maxHeight < minHeight) { if (maxHeight < minHeight) {
errorString = 'Maximum avatar height must not be less than minimum avatar height<br>'; errorString = 'Maximum avatar height must not be less than minimum avatar height<br>';
minHeightElement.css(alertCss);
maxHeightElement.css(alertCss);
}; };
if (minHeight < minAllowedHeight) { if (minHeight < minAllowedHeight) {
errorString += 'Minimum avatar height must not be less than ' + minAllowedHeight + '<br>'; errorString += 'Minimum avatar height must not be less than ' + minAllowedHeight + '<br>';
minHeightElement.css(alertCss);
} }
if (maxHeight > maxAllowedHeight) { if (maxHeight > maxAllowedHeight) {
errorString += 'Maximum avatar height must not be greater than ' + maxAllowedHeight + '<br>'; errorString += 'Maximum avatar height must not be greater than ' + maxAllowedHeight + '<br>';
maxHeightElement.css(alertCss);
} }
if (errorString.length > 0) { if (errorString.length > 0) {
swal({ swal({
type: 'error', type: 'error',