Skip to content

Commit 42e9685

Browse files
authored
Merge branch '20.1' into valadzhov/fix-html-editor-2089-20.1
2 parents 27904b8 + e3bc8eb commit 42e9685

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

src/js/modules/i18n/infragistics.ui.htmleditor-ja.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@
7070
copyPasteToolbar: "コピー/貼り付けツールバー",
7171
fontNames: {
7272
win: [
73-
{ text: "メイリオ", value: "Meiryo" },
74-
{ text: "MSゴシック", value: "MSゴシック" },
75-
{ text: "MS明朝", value: "MS明朝" },
73+
{ text: "メイリオ", value: "メイリオ" },
74+
{ text: "MS ゴシック", value: "MS ゴシック" },
75+
{ text: "MS 明朝", value: "MS 明朝" },
7676
{ text: "Times New Roman", value: "Times New Roman" },
7777
{ text: "Arial", value: "Arial" },
7878
{ text: "Arial Black", value: "Arial Black" },

src/js/modules/infragistics.ui.htmleditor.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3150,7 +3150,6 @@
31503150
this._window = window;
31513151
this._document = this._window.document;
31523152
this._selection = this._window.getSelection();
3153-
this._window.setTimeout(function () {
31543153
self._range = (self._getSelection().rangeCount === 0) ?
31553154
self._document.createRange() : self._selection.getRangeAt(0);
31563155

@@ -3161,7 +3160,6 @@
31613160
if ($.isFunction(callback)) {
31623161
callback.call(self);
31633162
}
3164-
}, 50);
31653163
},
31663164
_getSelection: function () {
31673165
return this._selection;

0 commit comments

Comments
 (0)