Skip to content

COMPASS-160 fix connect window focus regression #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2016
Merged

COMPASS-160 fix connect window focus regression #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd00508
COMPASS-160 fix connect window focus regression
Oct 16, 2016
90fae7d
COMPASS-160 also check for URI in clipboard on launch
Oct 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/app/connect/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,10 @@ var ConnectView = View.extend({
this.listenToAndRun(this, 'change:sshTunnelMethod',
this.replaceSshTunnelMethodFields.bind(this));

this.listenToAndRun(app, 'connect-window-focused',
// add event listener to focus event and also check on app launch
ipc.on('app:connect-window-focused',
this.onConnectWindowFocused.bind(this));
this.onConnectWindowFocused();

// always start in NEW_EMPTY state
this.dispatch('new connection clicked');
Expand All @@ -288,7 +290,9 @@ var ConnectView = View.extend({
* a MongoDB URI was detected.
*/
autofillFromClipboard: function() {
this.connection = MongoDBConnection.from(this.clipboardText);
this.connection = Connection.from(this.clipboardText);
// don't use "Local" as favorite name, keep field empty
this.connection.name = '';
this.updateForm();
},

Expand Down
3 changes: 3 additions & 0 deletions src/main/window-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ function showConnectWindow() {
debug('connect window closed.');
connectWindow = null;
});
connectWindow.on('focus', function() {
connectWindow.webContents.send('app:connect-window-focused');
});
}

function closeConnectWindow() {
Expand Down