Commit graph

3399 commits

Author SHA1 Message Date
Cheng Zhao
064af6ecb2 Merge branch '1-0-release' 2016-05-11 22:11:08 +09:00
Cheng Zhao
ff3104b44b hash function for pair is already defined in VS 2016-05-11 21:32:28 +09:00
Cheng Zhao
12d40cd310 Add typename hint to fix compilation error on VS2015 2016-05-11 20:57:21 +09:00
Cheng Zhao
759a46f3d6 Use DoubleIDWeakMap for |rendererFunctions| 2016-05-11 20:40:48 +09:00
Cheng Zhao
6578c4f0b3 Bump v1.0.1 2016-05-11 20:10:38 +09:00
Cheng Zhao
49ac160ff7 Move createIDWeakMap to v8Util 2016-05-11 19:30:06 +09:00
Cheng Zhao
a077355d70 Turn api::IDWeakMap into api::KeyWeakMap<T> 2016-05-11 18:21:35 +09:00
Cheng Zhao
04d59991b0 Use create function instead of IDWeakMap constructor 2016-05-11 16:15:32 +09:00
Cheng Zhao
c708ae8eb5 Remove IDWeakMap 2016-05-11 15:51:22 +09:00
Cheng Zhao
ea93553225 Make KeyWeakMap a template class 2016-05-11 15:17:35 +09:00
Cheng Zhao
e6c0b1fe0c Fix leak when KeyWeakMap::Remove is called directly
Usually the KeyObject would be destroyed when GC happens, but then
Remove is called before GC happens, the KeyObject would be leaked
forever. This fixes it by keeping KeyObject as a member of map.
2016-05-11 15:17:35 +09:00
Cheng Zhao
79c1ad85f9 Add KeyWeakMap without Add method 2016-05-11 15:17:35 +09:00
Cheng Zhao
7f2a46cdd5 Remove unused methods of IDWeakMap 2016-05-11 15:17:35 +09:00
Cheng Zhao
2cd41b2f84 Merge branch 'master' of https://github.com/electron/electron 2016-05-11 15:15:15 +09:00
Cheng Zhao
0f52a6da39 Merge branch '1-0-release' 2016-05-11 15:14:56 +09:00
Cheng Zhao
ed70a11ff8 Merge pull request #5477 from danhp/download-bounce
Add API: app.dock.downloadFinished(filePath)
2016-05-11 09:41:08 +09:00
Cheng Zhao
0dad2581ef Fix passing paths in command line 2016-05-11 08:57:35 +09:00
Daniel Pham
6dae07b76f Add API: app.dock.downloadFinished(filePath) 2016-05-10 15:02:56 -04:00
Cheng Zhao
c40fb67890 Bump v1.0.0 2016-05-09 21:17:35 +09:00
Cheng Zhao
af0afecb45 Merge pull request #5406 from deepak1556/protocol_standard_scheme_patch
protocol: fix registerStandardSchemes api
2016-05-09 09:12:35 +09:00
Cheng Zhao
6b79f53416 Merge pull request #5440 from electron/bengotow/remove-default-protocol
Implement RemoveAsDefaultProtocolClient on OS X
2016-05-09 08:36:21 +09:00
Ben Gotow
ac905e7080 Add docs, avoid side effects when not currently default 2016-05-08 10:50:17 -07:00
deepak1556
70dac71639 delay protocol object creation 2016-05-08 16:44:14 +05:30
Cheng Zhao
e24ce97731 Set expirationDate for persistent cookie 2016-05-08 14:38:07 +09:00
deepak1556
9c71c9fa6a fix docs and spec 2016-05-08 01:37:57 +05:30
deepak1556
0f2ae385ed allow protocol module initialization before app ready.
* ensure registerStandardSchemes can only be called before app ready
 * ensure other protocol methods can only be used after app ready
2016-05-08 01:36:34 +05:30
deepak1556
1ff33b7c81 protocol: fix registerStandardSchemes api 2016-05-08 01:36:34 +05:30
Ben Gotow
19d5d3b7d1 Implement RemoveAsDefaultProtocolClient on OS X 2016-05-07 11:07:58 -07:00
Cheng Zhao
b05fa2ed5b Merge pull request #5430 from deepak1556/ipc_renderer_patch
ipcRenderer: fix crash with multiple listeners to sync message
2016-05-07 16:32:54 +09:00
Cheng Zhao
e46a50512d Merge pull request #5428 from miniak/update-app-manifest
Update app manifest
2016-05-07 11:20:25 +09:00
Cheng Zhao
767c235708 Fix compilation error 2016-05-07 10:38:41 +09:00
Milan Burda
bc8689889d Add dpiAware to app manifest instead of calling SetProcessDpiAwareness / SetProcessDPIAware 2016-05-07 01:18:01 +02:00
Milan Burda
bb32039fde Add disableWindowFiltering to app manifest to enable enumeration of modern app windows in node modules 2016-05-07 01:17:27 +02:00
deepak1556
53ac79cb19 devtools: handle file system indexing requests 2016-05-07 04:32:54 +05:30
Kevin Sawicki
ef459c7676 Remove support for options now on webPreferences 2016-05-06 10:12:56 -07:00
Cheng Zhao
446da677b5 Remove NativeImage.toDataUrl 2016-05-06 10:12:56 -07:00
Kevin Sawicki
4cb620c195 Remove support for translating hyphenated options 2016-05-06 10:12:54 -07:00
Kevin Sawicki
6f0471f6cb Remove deprecated options check in BrowserWindow 2016-05-06 10:12:53 -07:00
Cheng Zhao
df397dab30 Add scrollBounce option and disable it by default 2016-05-06 14:57:43 +09:00
deepak1556
45b3bd3a22 ipcRenderer: fix crash with multiple listeners to sync message 2016-05-06 02:52:59 +05:30
Cheng Zhao
2c31d7c1e8 Revert "Generalize this mate converter for reuse."
This reverts commit 92606579d3.
2016-05-05 17:26:31 +09:00
Cheng Zhao
2f9fee0c8a Move the job of creating userActivity to AtomApplication 2016-05-05 16:38:47 +09:00
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
Daniel Pham
a6f2d401fa Follow object naming conventions for params in the 'context-menu' event 2016-05-04 10:41:10 -04:00
Cheng Zhao
ef561fb919 Merge pull request #5378 from CGamesPlay/master
Use select to query the uv kqueue
2016-05-04 23:08:12 +09: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
Ryan Patterson
b15c07e1a8 Use select to query the uv kqueue
This resolves #38. I've verified that events still get processed like they
should on El Capitan 10.11.3 (15D21).
2016-05-02 23:54:21 -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
Charlie Hess
92606579d3 Generalize this mate converter for reuse. 2016-04-29 17:32:25 -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
76a954077d Simplify RemoteCallbackFreer 2016-04-26 16:37:46 +09:00
Cheng Zhao
4f21a50d23 Remove duplicated converter for content::WebContents 2016-04-26 16:31:56 +09:00
Cheng Zhao
d9778413e1 Should also destory RemoteCallbackFreer when page is reloaded 2016-04-26 16:30:26 +09:00
Cheng Zhao
06cf0406fe Dereference remote objects with native code
Previously we rely on the v8util.setDestructor to dereference the remote
objects in JavaScript, however as documented in V8, it is forbidden to
call V8 APIs in object's destructor (e.g. the weak callback), and doing
so would result in crashs.

This commit removes the JavaScript setDestructor method, and avoids
doing the dereference work with V8.
2016-04-26 16:16:22 +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
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
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