mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22224 commits 1 branch 183 tags 5.3 GiB
Commit graph

79 commits

Author SHA1 Message Date
Erick Zhao
e03a40026a fix: correct triggeredByAccelerator Event property behavior (#18865) 
Fixes #18808

Previously, the triggeredByAccelerator flag would be entirely coupled with whether or not the modifier keys were being used or not.

This PR swaps out the ui::EventFlagsFromModifiers([event modifierFlags])) call in the macOS code to ui::EventFlagsFromNSEventWithModifiers(event, [event modifierFlags])). The latter outputs flags that take into account mouse click events on top of modifier flags (see Chromium documentation).

The business logic to detect triggeredByAccelerator is then changed to exclude any mouse click flags.
 2019-06-28 14:38:17 -07:00
Electron Bot
96b32a814c chore: bump chromium to 964c4bca8de5c320534d95606c861 (master) (#18440) 
* chore: bump chromium in DEPS to 2930eb12d56988c2c80bad2797ab036fe493d4e1

* chore: update patches

* Revert "disable robotjs-based tests"

This reverts commit e56adafc1f.

* Revert "skip dbus tests (#18409)"

This reverts commit aea042cc83.

* Revert "skip more dbus tests"

This reverts commit 68dbef48da.

* chore: bump chromium in DEPS to fd62da5601399b92effaa32a943fcd96143c8605

* chore: bump chromium in DEPS to 99f87ca22ee6e7ec953defe694771cb68f47a596

* chore: bump chromium in DEPS to d88778435b4cd9a510a63385b6d4ba24674b9774

* chore: update patches

* chore: update ssl_security_state_tab_helper.patch

* Remove content_packaged_services

https://chromium-review.googlesource.com/c/chromium/src/+/1604203

* chore: fix false positive lint error

* views: wireup widget name to crash data

https://chromium-review.googlesource.com/c/chromium/src/+/1626640

* chore: bump chromium in DEPS to ab588d36191964c4bca8de5c320534d95606c861

* roll patches
 2019-05-28 13:18:10 -07:00
Jeremy Apthorp
e56adafc1f disable robotjs-based tests 
See #18409
 2019-05-22 11:42:24 -07:00
Shelley Vohr
db29978fe0
fix: throw error when inserting menu items out-of-range (#17401) 
* fix: throw error when inserting menu items out-of-range

* also check pos < 0
 2019-03-18 07:58:42 -07:00
Shelley Vohr
858781ba83
feat: allow Menu.buildFromTemplate() to accept MenuItems (#16697) 
* feat: allow Menu.buildFromTemplate to accept MenuItems

* add another spec

* fix linter error

* add submenu spec
 2019-02-06 10:04:40 -08:00
Nitish Sakhawalkar
5994bf6745
fix: Menu accelerators not working (#15094) 
This change fixes the regression in the menu accelerators working in linux, on some environments.
 2018-11-09 13:54:16 -08:00
Shelley Vohr
f9f34fd628
fix: ability to fetch separators by id (#15290) 2018-10-19 13:09:40 -07:00
Samuel Attard
558fff69e7
chore: update to standard 12 2018-09-14 14:57:01 +10:00
Troy
5ea05ddee7 fix: Stricter Testing For Menu Items (#13992) 
This PR includes stricter testing for empty objects so that false context menus are not created along with the tests to ensure future compatibility.
 2018-08-17 13:10:14 -07:00
Dominic
a7052efaf4 fix: make menu.popup options optional (#13977) 
* add empty object as default param for options

* update docs

* add spec for optional options

* fix: add null check for options
 2018-08-08 17:38:52 -05:00
Shelley Vohr
42d173b343
spec: convert menu specs to expect (#13485) 
* spec: convert menu-item spec to expect

* spec: convert menu spec to expect
 2018-06-30 00:25:28 -07:00
Shelley Vohr
9c8952aef0
Add menu item order control (#12362) 
Add four new optional properties to menus in Electron. The four properties are:
'before'
'after'
'beforeGroupContaining'
'afterGroupContaining'

'before/after' - provides a means for a single context menu item to declare its placement relative to another context menu item. These also imply that menu item in question should be placed in the same “group” as the item.

'beforeGroupContaining/afterGroupContaining - provides a means for a single menu item to declare the placement of its containing group, relative to the containing group of the specified item.
 2018-05-05 09:37:29 -07:00
Shelley Vohr
31d688ad3d
Check menu.popup options are an object (#12325) 
* check menu.popup options are an object

* Add a spec for menu.popup options check

* remove stray .only
 2018-03-17 06:31:10 +09:00
shelley vohr
18362eb948 improve Menu and MenuItem testing (#12015) 
* split menu/menuitem and add some tests

* fix ipc send issue

* feedback: make tests less brittle

* clean up MenuItem accelerator and label tests
 2018-02-23 07:53:59 -06:00
John Kleinschmidt
2a97e48465
Merge pull request #11968 from electron/refactor-menu-popup 
Refactor menu.popup
 2018-02-21 14:29:52 -05:00
Charles Kerr
5a25b88b50 Fix browserWindow detection in menu.popup() 2018-02-20 18:35:39 -06:00
Charles Kerr
708f39a1a5 update a few menu.popup() calls to use the new API 2018-02-20 14:02:24 -06:00
Cheng Zhao
dc62e51ba4 Fix the cyclic reference in menu delegate (#11967) 
* Fix the cyclic reference in menu delegate

* Fix menu tests due to delegate change
 2018-02-20 10:11:35 -06:00
Shelley Vohr
fb7fb4972d
options all the things 2018-02-20 11:10:53 -05:00
Shelley Vohr
73ab87b87f
add new and changed specs 2018-02-19 20:59:47 -05:00
Shelley Vohr
9c52d273dd
add spec for menu.popup(window, callback) 2018-02-19 13:15:49 -05:00
shelley vohr
5240352326 Remove extra menu separators (#11827) 
* add function to remove leading/trailing separators

* change const  name for clarity

* add spec to check filtered separators

* clean method and add edge case spec per review
 2018-02-05 11:55:12 -06:00
Shelley Vohr
3d032c2b57
forgot to remove .only from spec 2018-01-27 12:38:55 -05:00
Shelley Vohr
3679a9c37a
fix event callback placement in spec 2018-01-27 12:36:51 -05:00
Shelley Vohr
e345342e36
add first pass at menu event specs 2018-01-27 11:23:46 -05:00
Cheng Zhao
46330ac2a9 Remove the closed event of Menu 
The callback of Menu.popup does more things, and there is actually no
request for the closed event.
 2018-01-01 17:22:07 +09:00
Cheng Zhao
73d78d345a Make callback work for old-style Menu.popup call 
While the old-style Menu.popup has been deprecated, it is still being
used widely in apps and even in Electron itself.
 2018-01-01 17:17:01 +09:00
Cheng Zhao
2ec3b8ce76 spec: callback for Menu.popup 2018-01-01 16:56:22 +09:00
Heilig Benedek
5bf16c2495 remove async:true from menu tests 2017-12-20 15:41:12 +09:00
Heilig Benedek
ef7357dedc update tests for menu closed event and call cancel on closePopup 2017-12-20 15:40:07 +09:00
Heilig Benedek
14b65467d8 add test for menu closed event 2017-12-20 15:40:07 +09:00
Felix Rieseberg
317422f431 👷 Close popup in aftereach 2017-12-12 12:23:02 -08:00
Felix Rieseberg
c4ec8b4545 🔧 Feedback 2017-12-12 11:25:01 -08:00
Felix Rieseberg
76df41b5d0 👷 Properly test x vs y 2017-12-12 11:25:01 -08:00
Felix Rieseberg
ace558f54a 👷 Hence, better testing 2017-12-12 11:25:01 -08:00
Felix Rieseberg
5a658fa5f6 👷 Add a spec 2017-12-12 11:25:01 -08:00
Alexey Kuzmin
1c8eb03574
Revert "fix: Fix menu.popup() bugs" 2017-12-12 13:59:34 +03:00
Felix Rieseberg
89b90be6a2 🔧 Feedback 2017-12-11 14:43:35 -08:00
Felix Rieseberg
f7ebfff8ae 👷 Properly test x vs y 2017-12-11 14:05:07 -08:00
Felix Rieseberg
dfd7598d48 👷 Hence, better testing 2017-12-11 14:03:04 -08:00
Felix Rieseberg
725f6c97d6 👷 Add a spec 2017-12-08 14:52:21 -08:00
Birunthan Mohanathas
4e859b4718 Remove "async" option from menu.popup() 
All menus are async now. See "Cleanup MenuRunner API"
https://codereview.chromium.org/2790773002
 2017-11-24 10:58:17 +09:00
Felix Rieseberg
07dea13c77 👷 Let’s add a spec! 2017-11-07 13:29:37 -08:00
Shelley Vohr
e4214a6cbe
[WIP] Upgrade more specs (#10945) 
Finish upgrading specs to ES6
 2017-10-27 16:45:58 -04:00
Shelley Vohr
135454342d
remove .only from spec 2017-10-24 22:41:28 -04:00
Shelley Vohr
f7bc5481f3
add a few more tests to api_menu_spec 2017-10-24 22:40:31 -04:00
Shelley Vohr
d54148de4e
remove from spec 2017-10-24 20:31:02 -04:00
Shelley Vohr
0e6100ae17
upgrade menu spec to ES6 2017-10-24 20:27:26 -04:00
Shelley Vohr
3c6a7c332a
add unit test for getMenuItemById 2017-09-26 20:05:51 -04:00
Kevin Sawicki
8b4bf1f29e 🎨 2017-03-29 12:29:36 -07:00