isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shellEntry: Remove isPassword property

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/619
This commit is contained in:
Umang Jain 2019-12-12 16:52:17 +05:30
parent b0b8ab6c73
commit 5adbfdb590
5 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/components/keyring.js
View File

@ -76,7 +76,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
can_focus: true, can_focus: true,
x_expand: true, x_expand: true,
}); });
ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true }); ShellEntry.addContextMenu(this._passwordEntry);
this._passwordEntry.clutter_text.connect('activate', this._onPasswordActivate.bind(this)); this._passwordEntry.clutter_text.connect('activate', this._onPasswordActivate.bind(this));
this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, { this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, {
@ -109,7 +109,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {
can_focus: true, can_focus: true,
x_expand: true, x_expand: true,
}); });
ShellEntry.addContextMenu(this._confirmEntry, { isPassword: true }); ShellEntry.addContextMenu(this._confirmEntry);
this._confirmEntry.clutter_text.connect('activate', this._onConfirmActivate.bind(this)); this._confirmEntry.clutter_text.connect('activate', this._onConfirmActivate.bind(this));
if (rtl) { if (rtl) {
layout.attach(this._confirmEntry, 0, row, 1, 1); layout.attach(this._confirmEntry, 0, row, 1, 1);

3
js/ui/components/networkAgent.js
View File

@ -65,8 +65,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
secret.entry = new St.PasswordEntry(entryParams); secret.entry = new St.PasswordEntry(entryParams);
else else
secret.entry = new St.Entry(entryParams); secret.entry = new St.Entry(entryParams);
ShellEntry.addContextMenu(secret.entry, ShellEntry.addContextMenu(secret.entry);
{ isPassword: secret.password });
if (secret.validate) if (secret.validate)
secret.valid = secret.validate(secret); secret.valid = secret.validate(secret);

2
js/ui/components/polkitAgent.js
View File

@ -96,7 +96,7 @@ var AuthenticationDialog = GObject.registerClass({
can_focus: true, can_focus: true,
x_expand: true, x_expand: true,
}); });
ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true }); ShellEntry.addContextMenu(this._passwordEntry);
this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this)); this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
this._passwordEntry.bind_property('reactive', this._passwordEntry.bind_property('reactive',
this._passwordEntry.clutter_text, 'editable', this._passwordEntry.clutter_text, 'editable',

21
js/ui/shellEntry.js
View File

@ -41,24 +41,6 @@ var EntryMenu = class extends PopupMenu.PopupMenu {
this._passwordItem = item; this._passwordItem = item;
} }
get isPassword() {
return this._passwordItem != null;
}
set isPassword(v) {
if (v == this.isPassword)
return;
if (v) {
this._makePasswordItem();
this._entry.input_purpose = Clutter.InputContentPurpose.PASSWORD;
} else {
this._passwordItem.destroy();
this._passwordItem = null;
this._entry.input_purpose = Clutter.InputContentPurpose.NORMAL;
}
}
open(animate) { open(animate) {
this._updatePasteItem(); this._updatePasteItem();
this._updateCopyItem(); this._updateCopyItem();
@ -144,10 +126,9 @@ function addContextMenu(entry, params) {
if (entry.menu) if (entry.menu)
return; return;
params = Params.parse(params, { isPassword: false, actionMode: Shell.ActionMode.POPUP }); params = Params.parse(params, { actionMode: Shell.ActionMode.POPUP });
entry.menu = new EntryMenu(entry); entry.menu = new EntryMenu(entry);
entry.menu.isPassword = params.isPassword;
entry._menuManager = new PopupMenu.PopupMenuManager(entry, entry._menuManager = new PopupMenu.PopupMenuManager(entry,
{ actionMode: params.actionMode }); { actionMode: params.actionMode });
entry._menuManager.addMenu(entry.menu); entry._menuManager.addMenu(entry.menu);

4
js/ui/shellMountOperation.js
View File

@ -332,7 +332,7 @@ var ShellMountPasswordDialog = GObject.registerClass({
x_expand: true, x_expand: true,
}); });
this._pimEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this)); this._pimEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
ShellEntry.addContextMenu(this._pimEntry, { isPassword: true }); ShellEntry.addContextMenu(this._pimEntry);
if (rtl) { if (rtl) {
layout.attach(this._pimEntry, 0, 0, 1, 1); layout.attach(this._pimEntry, 0, 0, 1, 1);
@ -362,7 +362,7 @@ var ShellMountPasswordDialog = GObject.registerClass({
x_expand: true, x_expand: true,
}); });
this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this)); this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true }); ShellEntry.addContextMenu(this._passwordEntry);
this.setInitialKeyFocus(this._passwordEntry); this.setInitialKeyFocus(this._passwordEntry);
this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, { this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, {
animate: true, animate: true,