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

1900 commits

Author SHA1 Message Date
Taichiro Yoshida
fc92ceb0b6 do not overwrite node-integration option 
If `node-integration` option pass to window.open, do not overwrite by current window's one
 2015-07-29 13:41:11 +09:00
Cheng Zhao
9afa94f4b8 win: Implement double-clicked event 2015-07-29 12:36:01 +08:00
Cheng Zhao
edde653d60 Merge branch 'feature/modifiers-click-tray' of https://github.com/nishanths/electron into nishanths-feature/modifiers-click-tray 2015-07-29 12:19:17 +08:00
Robo
66553eea1a webContents: api to add/remove path from devtools workspace 2015-07-29 09:29:38 +05:30
Cheng Zhao
2c97cd64cf Minor style fix for #2352 2015-07-29 11:48:40 +08:00
Cheng Zhao
ff6b9d0907 Merge pull request #2352 from nishanths/feature/native-image-is-template 
Add NativeImage.isTemplateImage method
 2015-07-29 11:47:00 +08:00
Cheng Zhao
9afb973498 Merge pull request #2347 from deepak1556/fetch_job_headers_patch 
protocol: fix request headers in urlRequestFetchJob
 2015-07-29 11:44:47 +08:00
Cheng Zhao
c140077d53 Merge pull request #2338 from atom/page_size_option 
Add 'pageSize' option in printToPDF API.
 2015-07-29 11:32:49 +08:00
Cheng Zhao
0ca9dfbc12 Merge pull request #2337 from nishanths/feature/bounds-tray-dblclick 
Send bounding Rect on tray double click events
 2015-07-29 11:27:04 +08:00
Cheng Zhao
b08af89473 Style fix for #2328 2015-07-29 11:22:12 +08:00
Cheng Zhao
b9cf0f2126 Merge pull request #2328 from atom/tray-settings-propagate 
Propagate User App Model ID to Tray Icon
 2015-07-29 11:08:35 +08:00
Haojian Wu
617bff8ec8 Fix a missing the specified mime type check in <input> accept attribute. 2015-07-28 10:32:13 +08:00
Nishanth Shanmugham
a44f14d76e Fix code formatting issues 2015-07-27 03:33:15 -07:00
Nishanth Shanmugham
74b4522195 Add keyboard modifiers payload to tray click events 
* Add keyboard and mouse button bitsum to Tray click events payload
* Move getBoundsFromRect: to common event_util file
* Update documentation
 2015-07-27 03:15:51 -07:00
Nishanth Shanmugham
99a8f29de9 Move event type functions to a common event_util file 2015-07-27 00:41:20 -07:00
Nishanth Shanmugham
9211109088 Add NativeImage.IsTemplateImage method 
* Rename internal function that determines template image filename patterns
* Add the new IsTemplateMethod
 2015-07-26 21:58:48 -07:00
Haojian Wu
59c3efd44b Correct the override comment. 2015-07-27 09:09:32 +08:00
Robo
b0e73532de protocol: fix request headers in urlRequestFetchJob 2015-07-27 02:51:41 +05:30
Haojian Wu
fef53d18c4 Add session.setDownloadPath API. 2015-07-26 16:51:27 +08:00
Haojian Wu
2aa17debc8 prefs' key needs to be registered before using. 2015-07-26 16:17:55 +08:00
Haojian Wu
0700f08d6d Copy pref_names files from Chromium. 2015-07-26 16:08:29 +08:00
Nishanth Shanmugham
f53995d555 Send bounding Rect on tray double click events 2015-07-25 20:56:35 -07:00
Haojian Wu
9eeebedf5f Add pageSize option in printToPDF API. 2015-07-26 11:55:52 +08:00
Paul Betts
5e61974c24 Set NIF_GUID if we have a GUID 2015-07-24 08:05:36 -07:00
Paul Betts
70feb08f84 Fix linting issues 2015-07-24 03:30:23 -07:00
Paul Betts
75b08f510e Fix up namespaces 2015-07-24 03:27:15 -07:00
Paul Betts
08383a69ce Propagate User App Model ID to Tray Icon 
This PR prevents dozens of items showing up in the notification area
preferences when using Squirrel for Windows, by ensuring that
notification tray items are tied to the User App Model ID.
 2015-07-24 03:10:03 -07:00
