Skip to content

Commit 8894b3a

Browse files
authored
Merge branch 'master' into fix-9189_API_dont-update-posterID-if-ghost-user
2 parents 245dd3c + b983ff4 commit 8894b3a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

options/locale/locale_ja-JP.ini

+1
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,7 @@ issues.add_time=手で時間を入力
959959
issues.add_time_short=時間入力
960960
issues.add_time_cancel=キャンセル
961961
issues.add_time_history=`が作業時間を追加 %s`
962+
issues.del_time_history=`が作業時間を削除 %s`
962963
issues.add_time_hours=時間
963964
issues.add_time_minutes=分
964965
issues.add_time_sum_to_small=時間が入力されていません。

web_src/js/index.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1490,7 +1490,9 @@ function setCommentSimpleMDE($editArea) {
14901490
}
14911491
},
14921492
Backspace: (cm) => {
1493-
cm.getInputField().trigger('input');
1493+
if (cm.getInputField().trigger) {
1494+
cm.getInputField().trigger('input');
1495+
}
14941496
cm.execCommand('delCharBefore');
14951497
}
14961498
});

0 commit comments

Comments
 (0)