Skip to content

Commit 409baaf

Browse files
committed
finish the problem of comments and positive timing function
1 parent 671ff56 commit 409baaf

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

timer.html

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -212,51 +212,56 @@ <h3>
212212
'<br /><a href="javascript:mistakeResolver()" class="rest">' +
213213
i18n.__('fullscreen-experience-tip-mistake') + '</a>');</script>
214214
</div>
215-
<!-- 下拉菜单容器 -->
215+
<!-- container -->
216216
<div class="dropdown">
217-
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
217+
<button class="btn btn-secondary dropdown-toggle" type="button" id="time-adjust-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
218218
<script>document.write(i18n.__('time_adjustment'));</script>
219219
</button>
220220
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
221-
<!-- 减少5分钟 -->
221+
<!-- decrease5minutes -->
222222
<a class="dropdown-item" href="javascript:adjustTime(-5)">
223223
<i class="iconfont icon-previous"></i> <script>document.write(i18n.__('decrease-5-minutes'));</script>
224224
</a>
225-
<!-- 增加5分钟 -->
225+
<!-- increase5minutes -->
226226
<a class="dropdown-item" href="javascript:adjustTime(5)" >
227227
<i class="iconfont icon-fastforward"></i> <script>document.write(i18n.__('increase-5-minutes'));</script>
228228
</a>
229229
<div class="dropdown-divider"></div>
230230

231-
<!-- 减少1分钟 -->
231+
<!-- decrease1minutes -->
232232
<a class="dropdown-item" href="javascript:adjustTime(-1)" >
233233
<i class="iconfont icon-previous"></i> <script>document.write(i18n.__('decrease-1-minute'));</script>
234234
</a>
235-
<!-- 增加1分钟 -->
235+
<!-- increase1minutes -->
236236
<a class="dropdown-item" href="javascript:adjustTime(1)" >
237237
<i class="iconfont icon-fastforward"></i> <script>document.write(i18n.__('increase-1-minute'));</script>
238238
</a>
239239
<div class="dropdown-divider"></div>
240240

241-
<!-- 减少15秒 -->
241+
<!-- decrease15seconds -->
242242
<a class="dropdown-item" href="javascript:adjustTime(-0.25)" >
243243
<i class="iconfont icon-previous"></i> <script>document.write(i18n.__('decrease-15-seconds'));</script>
244244
</a>
245-
<!-- 增加15秒 -->
245+
<!-- increase15seconds -->
246246
<a class="dropdown-item" href="javascript:adjustTime(0.25)">
247247
<i class="iconfont icon-fastforward"></i> <script>document.write(i18n.__('increase-15-seconds'));</script>
248248
</a>
249249
<div class="dropdown-divider"></div>
250250

251-
<!-- 全屏提示 -->
251+
252252
<a class="dropdown-item" href="javascript:mistake()" >
253253
<script>document.write(i18n.__('fullscreen-experience-tip-mistake'));</script>
254254
</a>
255-
<a class="dropdown-item" href="javascript:mistake()" >
256-
<script>document.write(i18n.__('not_for_stopwatch'));</script>
257-
</a>
258255
</div>
259256
</div>
257+
<script>
258+
$(document).ready(function() {
259+
if (methodFromStart === 3) {
260+
// hide the menu
261+
$("#time-adjust-dropdown").hide();
262+
}
263+
});
264+
</script>
260265

261266
<div id="fullscreen-too-long-tip" class="small font-weight-bold text-muted text-center">
262267
<script>document.write(i18n.__('fullscreen-too-long-tip') +
@@ -990,13 +995,13 @@ <h3>
990995
function adjustTime(minutes){
991996
if (!window.isClockWorking) return;
992997
const ms = minutes * 60 * 1000;
993-
// 根据当前模式调整时间
998+
// adjust time according to mode
994999
if (method === 1) {
995-
// 工作模式:调整工作时间(保持最小10秒)
1000+
// working mode: adjust work time
9961001

9971002
workTime = Math.max(10000, workTime + ms);
9981003
} else {
999-
// 休息模式:调整休息时间
1004+
// rest mode: adjust rest time
10001005
restTime = Math.max(10000, restTime + ms);
10011006
}
10021007
lastRecordedProgress = -1;

0 commit comments

Comments
 (0)