Cheng Zhao
7ceca9f426 Bump v0.30.1 2015-07-24 16:59:18 +08:00
Cheng Zhao
73ded9d378 linux: Fix min/max size not working 2015-07-24 16:21:44 +08:00
Cheng Zhao
b547772c68 Merge pull request #2321 from atom/web-contents-focus 
Focus on WebContents when we load url in BrowserWindow for the first time
 2015-07-24 14:24:14 +08:00
Cheng Zhao
29c574cf0f Focus WebContents when we first load url in BrowserWindow 2015-07-24 13:08:19 +08:00
Haojian Wu
3840a10da6 Fix app-command event always return 'unknown'. 2015-07-24 13:02:11 +08:00
Cheng Zhao
9bb87af66b Add webContents.focus 2015-07-24 12:58:28 +08:00
Yifei Teng
8960aa956c Only allow extensions explicitly specified by the user. Fixes #2296 2015-07-23 12:30:07 -07:00
Cheng Zhao
de17894fce Merge pull request #2307 from atom/dialog-options 
Add "noLink" option for showMessageBox
 2015-07-23 17:59:09 +08:00
Cheng Zhao
6c44553456 Show all buttons as custom buttons when noLink is specified 2015-07-23 17:34:35 +08:00
Cheng Zhao
cc2a9f617d Add noLink option for showMessageBox 2015-07-23 17:25:37 +08:00
Cheng Zhao
1578d2fda9 Allow the C++ JS binding function to accept arbitrary long arguments 2015-07-23 15:00:42 +08:00
Cheng Zhao
da724d65d7 Add |options| for ShowMessageBox 2015-07-23 14:16:43 +08:00
Cheng Zhao
eb92e9cdd8 Use node::MakeCallback to emit events in C++ 
Fix #2165
 2015-07-23 13:48:34 +08:00
Cheng Zhao
5a980497e8 Merge pull request #2298 from deepak1556/default_protocol_handler_patch 
protocol: fix adapter request job for default handlers
 2015-07-23 12:15:54 +08:00
Cheng Zhao
72eb87a631 Make the extraSize of BrowserWindow.setAspectRatio optional 2015-07-23 10:14:02 +08:00
Cheng Zhao
df35700b94 Style fixes 
* Use under_score for variable names in C++
* Use const& when possible
* Line length <= 80
 2015-07-23 10:07:58 +08:00
Cheng Zhao
ea1b89c699 Merge pull request #2250 from EyeSee360/master 
Maintain an aspect ratio for content within a window
 2015-07-23 09:45:42 +08:00
Robo
97c90d31d3 get jsprotocolhandler in IO thread 2015-07-22 21:54:12 +05:30
Robo
a1ec07e07e read post-filtered data when filters are present 2015-07-22 21:45:08 +05:30
Michael S. Barthelemy
6d25c81bd1 changes requested for pull request #2250 into electron master 2015-07-22 10:23:31 -04:00
Robo
58f1907579 protocol: copy headers from original request for custom request job 2015-07-22 13:54:39 +05:30
Haojian Wu
462e6e0a82 Implement getUserAgent API. 2015-07-22 12:25:10 +08:00
Cheng Zhao
8df8b5731e Merge pull request #2287 from atom/fix-mac-content-size 
mac: Always call SetSize for frameless window
 2015-07-21 10:53:17 +08:00
Cheng Zhao
dbab889fcc Merge pull request #2232 from atom/status_item_view 
Introduce custom status item view on OS X.
 2015-07-21 10:36:19 +08:00
Cheng Zhao
891d107a51 mac: Always use GetSize for frameless window 2015-07-21 10:34:37 +08:00
Cheng Zhao
3ea878941b mac: Always call SetSize for framless window 2015-07-21 10:29:05 +08:00
Haojian Wu
d342c9a6df Implement 'drop-files' tray event on OS X. 2015-07-20 20:06:15 +08:00
Robo
d3055a5ca0 session: api to set proxy 2015-07-20 15:21:47 +05:30
Michael S. Barthelemy
6656afd57f fix bug with computing the case where we should constrain via height 2015-07-17 10:25:30 -04:00
Cheng Zhao
3145c78b61 Merge pull request #2207 from deepak1556/fetch_job_patch 
protocol: create separate request context for fetch job
 2015-07-16 15:14:45 -07:00
