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

1010 commits

Author SHA1 Message Date
Kevin Sawicki
08e18d46ea Merge pull request #5244 from electron/disable-node-in-web-view-when-disabled-in-parent 
Disable node in webviews when disabled in parent window
 2016-04-22 09:05:58 -07:00
Felix Rieseberg
c0f63eed4e 🎨 Windows Store Camels 2016-04-21 19:11:25 -07:00
Kevin Sawicki
8e7bf1051d Disable node integration on webview when disabled on window 2016-04-21 11:52:10 -07:00
Cheng Zhao
c92e622ce0 Merge pull request #5238 from electron/felix/appx-detection 
Add Windows Store Detection
 2016-04-21 16:21:38 +09:00
Felix Rieseberg
2a2a8d3263 Add Windows Store Detection 
If we're running as a Windows Store appx package,
`process.windowsstore` will be `true`, otherwise
`undefined`.
 2016-04-21 00:02:03 -07:00
Cheng Zhao
b5c1db9ad9 Guard against unexist owner when removing ref to remote object 2016-04-21 11:23:20 +09:00
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
680652d01c buffer, null, array etc. all belong to object 2016-04-20 14:32:32 +09:00
Cheng Zhao
ff1b7d18f6 Cleanup the code determining value's type 2016-04-20 14:26:49 +09: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
Cheng Zhao
cb947873c4 Merge pull request #5161 from electron/felix/iss5097 
AutoUpdate Windows: Don't spawn if running
 2016-04-15 20:10:03 +09:00
Felix Rieseberg
a5b93211e6 AutoUpdate Windows: Don't spawn if running 
Previously, the auto updater would run as many squirrel processes
as told. This introduces a little change where instead of spawning
a second process, we attach to the already running process - or, if
different arguments are passed, return and emit an error.

This is not failsafe, but it ensures that we don't run into simple
race condition crashes.

Closes $5097
 2016-04-14 11:22:28 -07:00
Cheng Zhao
31eb793fb0 Avoid adding a new option to webPreferences 2016-04-14 10:50:07 +09:00
Cheng Zhao
8f0e594007 Fix lint warnings 2016-04-13 23:10:31 +09:00
Cheng Zhao
43c44da50b Correctly set initial visibilityState 2016-04-13 23:07:28 +09:00
Cheng Zhao
07a4c52919 Reduces the IPC messages used for visibilityState 2016-04-13 21:36:43 +09:00
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
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
Rob Brackett
15b042b5f6 Add support/tests for did-get-response-details event on <WebView> 2016-04-08 12:55:20 -07:00
Kevin Sawicki
732697a8a2 Rename ATOM_SHELL_ASAR to ELECTRON_ASAR 2016-04-08 08:53:58 -07:00
Kevin Sawicki
8d8d5878a3 Rename ATOM_ ipc event prefix to ELECTRON_ 2016-04-07 09:04:55 -07: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
Kevin Sawicki
eafe9c245b Disable guest node integration when embedder has it disabled 2016-04-01 16:48:21 -07:00
Kevin Sawicki
e5164d2255 Check of nodeIntegration is strictly equal to false 2016-04-01 16:42:21 -07:00
Kevin Sawicki
dbe1c1d4e4 Check nodeIntegration on embedder's webPreferences 2016-04-01 16:40:50 -07:00
Kevin Sawicki
463e077c3a Disable node on child when disabled on parent 2016-04-01 16:39:18 -07:00
Kevin Sawicki
ce95747a25 atom.asar -> electron.asar 2016-04-01 16:12:12 -07:00
Kevin Sawicki
400efa1b7d Fallback to using the last argument as the callback 2016-04-01 12:54:06 -07:00
Kevin Sawicki
464dad3135 Store default_app in .asar archive 2016-04-01 12:40:32 -07:00
Cheng Zhao
39d2b95a33 Reference the remote object in its prototype chain's methods 2016-04-01 15:46:01 +09:00
Cheng Zhao
4ebb01f8c9 Remote object's members should reference itself 2016-04-01 15:26:30 +09:00
Robo
7016fbe258 browser: fix disposition value for new-window event 2016-04-01 08:14:29 +05:30
Cheng Zhao
7353fb4296 Merge pull request #4955 from atom/remove-node-integration-disable-path 
Remove path for nodeIntegration value of 'disable'
 2016-04-01 11:14:30 +09:00
