Charles Kerr 
								
							 
						 
						
							
							
								
							
							
	9c56b81b71  
						 
						
							
							
								
								
								Throw an error if menu.popup() has no window  
							
							
							
						 
						
							2018-02-20 18:38:05 -06: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shelley Vohr 
								
							 
						 
						
							
							
								
							
							
	
	
	5065e159f1 
 
						 
						
							
							
								
								
								positionItem => positioningItem  
							
							
							
						 
						
							2018-02-20 11:28:34 -05: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 
								
							 
						 
						
							
							
								
							
							
	
	
	211b542ae4 
 
						 
						
							
							
								
								
								remove setZoomLevelLimits  
							
							
							
						 
						
							2018-02-20 08:57:48 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shelley Vohr 
								
							 
						 
						
							
							
								
							
							
	
	
	56f06187d5 
 
						 
						
							
							
								
								
								forgot to remove old method  
							
							
							
						 
						
							2018-02-19 21:03:10 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shelley Vohr 
								
							 
						 
						
							
							
								
							
							
	
	
	6e11a3e53d 
 
						 
						
							
							
								
								
								add restructured window.popup  
							
							
							
						 
						
							2018-02-19 20:59:27 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shelley Vohr 
								
							 
						 
						
							
							
								
							
							
	
	
	cd9e7142e4 
 
						 
						
							
							
								
								
								add conditional for menu.popup(window, callback)  
							
							
							
						 
						
							2018-02-19 13:06:37 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Samuel Attard 
								
							 
						 
						
							
							
								
							
							
	a20b379f26  
						 
						
							
							
								
								
								fix windows tests  
							
							
							
						 
						
							2018-02-16 16:02:10 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Samuel Attard 
								
							 
						 
						
							
							
								
							
							
	6318cd781d  
						 
						
							
							
								
								
								Update to use Squirrel.Mac that supports CDN releases  
							
							
							
						 
						
							2018-02-15 14:00:46 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									acheronfail 
								
							 
						 
						
							
							
								
							
							
	d1d50a4c92  
						 
						
							
							
								
								
								Implement App-Scoped Security scoped bookmarks ( #11711 )  
							
							... 
							
							
							
							* implementation of security scoped bookmarks
* option is now only available on mas builds 
							
						 
						
							2018-02-12 13:25:06 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Samuel Attard 
								
							 
						 
						
							
							
								
							
							
	66b57858b8  
						 
						
							
							
								
								
								Fix child touch bar items not updating ( #11812 )  
							
							... 
							
							
							
							* Fix child touch bar items not updating
Deep children of a TouchBar didn't cause the top level touch bar to update, now they do
Fixes  #11761 .
* Remove unused newValue property in TB setter 
							
						 
						
							2018-02-12 12:53:04 -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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	8ae3d9dd0b  
						 
						
							
							
								
								
								Simplify the public PowerObserver interface  
							
							
							
						 
						
							2018-02-05 15:28:58 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Thiago de Arruda 
								
							 
						 
						
							
							
								
							
							
	56b53e71aa  
						 
						
							
							
								
								
								Implement powerMonitor 'shutdown' event for Linux.  
							
							... 
							
							
							
							The event is emitted when the OS is rebooting/shutting down, and allows
an electron app to call `e.preventDefault()` in order to delay shutdown
and exit cleanly. 
							
						 
						
							2018-02-05 15:21:31 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Samuel Attard 
								
							 
						 
						
							
							
								
							
							
	
	
	32a1395bcf 
 
						 
						
							
							
								
								
								Merge pull request  #11565  from electron/add-load-file-helper  
							
							... 
							
							
							
							Add window.loadFile and webContents.loadFile helper methods 
							
						 
						
							2018-01-23 09:08:23 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	bd271cffb9  
						 
						
							
							
								
								
								Throw when inAppPurchase is used on unsupported platforms  
							
							
							
						 
						
							2018-01-10 18:53:55 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	ac6f895f64  
						 
						
							
							
								
								
								Turn InAppPurchase into an EventEmitter  
							
							
							
						 
						
							2018-01-10 16:37:05 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Adrien Fery 
								
							 
						 
						
							
							
								
							
							
	b2542a27c3  
						 
						
							
							
								
								
								Update code style  
							
							
							
						 
						
							2018-01-10 13:14:18 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Adrien Fery 
								
							 
						 
						
							
							
								
							
							
	eb2520488f  
						 
						
							
							
								
								
								Adapt code style  
							
							
							
						 
						
							2018-01-10 13:14:18 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Adrien Fery 
								
							 
						 
						
							
							
								
							
							
	f3ae566164  
						 
						
							
							
								
								
								Add in-app purchase for MacOS  
							
							
							
						 
						
							2018-01-10 13:14:18 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zeke Sikelianos 
								
							 
						 
						
							
							
								
							
							
	
	
	eb89e12c5b 
 
						 
						
							
							
								
								
								Merge pull request  #11532  from sethlu/camelcase-menuitem-role  
							
							... 
							
							
							
							Make MenuItem roles camelCase-compatible 
							
						 
						
							2018-01-04 09:53:58 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Samuel Attard 
								
							 
						 
						
							
							
								
							
							
	
	
	1553b54779 
 
						 
						
							
							
								
								
								Add window.loadFile and webContents.loadFile helper methods  
							
							
							
						 
						
							2018-01-04 11:38:56 +13: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 
								
							 
						 
						
							
							
								
							
							
	7b01a8b860  
						 
						
							
							
								
								
								Add callback parameter to Menu.popup  
							
							
							
						 
						
							2018-01-01 16:26:19 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhuo Lu 
								
							 
						 
						
							
							
								
							
							
	b8ec84c761  
						 
						
							
							
								
								
								Fix syntax  
							
							
							
						 
						
							2018-01-01 02:23:32 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhuo Lu 
								
							 
						 
						
							
							
								
							
							
	d45914c3f7  
						 
						
							
							
								
								
								MenuItem roles camelCase-compatible  
							
							
							
						 
						
							2017-12-28 13:28:20 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	088042841d  
						 
						
							
							
								
								
								win: Correctly close popup menu  
							
							
							
						 
						
							2017-12-21 15:26:32 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	e4770c7604  
						 
						
							
							
								
								
								Coding style fixes  
							
							
							
						 
						
							2017-12-20 18:48:09 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Heilig Benedek 
								
							 
						 
						
							
							
								
							
							
	c586806609  
						 
						
							
							
								
								
								fix flash menu being unresponsive to commands  
							
							
							
						 
						
							2017-12-20 15:40:07 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	8166a64f98  
						 
						
							
							
								
								
								🔧  Last round of feedback  
							
							
							
						 
						
							2017-12-12 11:25:01 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	c4ec8b4545  
						 
						
							
							
								
								
								🔧  Feedback  
							
							
							
						 
						
							2017-12-12 11:25:01 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	5b7f7c8a1a  
						 
						
							
							
								
								
								🔧  Menu returns its properties now  
							
							
							
						 
						
							2017-12-12 11:25:01 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	ffc54967e9  
						 
						
							
							
								
								
								🔧  Fix value shift  
							
							
							
						 
						
							2017-12-12 11:25:01 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	99031834ff  
						 
						
							
							
								
								
								🔧  Cleanup  
							
							
							
						 
						
							2017-12-12 11:25:01 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	3719ee0b53  
						 
						
							
							
								
								
								🔧  Allow for menu.popup({})  
							
							
							
						 
						
							2017-12-12 11:25:01 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	9e660b1d32  
						 
						
							
							
								
								
								🔧  Always find a window (or error)  
							
							
							
						 
						
							2017-12-12 11:25:01 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	4f901c6d24  
						 
						
							
							
								
								
								🔧  Oh wow, that looks wrong  
							
							
							
						 
						
							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 
								
							 
						 
						
							
							
								
							
							
	927c63b477  
						 
						
							
							
								
								
								🔧  Last round of feedback  
							
							
							
						 
						
							2017-12-11 15:19:33 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	89b90be6a2  
						 
						
							
							
								
								
								🔧  Feedback  
							
							
							
						 
						
							2017-12-11 14:43:35 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	22e9d665d2  
						 
						
							
							
								
								
								🔧  Menu returns its properties now  
							
							
							
						 
						
							2017-12-11 14:03:01 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	93b46116f4  
						 
						
							
							
								
								
								🔧  Fix value shift  
							
							
							
						 
						
							2017-12-11 13:30:35 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	abd56eda6f  
						 
						
							
							
								
								
								🔧  Cleanup  
							
							
							
						 
						
							2017-12-08 14:40:51 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	955564abd7  
						 
						
							
							
								
								
								🔧  Allow for menu.popup({})  
							
							
							
						 
						
							2017-12-08 14:37:16 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	bd6767fac6  
						 
						
							
							
								
								
								🔧  Always find a window (or error)  
							
							
							
						 
						
							2017-12-08 14:36:52 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Rieseberg 
								
							 
						 
						
							
							
								
							
							
	38bb9baac5  
						 
						
							
							
								
								
								🔧  Oh wow, that looks wrong  
							
							
							
						 
						
							2017-12-08 14:36:29 -08:00