Robo
de3ccc4b98 use current session when not defined 2015-07-17 02:00:43 +05:30
Michael S. Barthelemy
d0c6176640 wrap lines to meet Travis CI build requirements 2015-07-16 14:45:27 -04:00
Michael S. Barthelemy
7cdfa44438 shorten names 2015-07-16 14:31:01 -04:00
Michael S. Barthelemy
10faf314d4 fix line length issue 2015-07-16 14:26:48 -04:00
Michael S. Barthelemy
423ea00263 Merge branch 'master' into msb/aspect-ratio 2015-07-16 13:57:38 -04:00
Michael S. Barthelemy
666aca7803 add function maintainAspectRatioOfInteriorContent to BrowserWindow in order to enforce an aspect ratio for an electron window 2015-07-16 13:54:51 -04:00
Cheng Zhao
135aca02af Bump v0.30.0 2015-07-17 01:01:25 +08:00
Robo
57244e4718 use request context from session if provided 2015-07-16 20:18:33 +05:30
Robo
8eb87c5d2b protocol: create separate request context for fetch job 2015-07-16 20:18:33 +05:30
Cheng Zhao
02cadde8de Merge pull request #2200 from atom/input_accept_attr 
Enable 'accept' attribute in 'input' label.
 2015-07-16 07:20:30 -07:00
Haojian Wu
21e5054fac Make <input type="file"\> remember last used directory. 2015-07-16 19:29:12 +08:00
Cheng Zhao
a2c26b8c74 Fix hanlding trailing slash in asar package, close #2222 2015-07-16 03:49:26 -07:00
Haojian Wu
2cd6ad1a97 More code style fixing. 2015-07-16 18:42:20 +08:00
Haojian Wu
736fe0c1db Fix OS X build error. 2015-07-16 11:43:42 +08:00
Haojian Wu
ed4c69343f Add 'tray.popContextMenu()' Windows implementation. 2015-07-16 11:42:43 +08:00
Haojian Wu
4421fbf9f3 Implement 'tray.popContextMenu' API on OS X. 2015-07-16 10:50:53 +08:00
Haojian Wu
002eb1a326 Simplify code logic and fix object-c code style. 2015-07-16 10:49:55 +08:00
Cheng Zhao
9ee0d46734 Use CTRL+SHIFT+I for toggling devtools, fix #2205 2015-07-15 13:11:01 -07:00
Haojian Wu
5ad3fff6a0 Implement 'right-clicked' tray event on Windows. 2015-07-15 20:03:05 +08:00
Haojian Wu
cca4f4abd5 Implement 'right-clicked' tray event on OS X. 2015-07-15 19:32:00 +08:00
Haojian Wu
e54fda6b34 Introduce Electron custom statusItem view. 
Reimplement tray functions on OS X by using custom statusItem view.
 2015-07-15 18:26:39 +08:00
Cheng Zhao
1e9eccf959 Forward the crashed event to BrowserWindow, fix #2201 2015-07-14 15:13:41 -07:00
Cheng Zhao
c6f870d4e4 Fix cpplint warnings 2015-07-14 12:16:13 -07:00
Cheng Zhao
053594eae8 Set default user agent for WebContents 2015-07-14 12:13:25 -07:00
Cheng Zhao
1615c97ce8 Don't set two "Electron"s in user agent 2015-07-14 12:12:55 -07:00
Cheng Zhao
940db1d1dd Provide default user agent in BrowserContext 2015-07-14 11:40:15 -07:00
Cheng Zhao
3ffd774405 Merge pull request #2197 from deepak1556/user_agent_patch 
webContents: set http useragent settings when overriding user agent
 2015-07-14 09:59:09 -07:00
Cheng Zhao
096439dce7 Don't expose "global" when node integration is off 2015-07-14 09:15:03 -07:00
Cheng Zhao
7f06072420 Avoiding creating static STL containers 
It is OK under most cases, but if you happen to also use COM in your
application, you will have heap corruptions.
 2015-07-14 17:33:16 +08:00
Cheng Zhao
5863ed4c33 win: Also map MESSAGE_BOX_TYPE_QUESTION to TD_INFORMATION_ICON 2015-07-13 21:51:19 -07:00
Cheng Zhao
14388feb23 Merge pull request #2187 from jprichardson/patch-1 
emit error object on process.on('uncaughtException') in renderer
 2015-07-13 21:46:06 -07:00
Cheng Zhao
868dee55de The options of clearStorageData should be optional 2015-07-13 15:13:17 -07:00
Cheng Zhao
7dba4d1d8d Call callback of ClearCache after cache is doomed 2015-07-13 14:27:07 -07:00
Cheng Zhao
34819140c3 Merge pull request #2102 from deepak1556/storage_cleanup_api_patch 
app: api to clear data from different storage types
 2015-07-13 12:34:48 -07:00
