Skip to content

Commit f72bb4f

Browse files
authored
Merge pull request #21 from webduinoio/release/6059
Release/6059
2 parents 4ed7100 + e8c85c8 commit f72bb4f

File tree

5 files changed

+27
-9
lines changed

5 files changed

+27
-9
lines changed

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
## [v1.0.2] - 2022.11.29
10+
11+
### Fixed
12+
13+
- 萬用遙控器小車拖拉過後,翻轉畫面小車位置偏移
14+
915
## [v1.0.1] - 2022.11.15
1016

1117
### Fixed
1218

1319
- 使用手機開啟萬用遙控器輸入文字會刷新畫面,導致無法正常完成操作
1420

15-
## [v1.0.0] 2022.11.1
21+
## [v1.0.0] - 2022.11.1
1622

1723
### Fixed
1824

@@ -39,6 +45,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3945
- 拿掉 webduinojs 的部份
4046
- 獨立的 mqttClient.js
4147

42-
[unreleased]: https://github.com/webduinoio/webduino-remote/compare/v1.0.1...HEAD
48+
[unreleased]: https://github.com/webduinoio/webduino-remote/compare/v1.0.2...HEAD
49+
[v1.0.2]: https://github.com/webduinoio/webduino-remote/releases/tag/v1.0.2
4350
[v1.0.1]: https://github.com/webduinoio/webduino-remote/releases/tag/v1.0.1
4451
[v1.0.0]: https://github.com/webduinoio/webduino-remote/releases/tag/v1.0.0

index-en.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
/>
8686
</svg>
8787
</div>
88-
<footer >
88+
<footer>
8989
<div id="monsterBlock">
9090
<div id="svgGreen" class="monster-btn">
9191
<svg viewBox="0 0 249.6 251.4">
@@ -421,7 +421,12 @@
421421
rx="4.8"
422422
ry="4.8"
423423
/>
424-
<circle style="fill: #ffffff" cx="129.5" cy="65.1" r="1.1" />
424+
<circle
425+
style="fill: #ffffff"
426+
cx="129.5"
427+
cy="65.1"
428+
r="1.1"
429+
/>
425430
</g>
426431
</g>
427432
</svg>
@@ -716,7 +721,7 @@
716721
type="text"
717722
class="input-group-input"
718723
id="customMessage"
719-
placeholder="輸入文字"
724+
placeholder="Input text"
720725
/>
721726
<button class="input-group-button">Send</button>
722727
</div>

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,4 +870,4 @@ <h4>儲存成功</h4>
870870
gtag("config", "UA-2708968-11");
871871
</script>
872872
</body>
873-
</html>
873+
</html>

js/main-en.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,9 @@
381381
}
382382

383383
// 處理中間圖片跟隨視窗大小移動位置
384-
window.addEventListener('resize', imgPosition);
384+
window.addEventListener('resize', () => {
385+
kebbi.classList.remove('reset');
386+
imgPosition();
387+
});
385388

386389
}();

js/main.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
});
8787
saveBtn.addEventListener('click', async function () {
8888
let t = new Date();
89-
list.time = `${t.getFullYear()}/${t.getMonth()*1+1}/${t.getDate()} ${t.getHours()}:${t.getMinutes()}:${t.getSeconds()}`;
89+
list.time = `${t.getFullYear()}/${t.getMonth() * 1 + 1}/${t.getDate()} ${t.getHours()}:${t.getMinutes()}:${t.getSeconds()}`;
9090
let write = await database.ref('/').push(list);
9191
popup.classList.add('show');
9292
let url = `${urlOrigin}${urlPath}#${write.key}`;
@@ -380,6 +380,9 @@
380380
}
381381

382382
// 處理中間圖片跟隨視窗大小移動位置
383-
window.addEventListener('resize', imgPosition);
383+
window.addEventListener('resize', () => {
384+
kebbi.classList.remove('reset');
385+
imgPosition();
386+
});
384387

385388
}();

0 commit comments

Comments
 (0)