Skip to content
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.

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

docs: fix electron.d.ts typings #13841

Merged
merged 1 commit into from Jul 30, 2018
Merged

docs: fix electron.d.ts typings #13841

merged 1 commit into from Jul 30, 2018

Conversation

miniak
Copy link
Contributor

@miniak miniak commented Jul 28, 2018

Fixes #13577

  • win.setOverlayIcon(overlay, description) - overlay can be null
  • tray.setPressedImage(image) - image can be string
Checklist

@miniak miniak requested review from zeke and a team July 28, 2018 17:35
@miniak miniak changed the title docs: overlay in BrowserWindow.setOverlayIcon can be null (electron.d.ts) docs: fix electron.d.ts typings Jul 29, 2018
@miniak
Copy link
Contributor Author

miniak commented Jul 29, 2018

@zeke can you please review?

@miniak miniak mentioned this pull request Jul 29, 2018
@@ -194,7 +194,7 @@ Sets the `image` associated with this tray icon.

#### `tray.setPressedImage(image)` _macOS_

* `image` [NativeImage](native-image.md)
* `image` ([NativeImage](native-image.md) | String)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of documenting everywhere that NativeImage can also be a string I think it makes more sense to remove this duplication and update electron-typescript-definitions to alias NativeImage to NativeImage | String

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note this won't block this PR, just a thing we should probably do in the future

@MarshallOfSound MarshallOfSound merged commit aacbd76 into master Jul 30, 2018
@MarshallOfSound MarshallOfSound deleted the miniak/fix-typings branch July 30, 2018 01:11
@trop
Copy link
Contributor

trop bot commented Jul 30, 2018

We have automatically backported this PR to "1-8-x", please check out #13855

@trop
Copy link
Contributor

trop bot commented Jul 30, 2018

We have automatically backported this PR to "2-0-x", please check out #13856

@trop
Copy link
Contributor

trop bot commented Jul 30, 2018

We have automatically backported this PR to "3-0-x", please check out #13857

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants