|
| 1 | +diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js |
| 2 | +index c4048e3..7f0dedb 100644 |
| 3 | +--- a/js/ui/ibusCandidatePopup.js |
| 4 | ++++ b/js/ui/ibusCandidatePopup.js |
| 5 | +@@ -260,12 +260,12 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer { |
| 6 | + for (let i = 0; (indexLabel = lookupTable.get_label(i)); ++i) |
| 7 | + indexes.push(indexLabel.get_text()); |
| 8 | + |
| 9 | +- Main.virtualKeyboardManager.resetSuggestions(); |
| 10 | ++ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.resetSuggestions(); |
| 11 | + |
| 12 | + let candidates = []; |
| 13 | + for (let i = startIndex; i < endIndex; ++i) { |
| 14 | + candidates.push(lookupTable.get_candidate(i).get_text()); |
| 15 | +- Main.virtualKeyboardManager.addSuggestion(lookupTable.get_candidate(i).get_text(), () => { |
| 16 | ++ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.addSuggestion(lookupTable.get_candidate(i).get_text(), () => { |
| 17 | + let index = i; |
| 18 | + this._panelService.candidate_clicked(index, 1, 0); |
| 19 | + }); |
| 20 | +@@ -288,7 +288,7 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer { |
| 21 | + }); |
| 22 | + panelService.connect('focus-out', () => { |
| 23 | + this.close(BoxPointer.PopupAnimation.NONE); |
| 24 | +- Main.virtualKeyboardManager.resetSuggestions(); |
| 25 | ++ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.resetSuggestions(); |
| 26 | + }); |
| 27 | + } |
| 28 | + |
| 29 | +@@ -301,7 +301,7 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer { |
| 30 | + } |
| 31 | + |
| 32 | + _updateVisibility() { |
| 33 | +- let isVisible = !Main.virtualKeyboardManager.visible && |
| 34 | ++ let isVisible = !(Main.virtualKeyboardManager && Main.virtualKeyboardManager.visible) && |
| 35 | + (this._preeditText.visible || |
| 36 | + this._auxText.visible || |
| 37 | + this._candidateArea.visible); |
1 | 38 | diff --git a/js/ui/main.js b/js/ui/main.js |
2 | | -index 1b1069e..d640b53 100644 |
| 39 | +index e5f8daa..1b9077e 100644 |
3 | 40 | --- a/js/ui/main.js |
4 | 41 | +++ b/js/ui/main.js |
5 | | -@@ -97,7 +97,7 @@ var AppletManager = imports.ui.appletManager; |
| 42 | +@@ -100,7 +100,7 @@ var AppletManager = imports.ui.appletManager; |
6 | 43 | const SearchProviderManager = imports.ui.searchProviderManager; |
7 | 44 | const DeskletManager = imports.ui.deskletManager; |
8 | 45 | const ExtensionSystem = imports.ui.extensionSystem; |
@@ -42,7 +79,7 @@ index 1b1069e..d640b53 100644 |
42 | 79 | Promise.all([ |
43 | 80 | AppletManager.init(), |
44 | 81 | diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js |
45 | | -index a12bcbb..1262d6d 100644 |
| 82 | +index 495a01f..3b48b76 100644 |
46 | 83 | --- a/js/ui/popupMenu.js |
47 | 84 | +++ b/js/ui/popupMenu.js |
48 | 85 | @@ -3667,7 +3667,7 @@ var PopupMenuManager = class PopupMenuManager { |
|
0 commit comments