Commit graph

505 commits

Author SHA1 Message Date
Zeke Sikelianos
b575055d7e inherit user-specific MenuItem properties more safely 2016-10-10 14:40:49 -07:00
Zeke Sikelianos
2cd10d339f remove duplicated prop copying 2016-10-10 11:07:01 -07:00
Zeke Sikelianos
b7e078e98d sanitize MenuItem options 2016-10-06 14:37:13 -07:00
Zeke Sikelianos
16b3962b66 preserve custom properties passed to MenuItem constructor 2016-10-05 12:24:08 -07:00
Michael Vasseur
c811188e22 Updated required code to handle missing additional features for popup windows 2016-10-04 14:38:32 +09:00
Kevin Sawicki
24bcf6ac16 Add initial cookie changed event support 2016-09-29 09:16:29 -07:00
Cheng Zhao
734f42b5f9 Merge pull request #7319 from Menci/master
Workaround for electron/electron#5050
2016-09-29 16:42:30 +08:00
Menci
ca68dfe097 🎨 Remove extra semicolon 2016-09-28 06:45:15 +08:00
Cheng Zhao
458c4dd129 Merge branch 'support-chromium-sandbox' of https://github.com/tarruda/electron into tarruda-support-chromium-sandbox 2016-09-27 20:02:23 +08:00
Menci
ef45b67dbf 🐧 🐛 Move the workaround to lib/browser/init.js 2016-09-27 19:19:52 +08:00
Thiago de Arruda
a64978b812 Use the routing id on api::WebContents::GetID
The sandbox option allows multiple webContents in one renderer process, so using
the only the renderer id to identify WebContents instances is no longer an
option.

WebContents::GetID now returns a 64-bit integer, which is composed of both the
process id(high 32), and the RenderViewHost routing id(low 32). Also add a
`GetProcessID` that retrieves the renderer process id, a requirement in some of
our javascript code.
2016-09-27 06:01:47 -03:00
Thiago de Arruda
72154b64ed Embed setup bundle for preload scripts in sandboxed renderers.
Add a gyp target that creates a browserify bundle starting with
`lib/sandboxed_renderer/init.js`, which is embedded into the executable using
the `atom_js2c` target.

The goal of this bundle is to provide a very basic environment for preload
scripts where a `require` function is available.
2016-09-27 06:01:47 -03:00
Thiago de Arruda
695509e267 Add browser side support for reading files from renderer. 2016-09-27 06:01:46 -03:00
Thiago de Arruda
0f7652dc85 Move code that defines ipcRenderer methods into another file. 2016-09-27 06:01:46 -03:00
Thiago de Arruda
06cc9a44fe Add support for native chromium popups on sandboxed renderers.
- Allow `api::Window` instances to be created from existing `api::WebContents`.
- Override `WebContentsCreated` and `AddNewContents` to wrap renderer-created
  `content::WebContents` into `api::WebContents`.
- For `content::WebContents` that should be displayed in new windows, pass the
  wrapped `api::WebContents` object to window manager.
2016-09-27 06:01:46 -03:00
Menci
938b9e897a 🐧 🐛 Workaround for electron/electron#5050
Chromium only show the Tray icon with libappindicator when the env `XDG_CURRENT_DESKTOP`'s value is `Unity`. But under elementaryOS its value is 'Pantheon'.

