Skip to content

Commit d3a37c7

Browse files
Issue #636 - rename seamless* to tile*
1 parent 5d2ca7e commit d3a37c7

File tree

3 files changed

+24
-26
lines changed

3 files changed

+24
-26
lines changed

src/css/settings-application.css

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,11 @@
4343
vertical-align: middle;
4444
}
4545

46-
.layer-opacity-input {
46+
.layer-opacity-input,
47+
.tile-mask-opacity-input {
4748
width: 100px;
4849
}
4950

50-
.seamless-opacity-input {
51-
width: 75px;
52-
}
53-
5451
.settings-opacity-text {
5552
height: 31px;
5653
display: inline-block;

src/js/controller/settings/application/TileApplicationController.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,39 @@
99
pskl.utils.inherit(ns.TileApplicationController, pskl.controller.settings.AbstractSettingController);
1010

1111
ns.TileApplicationController.prototype.init = function () {
12-
// Seamless mode
13-
var seamlessMode = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE);
14-
var seamlessModeCheckbox = document.querySelector('.seamless-mode-checkbox');
15-
if (seamlessMode) {
16-
seamlessModeCheckbox.setAttribute('checked', seamlessMode);
12+
// Tile mode
13+
var tileMode = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_MODE);
14+
var tileModeCheckbox = document.querySelector('.tile-mode-checkbox');
15+
if (tileMode) {
16+
tileModeCheckbox.setAttribute('checked', tileMode);
1717
}
18-
this.addEventListener(seamlessModeCheckbox, 'change', this.onSeamlessModeChange_);
18+
this.addEventListener(tileModeCheckbox, 'change', this.onTileModeChange_);
1919

20-
// Seamless mask opacity
21-
var seamlessOpacityInput = document.querySelector('.seamless-opacity-input');
22-
seamlessOpacityInput.value = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_OPACITY);
23-
this.addEventListener(seamlessOpacityInput, 'change', this.onSeamlessOpacityChange_);
24-
this.addEventListener(seamlessOpacityInput, 'input', this.onSeamlessOpacityChange_);
25-
this.updateSeamlessOpacityText_(seamlessOpacityInput.value);
20+
// Tile mask opacity
21+
var tileMaskOpacityInput = document.querySelector('.tile-mask-opacity-input');
22+
tileMaskOpacityInput.value = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_OPACITY);
23+
this.addEventListener(tileMaskOpacityInput, 'change', this.onTileMaskOpacityChange_);
24+
this.addEventListener(tileMaskOpacityInput, 'input', this.onTileMaskOpacityChange_);
25+
this.updateTileMaskOpacityText_(tileMaskOpacityInput.value);
2626
};
2727

28-
ns.TileApplicationController.prototype.onSeamlessModeChange_ = function (evt) {
28+
ns.TileApplicationController.prototype.onTileModeChange_ = function (evt) {
2929
pskl.UserSettings.set(pskl.UserSettings.SEAMLESS_MODE, evt.currentTarget.checked);
3030
};
3131

32-
ns.TileApplicationController.prototype.onSeamlessOpacityChange_ = function (evt) {
32+
ns.TileApplicationController.prototype.onTileMaskOpacityChange_ = function (evt) {
3333
var target = evt.target;
3434
var opacity = parseFloat(target.value);
3535
if (!isNaN(opacity)) {
3636
pskl.UserSettings.set(pskl.UserSettings.SEAMLESS_OPACITY, opacity);
37-
this.updateSeamlessOpacityText_(opacity);
37+
this.updateTileMaskOpacityText_(opacity);
3838
} else {
3939
target.value = pskl.UserSettings.get(pskl.UserSettings.SEAMLESS_OPACITY);
4040
}
4141
};
4242

43-
ns.TileApplicationController.prototype.updateSeamlessOpacityText_ = function (opacity) {
44-
var seamlessOpacityText = document.querySelector('.seamless-opacity-text');
43+
ns.TileApplicationController.prototype.updateTileMaskOpacityText_ = function (opacity) {
44+
var seamlessOpacityText = document.querySelector('.tile-mask-opacity-text');
4545
seamlessOpacityText.innerHTML = (opacity * 1).toFixed(2);
4646
};
4747
})();

src/templates/settings/application/tile.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
<div class="settings-item">
44
<label>
55
Enable tile mode
6-
<input type="checkbox" value="1" class="seamless-mode-checkbox" name="seamless-mode-checkbox"/>
6+
<input type="checkbox" value="1" class="tile-mode-checkbox" name="tile-mode-checkbox"/>
77
</label>
88
</div>
99

1010
<div class="settings-item">
11-
<label>Tiles opacity</label>
12-
<input type="range" class="settings-opacity-input seamless-opacity-input" name="seamless-opacity" min="0" max="0.5" step="0.01"/>
13-
<span class="settings-opacity-text seamless-opacity-text"></span>
11+
<label>Mask opacity</label>
12+
<input type="range" min="0" max="0.5" step="0.01"
13+
class="settings-opacity-input tile-mask-opacity-input" name="tile-mask-opacity"/>
14+
<span class="settings-opacity-text tile-mask-opacity-text"></span>
1415
</div>
1516
</div>
1617
</script>

0 commit comments

Comments
 (0)