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

2619 commits

Author SHA1 Message Date
Cheng Zhao
60bd60e1ed Fully support converting NSDictionary to JS userInfo object 2016-05-05 16:26:44 +09:00
Cheng Zhao
7268f434b2 Fix code styling problems 2016-05-05 12:26:23 +09:00
Cheng Zhao
3f2a25d07c Merge pull request #5352 from CharlieHess/hands-on-hand-off 
OS X Handoff Feature
 2016-05-05 12:06:56 +09:00
Cheng Zhao
0901a70166 Merge pull request #5379 from danhp/context-menu 
Expose the 'context-menu' event.
 2016-05-05 11:12:58 +09:00
Charlie Hess
b2fb95f857 Use scoped_nsobject to ensure our intermediate objects get cleaned up. 2016-05-04 11:28:49 -07:00
Cheng Zhao
540076e9d5 Fix code styling issue 2016-05-04 17:12:10 +09:00
Charlie Hess
12764a66ed Add an accessor for the current activity type and write the simplest possible test. 2016-05-03 15:51:31 -07:00
Charlie Hess
42768bcc2b Save the activity on the application instance to ensure we hold a reference. Activities that enable search need to persist. 2016-05-03 14:57:16 -07:00
Daniel Pham
0fffbea79d Add 'context-menu' event to 'WebContents' 2016-05-03 17:50:54 -04:00
Charlie Hess
03d25ce6c0 Revert "Add some shady methods to get V8 objects or arrays from NSDictionary or NSArray." 
This reverts commit 2295f3a832.
 2016-05-03 10:32:42 -07:00
Charlie Hess
f84a973d69 Revert "Use a DictionaryValue everywhere instead of a string map." 
This reverts commit 90cc10944a.
 2016-05-03 10:31:53 -07:00
Charlie Hess
90cc10944a Use a DictionaryValue everywhere instead of a string map. 2016-05-02 16:18:58 -07:00
Charlie Hess
2295f3a832 Add some shady methods to get V8 objects or arrays from NSDictionary or NSArray. 2016-05-02 14:45:59 -07:00
Adam Buckland
abb60ecd2e Fix autoUpdater error on OS X 
If there is no localizedFailureReason, then then this will no longer be
added to the error string (which would result previously in it printing
'(null)' as part of the string)
 2016-05-01 13:43:56 +01:00
Charlie Hess
05493502ea Value first, key second. 2016-04-30 11:17:29 -07:00
Charlie Hess
195940292d This is preventDefault by convention. 2016-04-29 22:08:19 -07:00
Charlie Hess
88805ec7e2 Make the Linter happy. 2016-04-29 22:05:36 -07:00
Charlie Hess
3a9a1d35d7 Add the AppDelegate override for restoring from hand-off, and fire the app event. 2016-04-29 17:37:01 -07:00
Charlie Hess
c20acb0361 Implement a "continue-activity" event on app for resuming from hand-off. 2016-04-29 17:36:04 -07:00
Charlie Hess
6df4bb176d Implement app.setUserActivity(type, userInfo). 2016-04-29 17:35:07 -07:00
Cheng Zhao
edb73fb734 Bump v0.37.8 2016-04-29 20:48:19 +09:00
Cheng Zhao
66853344c0 Make sure the userData directory is created before ready event 2016-04-29 20:20:52 +09:00
Milan Burda
340b7220f1 Fix #3075 by not caching the displays (id is not persistent on Windows) 2016-04-28 17:46:41 +02:00
deepak1556
d64e3784f4 renderer: fix desktop capture api not responding different subsequest calls 2016-04-28 14:24:22 +05:30
Cheng Zhao
d9db23185c Merge pull request #5302 from ritazh/default-protocol-handler 
Add API: IsDefaultProtocolClient
 2016-04-28 16:13:06 +09:00