Cheng Zhao
9e8a118d10 Cleanup code 2015-07-14 03:23:19 +08:00
Cheng Zhao
0c7c6ddcc9 Merge pull request #2175 from atom/propagate-app-model-id 
Propagate App Model User ID on Windows
 2015-07-13 12:16:10 -07:00
Haojian Wu
04606a9f97 Enable 'accept' attribute in 'input' label. 2015-07-13 14:47:30 +08:00
Robo
cb4309bbd9 webContents: set http useragent settings when overriding user agent 2015-07-13 02:20:15 +05:30
JP Richardson
d6ae874038 emit error object on process.on('uncaughtException') in renderer 
Chromium added the actual `error` object to the 5th parameter in `window.onerror`. This should be emitted as opposed to the `errorMsg` string. Worse yet, since `errorMsg` wasn't an instance of `Error`, any code that assumes this in any `process.on('uncaughtException')` handler would fail. Also, correctly emitting the error provides the stack trace.

This is now an HTML5 standard.

Sources:
- https://html.spec.whatwg.org/multipage/webappapis.html#errorevent
- https://mikewest.org/2013/08/debugging-runtime-errors-with-window-onerror
- https://code.google.com/p/chromium/issues/detail?id=147127
 2015-07-10 14:38:03 -05:00
Robo
628fb5f5e9 app: api to clear data from different storage types 2015-07-10 11:31:30 +05:30
Cheng Zhao
967c273ddb Always use top window's context for resolving url 
Refs #2166.
 2015-07-10 13:57:09 +08:00
Cheng Zhao
5ae57baf11 Allow more insecure content when web-security is off 
Close #2076
 2015-07-10 13:29:46 +08:00
Cheng Zhao
7a390bdd4c Merge pull request #2125 from deepak1556/protocol_cleanup 
protocol: cleanup
 2015-07-10 12:16:17 +08:00
Cheng Zhao
72f4884127 Merge pull request #2144 from deepak1556/clipboard_multiwrite_patch 
clipboard: api to write multiple formats to same writer
 2015-07-10 12:14:58 +08:00
Robo
c56b3425a9 read/write protocol handler map in IO 2015-07-10 09:33:36 +05:30
Robo
2d3e938a7f clipboard: api to write multiple formats to same writer 2015-07-10 09:20:52 +05:30
Cheng Zhao
260ec96edd Resolve relative urls in window.open, fix #2166 2015-07-10 11:36:41 +08:00
Cheng Zhao
4379d24e9d Event "close" => "closed", fix #2149 2015-07-10 10:38:15 +08:00
Paul Betts
39c6e2d2e5 Linter fixes 2015-07-09 17:00:19 -07:00
Paul Betts
35aaad68d7 Set the AppUserModelId on the renderer side 2015-07-09 16:48:02 -07:00
Paul Betts
779583adf5 Append the app user model ID as a switch 2015-07-09 16:37:12 -07:00
Paul Betts
a0784bd038 Add a new renderer switch to pass down the app model ID 2015-07-09 16:37:11 -07:00
Robo
2cd5fb5694 add compatibility will old api 2015-07-09 14:48:58 +05:30
Robo
da00329d78 protocol: cleanup 2015-07-09 14:48:58 +05:30
Cheng Zhao
001b4a3179 Final cleanup 2015-07-08 16:24:39 +08:00
Cheng Zhao
aab78db8b8 On Windows "Cancel" button is also forced to be canclId 2015-07-08 16:00:30 +08:00
Cheng Zhao
9793473b10 Show custom buttons as links 2015-07-08 15:57:45 +08:00
Cheng Zhao
a89e5592f2 Use stock buttons on Windows when possible 2015-07-08 15:55:53 +08:00
Cheng Zhao
989351a41d Show user's icon when specified 2015-07-08 15:04:34 +08:00
Cheng Zhao
6fb8b2ce4f Show icon according to dialog's type 2015-07-08 14:46:06 +08:00
Cheng Zhao
f0be4025a5 If "detail" is empty then don't make message hilighted 2015-07-08 14:41:19 +08:00
Cheng Zhao
49da74f976 Handle when dialog is cancelled 2015-07-08 14:35:28 +08:00
Cheng Zhao
1146441c2a Implement ShowMessageBox with TaskDialog 2015-07-08 14:12:11 +08:00
Cheng Zhao
d01c200345 Set compilation requirements for using TaskDialogIndirect 
* Link with Comctl32.lib
* Update manifest file to use common controls v6