Kevin Sawicki
f033f259b4 Only check for nodeIntegration being true 2016-03-31 08:33:38 -07:00
Zeke Sikelianos
252121ac70 give anonymous function a name 2016-03-30 17:00:35 -07:00
Zeke Sikelianos
9efd29d059 fix a minor style issue 2016-03-30 17:00:35 -07:00
Zeke Sikelianos
d5e8bb7f12 derp 2016-03-30 17:00:35 -07:00
Zeke Sikelianos
7c58f7fb02 eradicate all per-file eslint globals 2016-03-30 17:00:34 -07:00
Zeke Sikelianos
47a61e9f27 use window.location instead of location 2016-03-30 17:00:34 -07:00
Zeke Sikelianos
b5afad9da7 avoid using eslint comment exceptions 2016-03-30 17:00:34 -07:00
Zeke Sikelianos
6f845373a7 do not return and assign 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
42e7ee2b4a finish standardizing! 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
4e2f1311e0 replace __proto__ with Object.setPrototype 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
2c3cacdc08 standardize by hand 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
e6698102c9 standardize by hand 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
cfdfdc8ccc standardize by hand 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
fd0f9519f1 remove useless constructors 2016-03-30 17:00:33 -07:00
Zeke Sikelianos
c4b6cf4a8e do more manual cleanup and specify globals 2016-03-30 17:00:32 -07:00
Zeke Sikelianos
09635ae50e reduce ignore list in favor of one-liner ignores 2016-03-30 17:00:32 -07:00
Zeke Sikelianos
3855a774ab autoformat more easy files 2016-03-30 17:00:31 -07:00
Zeke Sikelianos
67fa250020 standardize asar.js by hand 2016-03-30 17:00:31 -07:00
Zeke Sikelianos
c845ea8372 autoformat more easy files 2016-03-30 17:00:31 -07:00
Zeke Sikelianos
80f7c82f93 finish standardizing crash reporter 2016-03-30 17:00:31 -07:00
Zeke Sikelianos
ca7b492b97 tiptoeing along, keeping the suite passing 2016-03-30 17:00:31 -07:00
Zeke Sikelianos
ee181294b3 manual syntax fixes on rpc server 2016-03-30 17:00:30 -07:00
Zeke Sikelianos
4d4f479721 manually standardize this tricky file 2016-03-30 17:00:30 -07:00
Zeke Sikelianos
4794385fac first pass at standardizing; suite still passing! 2016-03-30 17:00:30 -07:00
Kevin Sawicki
8bcede8019 Merge pull request #4887 from sergeybekrin/master 
Improve error reporting when passing invalid argument types for dialog API methods
 2016-03-30 16:34:42 -07:00
Sergey Bekrin
4ac08870d0 Tweak error messages for dialog API 2016-03-30 23:07:13 +03:00
Kevin Sawicki
ad67070f23 Merge pull request #4861 from OctoHuman/master 
Fix alert()
 2016-03-30 12:40:41 -07:00
Cheng Zhao
e5886dda9b Avoid re-evaluating internal modules 2016-03-27 19:16:26 +09:00
Sergey Bekrin
7f78781800 Improve error reporting when using invalid argument types for dialog API methods 2016-03-23 10:44:11 +03:00
Kevin Sawicki
2d32956903 Destructure objects 2016-03-22 13:11:42 -07:00
Kevin Sawicki
4127b524d5 Destructure params directly 2016-03-22 13:11:42 -07:00
Kevin Sawicki
43746727aa Use direct params instead of rest params 2016-03-22 13:11:42 -07:00
Kevin Sawicki
4f4dc2f4d8 Use destructuring assigment 2016-03-22 13:11:42 -07:00
Kevin Sawicki
cbfe8b9228 Add minWidth and maxWidth to ints array 2016-03-21 09:12:47 -07:00
Cheng Zhao
a52285596e Merge pull request #4846 from atom/rest-parameters 
Use rest parameters
 2016-03-21 21:03:28 +09:00
Cheng Zhao
e08b48ab48 Merge pull request #4840 from atom/undefined-menu-accelerator 
Undefined menu accelerator
 2016-03-21 21:02:44 +09:00
