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

1080 commits

Author SHA1 Message Date
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
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
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
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
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
deepak1556
54545a8a6e provide security style for devtools security panel 2016-04-14 16:20:14 +05:30
Cheng Zhao
92882c358a No more need to delay did-fail-load event 2016-04-13 19:33:59 +09:00
Cheng Zhao
2fbe06a2a5 Handle the Page.reload command coming from devtools 2016-04-12 16:36:12 +09: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
Cheng Zhao
d156846036 Add backgroundThrottling option to webPreferences 2016-04-08 15:54:33 +09:00
Rob Brackett
f12f87d6f0 Add isMainFrame as last argument to WebContents did-fail-load event. 
Fixes #5013.
 2016-04-04 19:26:06 -07:00
Cheng Zhao
9828875ebc Set the background color of RenderViewHost to transparent 2016-04-03 10:42:49 +09:00
Cheng Zhao
cb470cb94b Use BrowserWindow's backgroundColor as renderer view's background color 2016-04-02 20:46:50 +09:00
Cheng Zhao
576b54320a Fix compilation errors on Windows 2016-04-01 16:34:20 +09:00
deepak1556
e14c91771b removed redundant delegation 2016-04-01 08:14:29 +05:30
deepak1556
e0fe478ae7 decide early on render initiated window creations 2016-04-01 08:14:29 +05:30
Robo
7016fbe258 browser: fix disposition value for new-window event 2016-04-01 08:14:29 +05:30
Cheng Zhao
c220753c60 Merge pull request #4896 from felixrieseberg/default-protocol-handler 
Enable Electron to set/unset itself as default protocol handler (OS X, Windows)
 2016-03-31 10:38:57 +09:00
Cheng Zhao
0e3737423b Merge pull request #4843 from jwheare/mac-swipe-events 
OSX: Expose 3-finger swipe events in browser-window
 2016-03-31 10:37:27 +09:00
Felix Rieseberg
1231360b2f ⚡ Add API: RemoveAsDefaultProtocolHandler 2016-03-28 15:31:01 -07:00
Felix Rieseberg
d2567b0381 ⚡ Add API: SetASDefaultProtocolHandler 
This PR adds an API enabling Electron to set itself as the default
protocol handler for a custom porotocl on both oS X and Windows.

For details, please see `docs/app.md`.

Closes #4857
 2016-03-23 22:12:17 -07:00
James Wheare
8482109dea Switch to a single OS X swipe event with a direction argument 2016-03-23 15:20:11 +00:00
Kevin Sawicki
6aa452cda4 Set _setDeprecatedOptionsCheck on exports 2016-03-18 09:06:03 -07:00
James Wheare
03319a5426 OSX: Capture 3-finger swipe events in NativeWindow 2016-03-18 15:21:19 +00:00
Kevin Sawicki
c31882749d Correct typos in comments 2016-03-17 13:37:08 -07:00
Kevin Sawicki
15397bf879 Report deprecated BrowserWindow options 2016-03-17 13:37:07 -07:00
Cheng Zhao
e50ba35871 Merge pull request #4777 from deepak1556/webview_background_patch 
webview: allow setting background color
 2016-03-15 21:12:04 +09:00
Robo
f8f3fba433 webview: allow setting background color 2016-03-14 15:01:36 +05:30
Robo
8378cbb1e8 webcontents: provide position of match with found-in-page event 2016-03-14 06:49:45 +05:30
Cheng Zhao
6aec1e6949 Merge pull request #4714 from atom/chrome49 
Upgrade to Chrome 49
 2016-03-11 21:39:52 +09:00
Cheng Zhao
03ec5ced05 Merge pull request #4751 from maxbeatty/window-blur 
Add blur method to window
 2016-03-11 19:15:51 +09:00
Max Beatty
704b8335aa Add blur method to window ref #4724 2016-03-10 21:45:51 -08:00