From d3a37c74e9e45d794e8002a3b79d4b057b383d36 Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Mon, 5 Jun 2017 19:59:12 +0200 Subject: [PATCH] Issue #636 - rename seamless* to tile* --- src/css/settings-application.css | 7 ++-- .../application/TileApplicationController.js | 34 +++++++++---------- src/templates/settings/application/tile.html | 9 ++--- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/css/settings-application.css b/src/css/settings-application.css index a2407055..b11b7954 100644 --- a/src/css/settings-application.css +++ b/src/css/settings-application.css @@ -43,14 +43,11 @@ vertical-align: middle; } -.layer-opacity-input { +.layer-opacity-input, +.tile-mask-opacity-input { width: 100px; } -.seamless-opacity-input { - width: 75px; -} - .settings-opacity-text { height: 31px; display: inline-block; diff --git a/src/js/controller/settings/application/TileApplicationController.js b/src/js/controller/settings/application/TileApplicationController.js index 3d1e5543..3b1ceec1 100644 --- a/src/js/controller/settings/application/TileApplicationController.js +++ b/src/js/controller/settings/application/TileApplicationController.js @@ -9,39 +9,39 @@ pskl.utils.inherit(ns.TileApplicationController, pskl.controller.settings.AbstractSettingController); ns.TileApplicationController.prototype.init = function () { - // Seamless mode - var seamlessMode = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE); - var seamlessModeCheckbox = document.querySelector('.seamless-mode-checkbox'); - if (seamlessMode) { - seamlessModeCheckbox.setAttribute('checked', seamlessMode); + // Tile mode + var tileMode = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE); + var tileModeCheckbox = document.querySelector('.tile-mode-checkbox'); + if (tileMode) { + tileModeCheckbox.setAttribute('checked', tileMode); } - this.addEventListener(seamlessModeCheckbox, 'change', this.onSeamlessModeChange_); + this.addEventListener(tileModeCheckbox, 'change', this.onTileModeChange_); - // Seamless mask opacity - var seamlessOpacityInput = document.querySelector('.seamless-opacity-input'); - seamlessOpacityInput.value = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_OPACITY); - this.addEventListener(seamlessOpacityInput, 'change', this.onSeamlessOpacityChange_); - this.addEventListener(seamlessOpacityInput, 'input', this.onSeamlessOpacityChange_); - this.updateSeamlessOpacityText_(seamlessOpacityInput.value); + // Tile mask opacity + var tileMaskOpacityInput = document.querySelector('.tile-mask-opacity-input'); + tileMaskOpacityInput.value = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_OPACITY); + this.addEventListener(tileMaskOpacityInput, 'change', this.onTileMaskOpacityChange_); + this.addEventListener(tileMaskOpacityInput, 'input', this.onTileMaskOpacityChange_); + this.updateTileMaskOpacityText_(tileMaskOpacityInput.value); }; - ns.TileApplicationController.prototype.onSeamlessModeChange_ = function (evt) { + ns.TileApplicationController.prototype.onTileModeChange_ = function (evt) { pskl.UserSettings.set(pskl.UserSettings.SEAMLESS_MODE, evt.currentTarget.checked); }; - ns.TileApplicationController.prototype.onSeamlessOpacityChange_ = function (evt) { + ns.TileApplicationController.prototype.onTileMaskOpacityChange_ = function (evt) { var target = evt.target; var opacity = parseFloat(target.value); if (!isNaN(opacity)) { pskl.UserSettings.set(pskl.UserSettings.SEAMLESS_OPACITY, opacity); - this.updateSeamlessOpacityText_(opacity); + this.updateTileMaskOpacityText_(opacity); } else { target.value = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_OPACITY); } }; - ns.TileApplicationController.prototype.updateSeamlessOpacityText_ = function (opacity) { - var seamlessOpacityText = document.querySelector('.seamless-opacity-text'); + ns.TileApplicationController.prototype.updateTileMaskOpacityText_ = function (opacity) { + var seamlessOpacityText = document.querySelector('.tile-mask-opacity-text'); seamlessOpacityText.innerHTML = (opacity * 1).toFixed(2); }; })(); diff --git a/src/templates/settings/application/tile.html b/src/templates/settings/application/tile.html index 7d5a7e2b..38cf3c7c 100644 --- a/src/templates/settings/application/tile.html +++ b/src/templates/settings/application/tile.html @@ -3,14 +3,15 @@
- - - + + +
\ No newline at end of file