OctoHuman
116d61185a Refix alert() 2016-03-20 03:40:12 -05:00
OctoHuman
9f6541228d Fix alert() 2016-03-20 02:09:30 -05:00
Kevin Sawicki
a53c7529c1 Remove unneeded slice call 2016-03-18 11:54:34 -07:00
Kevin Sawicki
8889c29866 Use rest parameters 2016-03-18 11:51:02 -07:00
Kevin Sawicki
6aa452cda4 Set _setDeprecatedOptionsCheck on exports 2016-03-18 09:06:03 -07:00
Kevin Sawicki
7668c1ea0b Use deprecate.warn instead of deprecate.log 2016-03-18 09:02:58 -07:00
Zeke Sikelianos
344dda4029 ignore set menu item fields 2016-03-17 16:20:23 -07:00
Kevin Sawicki
737ffd8d7c Improve deprecated message on webPreferences options 2016-03-17 13:37:08 -07:00
Kevin Sawicki
c31882749d Correct typos in comments 2016-03-17 13:37:08 -07:00
Kevin Sawicki
90d815ce6c Add todo about removing hyphenated options 2016-03-17 13:37:08 -07:00
Kevin Sawicki
3e7501579f Add camel case versions to ints array 2016-03-17 13:37:08 -07:00
Kevin Sawicki
a14380ed01 Set webPrereferences from features tring 2016-03-17 13:37:07 -07:00
Kevin Sawicki
15397bf879 Report deprecated BrowserWindow options 2016-03-17 13:37:07 -07:00
Kevin Sawicki
dfd13cf4ca persistented -> persisted 2016-03-17 13:37:07 -07:00
Cheng Zhao
242be31440 Merge pull request #4805 from atom/automatically-set-app-model-id 
Automatically set app user model ID
 2016-03-17 22:21:29 +09: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
Paul Betts
3ee4790dab Automatically set app user model ID 
We shouldn't ask users to figure out this piece of Windows Arcana when
they're using Squirrel, let's just do it automatically.
 2016-03-14 20:36:48 -07:00
Robo
f8f3fba433 webview: allow setting background color 2016-03-14 15:01:36 +05:30
Cheng Zhao
b2059ec8af Merge pull request #4774 from twolfson/dev/add.location.to.window.open.sqwished 
Added support for window.location on window.open windows
 2016-03-13 22:22:48 +09:00
Todd Wolfson
7569d180c9 Added support for window.location on window.open windows 2016-03-12 18:05:01 -06:00
Kevin Sawicki
3556507ab9 Use arrow functions for this binding 2016-03-11 14:08:14 -08:00
Kevin Sawicki
28e9d87d86 Add back return in getter 2016-03-11 11:25:56 -08:00
Kevin Sawicki
0e5e230c03 Remove lint errors due to rebase 2016-03-11 11:25:56 -08:00
Kevin Sawicki
3c11f5dc4d Remove returns from event handlers 2016-03-11 11:25:56 -08:00
Kevin Sawicki
0ee3446109 Use undefined instead of void 0 2016-03-11 11:25:56 -08:00
Kevin Sawicki
a3f08c9b51 Use arrow functions to replace old CoffeeScript => this wrappers 2016-03-11 11:25:56 -08:00
Kevin Sawicki
6b1748d6d6 Don't collect results from delegate.menuWillShow 2016-03-11 08:55:48 -08:00
Kevin Sawicki
3a08aa37de Don't collect results from Menu::_callMenuWillShow 2016-03-11 08:55:48 -08:00
Kevin Sawicki
93939089ec Don't collect results in Menu.setApplicationMenu 2016-03-11 08:55:48 -08:00
Kevin Sawicki
3a1e837f8b Don't collect results in exit event callback 2016-03-11 08:55:47 -08:00
Kevin Sawicki
5ed6c7714b Don't return attributes from from WebViewImpl::setupWebViewAttributes 2016-03-11 08:55:47 -08:00
Cheng Zhao
6aec1e6949 Merge pull request #4714 from atom/chrome49 
Upgrade to Chrome 49
 2016-03-11 21:39:52 +09:00
Arek Sredzki
fcc1f4d7ed Finalized browser-window show & hide events, added tests & fixed os x implementation 2016-03-10 13:51:31 -08:00
Arek Sredzki
c1267b2320 Added 'show' & 'hide' events to browser-window, fixed visibilitychange event in renderer 2016-03-10 13:51:31 -08:00
Arek Sredzki
ee61ab2d26 Cache browser visibility state & emit visibilitychange event on change 
Fixes #3788
 2016-03-10 13:51:31 -08:00
Cheng Zhao
6de9c4332f Fix passing Promise with remote 
Somehow using value.then.bind(value) would result in infinite loop,
could be bug of Chromium.
 2016-03-10 17:06:22 +09:00
Kevin Sawicki
2e9fd7ce77 Update common api path 2016-03-08 11:22:13 -08:00
Kevin Sawicki
418efbe660 Remove unneeded resolve calls 2016-03-08 11:14:22 -08:00
Kevin Sawicki
006c77a00f Update requires paths 2016-03-08 11:14:22 -08:00
Kevin Sawicki
70aa9b06ee Move JavaScript to root lib/ folder 2016-03-08 11:14:21 -08:00