Rita Zhang
df2141d9e6 ⚡ Add API: IsDefaultProtocolClient 2016-04-27 12:24:46 -07:00
deepak1556
6dbd2ce243 use DownloadItem to determine download initiator 2016-04-27 20:29:39 +05:30
deepak1556
46208b5b3e session: dont attach download dialog to deleted webContents window 2016-04-27 20:00:31 +05:30
Cheng Zhao
7b8a05f01f Merge pull request #5298 from phamdaniel/fix-mac-accelerators 
Fix converting from windows virtual keycode back to mac keycode
 2016-04-27 10:23:28 +09:00
Daniel Pham
21af03d71a 🍎 Fix converting from windows virtual keycode back to mac keycode 2016-04-26 10:53:26 -04:00
Cheng Zhao
4f21a50d23 Remove duplicated converter for content::WebContents 2016-04-26 16:31:56 +09:00
Cheng Zhao
570dc7ca9b Merge branch 'MarshallOfSound-master' 2016-04-26 11:15:56 +09:00
Cheng Zhao
f081c77422 Fix compilation error 2016-04-26 11:15:36 +09:00
Samuel Attard
315cd9d2c8 Emit an error if quitAndInstall is called without an update being available 2016-04-26 11:55:57 +10:00
Cheng Zhao
067e9c1a85 Add systemPreferences.getUserDefault 2016-04-25 15:35:52 +09:00
Cheng Zhao
a421c66f3f Deprecate the platform-theme-changed event 2016-04-25 14:35:34 +09:00
Cheng Zhao
9557226223 Add systemPreferences.subscribeNotification 2016-04-25 14:25:14 +09:00
Cheng Zhao
ddd8eae661 Move isAeroGlassEnabled and isDarkMode to systemPreferences 2016-04-25 12:35:09 +09:00
Cheng Zhao
d72a0e452f BuildPrototype should not be empty 2016-04-25 12:24:11 +09:00
Cheng Zhao
13f8599ba1 Add systemPreferences module 2016-04-25 11:32:33 +09:00
Cheng Zhao
9fe3dbcfe0 Make VS happy 2016-04-25 10:40:19 +09:00
Cheng Zhao
272592415d Fix building on non-mac 2016-04-25 10:34:41 +09:00
Cheng Zhao
993695af07 Remove unneeded cleanup code 2016-04-25 10:23:36 +09:00
Cheng Zhao
60d2cb8a84 Remove the isolate parameter of GetWrapper 2016-04-25 10:19:25 +09:00
Cheng Zhao
2ae52d0ff4 Make Wrappable a template class 2016-04-25 10:17:54 +09:00
Milan Burda
e1516d4244 Fix BrowserWindow.maximize/unmaximize on Mac 2016-04-23 01:16:31 +02:00
Cheng Zhao
c04d43ca13 Bump v0.37.7 2016-04-22 17:39:11 +09:00
Cheng Zhao
df97be30e5 Do not create the folder passed to app.setPath 2016-04-21 14:37:29 +09:00
deepak1556
ca756c3c24 session: allow providing permission to handle external protocols 2016-04-21 05:27:07 +05:30
Cheng Zhao
aa29dc0c8a Merge pull request #5199 from Mr0grog/5183-disambiguate-loading-from-main-frame-loading 
Add `isLoadingMainFrame()` to WebContents
 2016-04-20 20:49:56 +09:00
Cheng Zhao
965c3f605e Merge pull request #5197 from deepak1556/client_certificate_patch 
app: api to import client certificate
 2016-04-20 14:35:00 +09:00
