diff --git a/www.eng/js/plugins/VND_ONSControls.js b/www.eng/js/plugins/VND_ONSControls.js index 048c4ee..664bd91 100644 --- a/www.eng/js/plugins/VND_ONSControls.js +++ b/www.eng/js/plugins/VND_ONSControls.js @@ -573,28 +573,28 @@ ONSControls.configManager = function() { //============================================================================= // * Class Variables //============================================================================= -ConfigManager.ONSConfig = (typeof ConfigManager.ONSConfig === 'undefined') ? {} : ConfigManager.ONSConfig; -ConfigManager.ONSConfig.customPos = (typeof ConfigManager.ONSConfig.customPos === 'undefined') ? false : ConfigManager.ONSConfig.customPos; -ConfigManager.ONSConfig.buttonsScale = (typeof ConfigManager.ONSConfig.buttonsScale === 'undefined') ? ONSControls.options.buttonsScale : ConfigManager.ONSConfig.buttonsScale; -ConfigManager.ONSConfig.buttonsOpacity = (typeof ConfigManager.ONSConfig.buttonsOpacity === 'undefined') ? ONSControls.options.buttonsOpacity : ConfigManager.ONSConfig.buttonsOpacity; -ConfigManager.ONSConfig.safeArea = (typeof ConfigManager.ONSConfig.safeArea === 'undefined') ? 1 : ConfigManager.ONSConfig.safeArea; -ConfigManager.ONSConfig.buttonsSize = (typeof ConfigManager.ONSConfig.buttonsSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.buttonsSize; -ConfigManager.ONSConfig.buttonsX = (typeof ConfigManager.ONSConfig.buttonsX === 'undefined') ? ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.buttonsSize : ConfigManager.ONSConfig.buttonsX; -ConfigManager.ONSConfig.buttonsY = (typeof ConfigManager.ONSConfig.buttonsY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.buttonsSize : ConfigManager.ONSConfig.buttonsY; -ConfigManager.ONSConfig.dPadSize = (typeof ConfigManager.ONSConfig.dPadSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.dPadSize; -ConfigManager.ONSConfig.dPadX = (typeof ConfigManager.ONSConfig.dPadX === 'undefined') ? ConfigManager.ONSConfig.dPadSize / 2 : ConfigManager.ONSConfig.dPadX; -ConfigManager.ONSConfig.dPadY = (typeof ConfigManager.ONSConfig.dPadY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.dPadSize / 2 : ConfigManager.ONSConfig.dPadY; -ConfigManager.ONSConfig.bumpersOffsetX = (typeof ConfigManager.ONSConfig.bumpersOffsetX === 'undefined') ? 16 : ConfigManager.ONSConfig.bumpersOffsetX; -ConfigManager.ONSConfig.bumpersOffsetY = (typeof ConfigManager.ONSConfig.bumpersOffsetY === 'undefined') ? ONSControls._controlsCanvas.vh(0.30) : ConfigManager.ONSConfig.bumpersOffsetY; -ConfigManager.ONSConfig.bumpersWidth = (typeof ConfigManager.ONSConfig.bumpersWidth === 'undefined') ? ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.bumpersWidth; -ConfigManager.ONSConfig.bumpersHeight = (typeof ConfigManager.ONSConfig.bumpersHeight === 'undefined') ? ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.bumpersHeight; -ConfigManager.ONSConfig.LBX = (typeof ConfigManager.ONSConfig.LBX === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2 : ConfigManager.ONSConfig.LBX; -ConfigManager.ONSConfig.LBY = (typeof ConfigManager.ONSConfig.LBY === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2 : ConfigManager.ONSConfig.LBY; -ConfigManager.ONSConfig.RBX = (typeof ConfigManager.ONSConfig.RBX === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2 : ConfigManager.ONSConfig.RBX; -ConfigManager.ONSConfig.RBY = (typeof ConfigManager.ONSConfig.RBY === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2 : ConfigManager.ONSConfig.RBY; -ConfigManager.ONSConfig.additonalSize = (typeof ConfigManager.ONSConfig.additonalSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.additonalSize; -ConfigManager.ONSConfig.showX = (typeof ConfigManager.ONSConfig.showX === 'undefined') ? ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.additonalSize / 2 : ConfigManager.ONSConfig.showX; -ConfigManager.ONSConfig.showY = (typeof ConfigManager.ONSConfig.showY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.additonalSize / 2 : ConfigManager.ONSConfig.showY; +ConfigManager.ONSConfig = ConfigManager.ONSConfig || {}; +ConfigManager.ONSConfig.customPos = ConfigManager.ONSConfig.customPos || false; +ConfigManager.ONSConfig.buttonsScale = ConfigManager.ONSConfig.buttonsScale || ONSControls.options.buttonsScale; +ConfigManager.ONSConfig.buttonsOpacity = ConfigManager.ONSConfig.buttonsOpacity || ONSControls.options.buttonsOpacity; +ConfigManager.ONSConfig.safeArea = ConfigManager.ONSConfig.safeArea || 1; +ConfigManager.ONSConfig.buttonsSize = ConfigManager.ONSConfig.buttonsSize || ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.buttonsX = ConfigManager.ONSConfig.buttonsX || ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.buttonsSize; +ConfigManager.ONSConfig.buttonsY = ConfigManager.ONSConfig.buttonsY || ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.buttonsSize; +ConfigManager.ONSConfig.dPadSize = ConfigManager.ONSConfig.dPadSize || ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.dPadX = ConfigManager.ONSConfig.dPadX || ConfigManager.ONSConfig.dPadSize / 2; +ConfigManager.ONSConfig.dPadY = ConfigManager.ONSConfig.dPadY || ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.dPadSize / 2; +ConfigManager.ONSConfig.bumpersOffsetX = ConfigManager.ONSConfig.bumpersOffsetX || 16; +ConfigManager.ONSConfig.bumpersOffsetY = ConfigManager.ONSConfig.bumpersOffsetY || ONSControls._controlsCanvas.vh(0.30); +ConfigManager.ONSConfig.bumpersWidth = ConfigManager.ONSConfig.bumpersWidth || ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.bumpersHeight = ConfigManager.ONSConfig.bumpersHeight || ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.LBX = ConfigManager.ONSConfig.LBX || ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2; +ConfigManager.ONSConfig.LBY = ConfigManager.ONSConfig.LBY || ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2; +ConfigManager.ONSConfig.RBX = ConfigManager.ONSConfig.RBX || ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2; +ConfigManager.ONSConfig.RBY = ConfigManager.ONSConfig.RBY || ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2; +ConfigManager.ONSConfig.additonalSize = ConfigManager.ONSConfig.additonalSize || ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.showX = ConfigManager.ONSConfig.showX || ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.additonalSize / 2; +ConfigManager.ONSConfig.showY = ConfigManager.ONSConfig.showY || ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.additonalSize / 2; //============================================================================= // * Restore defaults //============================================================================= diff --git a/www.rus/js/plugins/VND_ONSControls.js b/www.rus/js/plugins/VND_ONSControls.js index 84854b7..416f0ff 100644 --- a/www.rus/js/plugins/VND_ONSControls.js +++ b/www.rus/js/plugins/VND_ONSControls.js @@ -573,28 +573,28 @@ ONSControls.configManager = function() { //============================================================================= // * Class Variables //============================================================================= -ConfigManager.ONSConfig = (typeof ConfigManager.ONSConfig === 'undefined') ? {} : ConfigManager.ONSConfig; -ConfigManager.ONSConfig.customPos = (typeof ConfigManager.ONSConfig.customPos === 'undefined') ? false : ConfigManager.ONSConfig.customPos; -ConfigManager.ONSConfig.buttonsScale = (typeof ConfigManager.ONSConfig.buttonsScale === 'undefined') ? ONSControls.options.buttonsScale : ConfigManager.ONSConfig.buttonsScale; -ConfigManager.ONSConfig.buttonsOpacity = (typeof ConfigManager.ONSConfig.buttonsOpacity === 'undefined') ? ONSControls.options.buttonsOpacity : ConfigManager.ONSConfig.buttonsOpacity; -ConfigManager.ONSConfig.safeArea = (typeof ConfigManager.ONSConfig.safeArea === 'undefined') ? 1 : ConfigManager.ONSConfig.safeArea; -ConfigManager.ONSConfig.buttonsSize = (typeof ConfigManager.ONSConfig.buttonsSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.buttonsSize; -ConfigManager.ONSConfig.buttonsX = (typeof ConfigManager.ONSConfig.buttonsX === 'undefined') ? ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.buttonsSize : ConfigManager.ONSConfig.buttonsX; -ConfigManager.ONSConfig.buttonsY = (typeof ConfigManager.ONSConfig.buttonsY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.buttonsSize : ConfigManager.ONSConfig.buttonsY; -ConfigManager.ONSConfig.dPadSize = (typeof ConfigManager.ONSConfig.dPadSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.dPadSize; -ConfigManager.ONSConfig.dPadX = (typeof ConfigManager.ONSConfig.dPadX === 'undefined') ? ConfigManager.ONSConfig.dPadSize / 2 : ConfigManager.ONSConfig.dPadX; -ConfigManager.ONSConfig.dPadY = (typeof ConfigManager.ONSConfig.dPadY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.dPadSize / 2 : ConfigManager.ONSConfig.dPadY; -ConfigManager.ONSConfig.bumpersOffsetX = (typeof ConfigManager.ONSConfig.bumpersOffsetX === 'undefined') ? 16 : ConfigManager.ONSConfig.bumpersOffsetX; -ConfigManager.ONSConfig.bumpersOffsetY = (typeof ConfigManager.ONSConfig.bumpersOffsetY === 'undefined') ? ONSControls._controlsCanvas.vh(0.30) : ConfigManager.ONSConfig.bumpersOffsetY; -ConfigManager.ONSConfig.bumpersWidth = (typeof ConfigManager.ONSConfig.bumpersWidth === 'undefined') ? ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.bumpersWidth; -ConfigManager.ONSConfig.bumpersHeight = (typeof ConfigManager.ONSConfig.bumpersHeight === 'undefined') ? ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.bumpersHeight; -ConfigManager.ONSConfig.LBX = (typeof ConfigManager.ONSConfig.LBX === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2 : ConfigManager.ONSConfig.LBX; -ConfigManager.ONSConfig.LBY = (typeof ConfigManager.ONSConfig.LBY === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2 : ConfigManager.ONSConfig.LBY; -ConfigManager.ONSConfig.RBX = (typeof ConfigManager.ONSConfig.RBX === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2 : ConfigManager.ONSConfig.RBX; -ConfigManager.ONSConfig.RBY = (typeof ConfigManager.ONSConfig.RBY === 'undefined') ? ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2 : ConfigManager.ONSConfig.RBY; -ConfigManager.ONSConfig.additonalSize = (typeof ConfigManager.ONSConfig.additonalSize === 'undefined') ? ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale : ConfigManager.ONSConfig.additonalSize; -ConfigManager.ONSConfig.showX = (typeof ConfigManager.ONSConfig.showX === 'undefined') ? ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.additonalSize / 2 : ConfigManager.ONSConfig.showX; -ConfigManager.ONSConfig.showY = (typeof ConfigManager.ONSConfig.showY === 'undefined') ? ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.additonalSize / 2 : ConfigManager.ONSConfig.showY; +ConfigManager.ONSConfig = ConfigManager.ONSConfig || {}; +ConfigManager.ONSConfig.customPos = ConfigManager.ONSConfig.customPos || false; +ConfigManager.ONSConfig.buttonsScale = ConfigManager.ONSConfig.buttonsScale || ONSControls.options.buttonsScale; +ConfigManager.ONSConfig.buttonsOpacity = ConfigManager.ONSConfig.buttonsOpacity || ONSControls.options.buttonsOpacity; +ConfigManager.ONSConfig.safeArea = ConfigManager.ONSConfig.safeArea || 1; +ConfigManager.ONSConfig.buttonsSize = ConfigManager.ONSConfig.buttonsSize || ONSControls._controlsCanvas.vh(0.18) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.buttonsX = ConfigManager.ONSConfig.buttonsX || ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.buttonsSize; +ConfigManager.ONSConfig.buttonsY = ConfigManager.ONSConfig.buttonsY || ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.buttonsSize; +ConfigManager.ONSConfig.dPadSize = ConfigManager.ONSConfig.dPadSize || ONSControls._controlsCanvas.vh(0.36) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.dPadX = ConfigManager.ONSConfig.dPadX || ConfigManager.ONSConfig.dPadSize / 2; +ConfigManager.ONSConfig.dPadY = ConfigManager.ONSConfig.dPadY || ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.dPadSize / 2; +ConfigManager.ONSConfig.bumpersOffsetX = ConfigManager.ONSConfig.bumpersOffsetX || 16; +ConfigManager.ONSConfig.bumpersOffsetY = ConfigManager.ONSConfig.bumpersOffsetY || ONSControls._controlsCanvas.vh(0.30); +ConfigManager.ONSConfig.bumpersWidth = ConfigManager.ONSConfig.bumpersWidth || ONSControls._controlsCanvas.vh(0.188) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.bumpersHeight = ConfigManager.ONSConfig.bumpersHeight || ONSControls._controlsCanvas.vh(0.12) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.LBX = ConfigManager.ONSConfig.LBX || ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2; +ConfigManager.ONSConfig.LBY = ConfigManager.ONSConfig.LBY || ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2; +ConfigManager.ONSConfig.RBX = ConfigManager.ONSConfig.RBX || ConfigManager.ONSConfig.bumpersOffsetX + ConfigManager.ONSConfig.bumpersWidth / 2; +ConfigManager.ONSConfig.RBY = ConfigManager.ONSConfig.RBY || ConfigManager.ONSConfig.bumpersOffsetY + ConfigManager.ONSConfig.bumpersHeight / 2; +ConfigManager.ONSConfig.additonalSize = ConfigManager.ONSConfig.additonalSize || ONSControls._controlsCanvas.vh(0.06) * ConfigManager.ONSConfig.buttonsScale; +ConfigManager.ONSConfig.showX = ConfigManager.ONSConfig.showX || ONSControls._controlsCanvas.screen.width - ConfigManager.ONSConfig.additonalSize / 2; +ConfigManager.ONSConfig.showY = ConfigManager.ONSConfig.showY || ONSControls._controlsCanvas.screen.height - ConfigManager.ONSConfig.additonalSize / 2; //============================================================================= // * Restore defaults //=============================================================================