Set it to `Unity` before app startup make the tray icon show under elementaryOS.
2016-09-23 18:07:43 +08:00
Zeke Sikelianos
56d62ff589 add html doctype 2016-09-22 14:47:20 -07:00
Zeke Sikelianos
62375663ab add type to webview style tag 2016-09-22 14:34:03 -07:00
Cheng Zhao
e3e450613d Merge pull request #7157 from Mossop/moveguest
Allow moving a webcontents to a different webview
2016-09-20 14:28:42 +09:00
Kevin Sawicki
48fd2bd35f binding -> bindings 2016-09-19 09:31:59 -07:00
Felix Rieseberg
29fa48d8c3 🔧 Ensure correct types for commandLine
This commit ensures that arguments passed to `appendSwitch` and `appendArgument` are turned into strings before passing them over to the binding.
2016-09-19 09:31:59 -07:00
Felix Rieseberg
90bff4d9de 🔧 Ensure correct types for commandLine
This commit ensures that arguments passed to `appendSwitch` and `appendArgument` are turned into strings before passing them over to the binding.
2016-09-19 09:31:59 -07:00
Cheng Zhao
0ac4b89a0a Merge pull request #7236 from yuya-oc/accelerator-for-redo
Use Ctrl+Y as the accelerator of redo on Windows
2016-09-19 15:53:44 +09:00
Yuya Ochiai
43f955194e 🏁 Use Ctrl+Y as the accelerator of redo on Windows 2016-09-18 17:07:34 +09:00
Kevin Sawicki
e77d7e7f62 🎨 2016-09-16 11:41:53 -07:00
Kevin Sawicki
5d0f3534eb Rethrow binding errors 2016-09-16 11:34:52 -07:00
Kevin Sawicki
eef42770c6 Don't load remote properties until they are accessed 2016-09-14 13:29:49 -07:00
Kevin Sawicki
359ab2f9b3 Only set members when members exist 2016-09-14 10:54:23 -07:00
Cheng Zhao
df3f0a4516 Merge pull request #7175 from bsuh/fix-twitch-navigation
Fix navigation controller
2016-09-13 16:01:00 +09:00
Cheng Zhao
9a56959647 Merge pull request #7140 from liusy182/url-fix
fix a bug in navigation-controller where string is used as object
2016-09-12 14:46:05 +09:00
Brian Suh
5fc1f57fb5 Fix navigation controller
In-page navigation has not actually started if the current entry is
being replaced. Do not set inPageIndex if replaceEntry is true.
2016-09-11 14:46:17 -07:00
Dave Townsend
313b2faa3c Add a guestinstance attribute to webviews reflecting their current guest
instance ID and allowing moving a guest instance to a new webview.
2016-09-09 10:32:05 -07:00
Cheng Zhao
693ba1375b Merge pull request #7146 from electron/resolve-empty-url-values
Tweak how empty URLs are resolved
2016-09-09 19:58:41 +09:00
Kevin Sawicki
daf1eec5ec Use === for string comparison 2016-09-08 17:11:10 -07:00
Kevin Sawicki
1dbaf4987e Don't resolve empty src/preload attribute values 2016-09-08 16:48:30 -07:00
Kevin Sawicki
9829baed46 Open about:blank when window.open is called with no URL 2016-09-08 16:10:21 -07:00
Kevin Sawicki
d476227e16 Remove unneeded return 2016-09-08 10:20:39 -07:00
Kevin Sawicki
902bd0564e Require Buffer explicitly instead of relying on global 2016-09-08 10:17:06 -07:00
liusy182
2c7690be45 simplify logic 2016-09-08 21:36:39 +08:00
liusy182
180a77e671 fix a minor bug in navigation-controller where a string is used as an object 2016-09-08 21:31:42 +08:00
Kevin Sawicki
28b33074cf Setup stdin in both processes on Windows 2016-09-07 14:45:56 -07:00
Cheng Zhao
e561608c0d Merge pull request #7116 from electron/restore-no-asar
Restore process.noAsar in finally block
2016-09-07 16:50:26 +09:00
Kevin Sawicki
46fbb6ed61 Reset process.noAsar in finally block 2016-09-06 13:40:25 -07:00
Kevin Sawicki
b54b74c310 Prevent missing Menu.buildFromTemplate function 2016-09-06 11:31:14 -07:00
Cheng Zhao
f854b27bfb Merge pull request #6867 from electron/remote-function-properties
Allow accessing remote function properties
2016-08-31 17:28:09 +09:00
Kevin Sawicki
01e69353d5 Don't serialize ArrayBuffer as Array 2016-08-24 15:18:42 -07:00
Kevin Sawicki
ec44a5d198 Add tests for setting remote function properties 2016-08-22 17:07:18 -07:00
Kevin Sawicki
666a668d91 Support remote function keys and property descriptors 2016-08-22 17:07:18 -07:00
Kevin Sawicki
d226b7bc6c Use Proxy for accessing properties of remote function 2016-08-22 17:07:18 -07:00
Kevin Sawicki
8b38018ab4 Add helper for including function properties 2016-08-22 17:07:17 -07:00