Rob Brackett
d3e879cd7f Change WebContents::IsLoadingMainFrame to compare SiteInstances 
(per @deepak1556's recommendation)

Also updates tests to cover the situation where navigating between pages from the same potential "site" and adds generalized tests for `isLoadingMainFrame()`.
 2016-04-19 22:05:09 -07:00
Cheng Zhao
d3bff7fffc Merge pull request #5208 from deepak1556/devtools_dock_state_patch 
devtools: allow opening in specified dock state
 2016-04-20 13:34:52 +09:00
deepak1556
794d120754 rename importClientCertificate => importCertificate 2016-04-20 08:45:49 +05:30
Rob Brackett
942971b01a Fix linting errors. 2016-04-19 19:20:59 -07:00
Cheng Zhao
18f5fcde60 Fix some coding style issues 2016-04-20 09:18:50 +09:00
Cheng Zhao
eb9e0e5534 Merge pull request #4922 from electron/bengotow/sheet-offset 
Allow sheets to be attached at a custom offset #4679
 2016-04-20 08:55:42 +09:00
Cheng Zhao
8ca1a6961c Merge pull request #5147 from deepak1556/devtools_network_controller_patch 
session: set client id when enabling network emulation
 2016-04-20 08:52:59 +09:00
deepak1556
58dfad4d01 devtools: allow opening in specified dock state 2016-04-19 18:12:05 +05:30
deepak1556
2d8286515d expose api only on platforms using nss cert database 2016-04-19 11:29:24 +05:30
Ben Gotow
414245f4d8 Keep function placement consistent 2016-04-18 22:45:38 -07:00
Ben Gotow
8f89cd2d59 Move "setSheetOffset" to the BrowserWindow 2016-04-18 22:39:12 -07:00
deepak1556
ddf962c6ea client_id is accessed on different threads 2016-04-19 10:01:38 +05:30
Rob Brackett
64a84dee3b Add isLoadingMainFrame method to WebContents. 
Also switch `webContents.executeJavaScript` to check it instead of `isLoading`.
There doesn’t seem to be a reasonable public way to get this information out of Chromium, so it’s synthesized here based on WebContentsObserver callbacks.
Fixes #5183.
 2016-04-18 10:37:08 -07:00
deepak1556
919be67cd2 remove --client-certificate flag 2016-04-18 22:26:37 +05:30
deepak1556
1240c83e40 set trust bits for CA certs 2016-04-18 21:05:33 +05:30
deepak1556
b8e04f4947 set client id on AtomNetworkDelegate instead of cmd line switch 2016-04-18 11:35:24 +05:30
Cheng Zhao
34319abf4a Initialize the embedder_ member data 
Otherwise it is going to be some random value and bite us.
 2016-04-18 14:52:03 +09:00
deepak1556
e81cec4058 app: api to import client certificate 2016-04-18 10:54:43 +05:30
deepak1556
fcf04377d7 set network emulation client id in request headers 2016-04-18 10:49:00 +05:30
Cheng Zhao
0bf1e56156 Update brightray for electron/brightray#212 2016-04-18 13:59:15 +09:00
Ben Gotow
65c37fe64b Create local variable to typecast view 2016-04-16 10:57:39 -04:00
Ben Gotow
c87c49f4c8 Allow sheets to be attached at a custom offset #4679 
Adds a new "setSheetOffset" API to the `dialog` module, which allows you to change the attachment point for sheets on Mac OS X. I put the API on the dialog module, even though Mac OS X requires that the native window hold and return the desired offset.

1. I was originally hoping to make this an argument on the actual dialog.show* calls, but it seems the parameter set is defined in `libchromiumcontent` and I wasn't sure it would be appropriate to add there?

2.  The API could also be on the BrowserWindow (eg `BrowserWindow.setSheetOffset`). I don't have a strong preference, but I think it's more discoverable on the `dialog` module.
 2016-04-16 10:16:43 -04:00
Cheng Zhao
aefb672393 Bump v0.37.6 2016-04-15 16:48:09 +09:00
Cheng Zhao
075da45b74 Merge pull request #5155 from electron/mac-background-color 
Set the backgroundColor of RenderWidgetHostView
 2016-04-15 08:48:09 +09:00
Cheng Zhao
b84a178ceb Set the backgroundColor of RenderWidgetHostView 2016-04-14 21:52:17 +09:00
Cheng Zhao
64d37065bd Merge pull request #5117 from deepak1556/devtools_security_panel_patch 
provide security style for devtools security panel
 2016-04-14 20:23:58 +09:00
deepak1556
54545a8a6e provide security style for devtools security panel 2016-04-14 16:20:14 +05:30
Cheng Zhao
11ba1832d1 Only transparent window does not have background color 2016-04-14 19:35:31 +09:00
Cheng Zhao
31eb793fb0 Avoid adding a new option to webPreferences 2016-04-14 10:50:07 +09:00
Cheng Zhao
43c44da50b Correctly set initial visibilityState 2016-04-13 23:07:28 +09:00
Cheng Zhao
92882c358a No more need to delay did-fail-load event 2016-04-13 19:33:59 +09:00
Cheng Zhao
3780d9f033 Use LowMemoryNotification for GC 2016-04-13 17:58:36 +09:00
Cheng Zhao
99a9aa085e views: Delay the focus/blur event to next tick 2016-04-13 11:02:34 +09:00
Cheng Zhao
2fbe06a2a5 Handle the Page.reload command coming from devtools 2016-04-12 16:36:12 +09:00
Cheng Zhao
a07612c1ed Merge branch '5074-did-get-response-details-resource-type' of https://github.com/Mr0grog/electron into Mr0grog-5074-did-get-response-details-resource-type 2016-04-11 21:05:40 +09:00
Cheng Zhao
5659ee5c0b Merge pull request #5030 from deepak1556/webrequest_response_headers_patch 
session: webRequest.OnHeadersReceived should accept status line.
 2016-04-11 20:04:32 +09:00
Rob Brackett
1a842bf9d5 Fix trailing whitespace caught by linter. 2016-04-08 13:15:40 -07:00
Rob Brackett
c1b1348735 Add resourceType arg to webContents did-get-response-details event. 
Fixes #5074 and follows @zcbenz's recommendation to expose ResourceTypeToString from atom_network_delegate publicly.
Also adds testing for other arguments to the `did-get-response-details` events, since there were no existing tests for them.
 2016-04-08 11:19:36 -07:00
deepak1556
3fb39ad3ef provide option to override status line 2016-04-08 14:03:57 +05:30
Cheng Zhao
d156846036 Add backgroundThrottling option to webPreferences 2016-04-08 15:54:33 +09:00
deepak1556
4fc35a4587 session: webRequest.OnHeadersReceived should follow server redirect 
Its required to follow server redirects.
 2016-04-08 11:40:43 +05:30
Cheng Zhao
82856eb099 Merge pull request #5029 from Mr0grog/5013-add-main-frame-param-for-did-fail-load 
Add `isMainFrame` param to WebContents `did-fail-load` event
 2016-04-07 20:22:02 +09:00
Cheng Zhao
7d3f8cb222 Merge pull request #5009 from deepak1556/context_creation_patch 
browser: create cert verifier when browser context is created
 2016-04-07 16:18:55 +09:00
Cheng Zhao
efb0fc2ea5 Merge pull request #4968 from phamdaniel/exit-events 
Don't emit 'will-quit' when 'app.exit()' is called.
 2016-04-07 16:14:35 +09:00
Cheng Zhao
adb112e970 Merge pull request #5056 from electron/fix-a11y-reader 
Fix NVDA/JAWS support in Electron
 2016-04-07 16:11:05 +09:00
Cheng Zhao
548febfa4c Fix style issues 2016-04-07 15:23:16 +09:00
Ben Gotow
e0ee60f290 Fix memory leak 2016-04-07 15:21:07 +09:00
Ben Gotow
91457fe739 Support images larger than self.bounds 2016-04-07 15:21:07 +09:00
Ben Gotow
f9644463a9 Fix broken template image support in Tray icon 
Between Electron `0.30.x` and `0.37.x`, the tray icon stopped automatically inverting template images when highlighted. NSImageView normally uses the correct color for template images magicaly, but I think the addition of event handlers in the container view prevents the image view from determining highlight state.

This PR switches to drawing the image manually. The `drawRect` function decides whether to use `image` or `alternateImage`(pressed image) and then if that image is marked as a template, it fills it with the same color used for the text before drawing it.
 2016-04-07 15:21:07 +09:00