Thanks @vinnyp for finding out how to make it work
 2015-07-08 13:30:04 +08:00
Cheng Zhao
fdc01b8ba8 Merge pull request #2146 from atom/cancel-id 
Add "cancelId" option for showMessageBox
 2015-07-08 10:08:39 +08:00
Cheng Zhao
e0528655a8 Merge pull request #2133 from atom/app_dir_api 
Implment app.getAppPath API.
 2015-07-08 10:08:22 +08:00
Cheng Zhao
df4b5f4ede On OS X the "Cancel" is always get selected when dialog is cancelled 2015-07-07 18:45:43 +08:00
Cheng Zhao
fb537d91fc Set default cancelId in JavaScript 2015-07-07 18:39:08 +08:00
Cheng Zhao
b158427271 Add cancelId option for showMessageBox 2015-07-07 18:39:08 +08:00
Cheng Zhao
083d0b8b60 Merge pull request #2145 from atom/gtk-message-box 
Use GtkMessageBox for dialog.showMessageBox on Linux
 2015-07-07 18:08:06 +08:00
Haojian Wu
a2857d2dca Implment app.getAppPath API. 2015-07-07 17:37:53 +08:00
Cheng Zhao
a90a994a89 Bump v0.29.2 2015-07-07 17:22:05 +08:00
Cheng Zhao
a2d1ec2c1f Make "title" work 2015-07-07 17:21:30 +08:00
Cheng Zhao
9b25c16980 Allow "detail" to be empty 2015-07-07 17:21:30 +08:00
Cheng Zhao
810f14aecb Simplify the code 2015-07-07 17:21:30 +08:00
Cheng Zhao
e627592eed Reuse ShowMessageBox in ShowErrorBox 2015-07-07 17:21:30 +08:00
Cheng Zhao
3e6394a004 gtk: Map dialog type to message box type 2015-07-07 17:21:30 +08:00
Cheng Zhao
02e28ea758 Fix focusing message box 2015-07-07 17:21:30 +08:00
Cheng Zhao
b98cdf71c4 gtk: Implement message box APIs 2015-07-07 17:21:26 +08:00
Cheng Zhao
8fca1f52d3 Use SetGtkTransientForAura from libgtk2ui 2015-07-07 15:12:08 +08:00
Cheng Zhao
1ff00281f3 Seperate linux's implementation of message box 2015-07-07 15:12:08 +08:00
Cheng Zhao
74603624df Merge pull request #2138 from atom/window-move-issue 
Fix a type error on window.moveTo API.
 2015-07-07 11:29:06 +08:00
Haojian Wu
41c1a34b4f Fix a type error on window.moveTo API. 2015-07-07 07:25:58 +08:00
Cheng Zhao
f8786e9d17 No need to send message to embedder after it is closed 2015-07-06 21:28:09 +08:00
Cheng Zhao
85a4ff83da Some methods can be accessed after object is destroyed 2015-07-06 21:26:50 +08:00
Cheng Zhao
ae52af3870 Check BrowserWindow's lifetime 2015-07-06 18:28:42 +08:00
Cheng Zhao
1569dfa2e8 Remove manual lifetime check for Tray 2015-07-06 18:24:40 +08:00
Cheng Zhao
54dac0f37a Check whether WebContents lives before using its methods 
Close #2064.
 2015-07-06 18:21:04 +08:00
Cheng Zhao
ae3b47aa75 Inherit current window's node-integration in window.open by default 
Fix #2100.
 2015-07-06 16:21:08 +08:00
Cheng Zhao
f5a1ffcbd4 win: Build with cursors from Chromium 2015-07-06 15:19:28 +08:00
Cheng Zhao
0e888ccf22 Merge pull request #2105 from deepak1556/ppapi_browser_patch 
plugin: dont check renderer flags for adding pepper browser host filters
 2015-07-05 22:54:35 +08:00
Cheng Zhao
3315e6bda5 Merge pull request #2080 from deepak1556/linux_fullscreen_patch 
window: use _NET_WM_STATE_FULLSCREEN before window is mapped
 2015-07-05 16:44:42 +08:00
Cheng Zhao
506d6688e0 Merge pull request #2074 from ankitaggarwal011/windows-fullscreen-bug 
🐛 Solves issue #2047 [Windows fullscreen bug]
 2015-07-05 16:25:26 +08:00