From bd5a1121d62983b8c33a309439ae45dcf5bee512 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 10 May 2019 00:05:45 +0200 Subject: [PATCH] keyboard: Rename variable to JS style This variable has been there since the OSK origins, and nothing guaranteed the need for renaming it. It's enough of an eye sore though. https://gitlab.gnome.org/GNOME/gnome-shell/issues/1281 --- js/ui/keyboard.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js index fbba2840e..3c5c65091 100644 --- a/js/ui/keyboard.js +++ b/js/ui/keyboard.js @@ -1162,7 +1162,7 @@ var Keyboard = class Keyboard { this._keyboardController = new KeyboardController(); this._groups = {}; - this._current_page = null; + this._currentPage = null; this._suggestions = new Suggestions(); this.actor.add(this._suggestions.actor, @@ -1355,7 +1355,7 @@ var Keyboard = class Keyboard { } else if (switchToLevel == 1) { extraButton.connect('long-press', () => { this._latched = true; - this._setCurrentLevelLatched(this._current_page, this._latched); + this._setCurrentLevelLatched(this._currentPage, this._latched); }); } @@ -1382,8 +1382,8 @@ var Keyboard = class Keyboard { } _updateCurrentPageVisible() { - if (this._current_page) - this._current_page.visible = !this._emojiActive && !this._keypadVisible; + if (this._currentPage) + this._currentPage.visible = !this._emojiActive && !this._keypadVisible; } _setEmojiActive(active) { @@ -1442,7 +1442,7 @@ var Keyboard = class Keyboard { _getGridSlots() { let numOfHorizSlots = 0, numOfVertSlots; - let rows = this._current_page.get_children(); + let rows = this._currentPage.get_children(); numOfVertSlots = rows.length; for (let i = 0; i < rows.length; ++i) { @@ -1520,12 +1520,12 @@ var Keyboard = class Keyboard { let activeGroupName = this._keyboardController.getCurrentGroup(); let layers = this._groups[activeGroupName]; - if (this._current_page != null) { - this._setCurrentLevelLatched(this._current_page, false); - this._current_page.hide(); + if (this._currentPage != null) { + this._setCurrentLevelLatched(this._currentPage, false); + this._currentPage.hide(); } - this._current_page = layers[activeLevel]; + this._currentPage = layers[activeLevel]; this._updateCurrentPageVisible(); }