mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
8232 commits 1 branch 187 tags 5.8 GiB
Commit graph

3202 commits

Author SHA1 Message Date
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
ae0d007c5e Do no load PDF library from DLL 
We already have them compiled in.
 2016-04-14 17:15:20 +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
17446f4284 Make sure every page will get a script context created 2016-04-12 15:11:10 +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
Cheng Zhao
107d759ea2 Merge pull request #5072 from sneakypete81/master 
Don't wait for xdg-open to exit when OpenExternal is called (Linux)
 2016-04-11 19:27:53 +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
Pete Burgers
00ff209fe7 Ensure process is cleaned up, to avoid leaks 2016-04-08 08:35:35 +01:00
Pete Burgers
46365f4076 wait_for_exit param should be const 2016-04-08 08:32:45 +01:00
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
Pete Burgers
79ba8feaf8 Don't wait for xdg-open to exit when OpenExternal is called (Linux) 
Some browsers (eg. Firefox) may not return until the browser window is
closed. This causes the Electron application to lock up while the browser
window is open.

See https://github.com/atom/atom/issues/6320
 2016-04-07 17:04:15 +01:00