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

8232 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Rob Brackett
dc8fc7c079 📝 Add English docs for webContents.isLoadingMainFrame() 
[ci skip]
 2016-04-19 23:27:22 -07:00
Cheng Zhao
823c4f91a8 Merge pull request #5219 from atdrago/master 
Add note for OS X about using `role` on MenuItem
 2016-04-20 15:11:43 +09:00
Cheng Zhao
809135f657 Merge pull request #5222 from Stone-Jay/master 
fixes some translation mistakes
 2016-04-20 15:05:25 +09:00
Cheng Zhao
47ec7dcaa0 Merge pull request #5213 from rmcdonald/patch-1 
Correct transposition errors by changing xfvb to xvfb
 2016-04-20 15:05:04 +09:00
Cheng Zhao
3fdcbcef03 Merge pull request #5223 from electron/remote-cleanup 
Small cleanup of the code determining value's type
 2016-04-20 14:47:16 +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
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
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
d7a391dc61 Merge pull request #5214 from alexgleason/docs-downloaditem-typo 
Fixed docs sample code programming error for DownloadItem
 2016-04-20 13:44:31 +09: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
Cheng Zhao
a3e8591a41 Update brightray for #5208 2016-04-20 13:34:30 +09:00
deepak1556
794d120754 rename importClientCertificate => importCertificate 2016-04-20 08:45:49 +05:30
StoneStoneStone
bdde5fd7ad Update screen.md 2016-04-20 10:58:32 +08:00
StoneStoneStone
57bdbd8185 Update download-item.md 2016-04-20 10:39:47 +08:00
StoneStoneStone
16b54e1502 Update screen.md 2016-04-20 10:37:41 +08:00
StoneStoneStone
7468118df5 Update screen.md 2016-04-20 10:26:31 +08:00
Rob Brackett
942971b01a Fix linting errors. 2016-04-19 19:20:59 -07:00
Cheng Zhao
652110707e Merge pull request #5202 from electron/updating-submodules 
keeping submodules up to date
 2016-04-20 10:51:12 +09:00
Adam Drago
b80272dbb4 Add note for OS X about using role on MenuItem 2016-04-19 18:12:37 -07:00
Cheng Zhao
5b7637687c Merge pull request #5143 from felixrieseberg/debug-instructions 
Add Debugging Instructions for Windows
 2016-04-20 09:33:25 +09:00
Cheng Zhao
b2a3aabc90 Merge pull request #5218 from electron/style-fix 
Fix some coding style issues
 2016-04-20 09:31:53 +09: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
Cheng Zhao
37e500dc10 Merge pull request #5203 from Stone-Jay/master 
Translate download-item.md to Chinese
 2016-04-20 08:50:25 +09:00
Cheng Zhao
873e9c44db Merge pull request #5196 from raybooysen/patch-1 
Update screen.md
 2016-04-20 08:44:41 +09:00
Jessica Lord
5e9fe1c6eb Merge pull request #5168 from electron/jlord-patch-1 
A few style updates 2 docs
 2016-04-19 12:29:42 -07:00
Alex Gleason
02c8c58c0b Fixed docs sample code programming error for DownloadItem 2016-04-19 12:47:05 -04:00
Zeke Sikelianos
8f04dd1b9c remove the git 2016-04-19 09:46:48 -07:00
rmcdonald
838cf0ffdc Correct transposition errors by changing xfvb to xvfb 2016-04-19 09:31:04 -07:00
deepak1556
58dfad4d01 devtools: allow opening in specified dock state 2016-04-19 18:12:05 +05:30
Cheng Zhao
34ee29871b Merge pull request #5205 from electron/mas-fix 
Fix the support for Mac App Store
 2016-04-19 20:56:24 +09:00
Cheng Zhao
fd6747483a Update the codesign code for latest Xcode 2016-04-19 20:31:31 +09:00
Cheng Zhao
bd406ab046 Update the MAS submission guide 2016-04-19 20:31:31 +09:00
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
StoneStoneStone
591f8fed88 Update frameless-window.md 2016-04-19 12:03:34 +08:00
StoneStoneStone
fcad4ee186 Create download-item.md 2016-04-19 11:58:58 +08:00
Zeke Sikelianos
916114dd28 📝 keeping submodules up to date 2016-04-18 20:23:11 -07:00
StoneStoneStone
ace235b2fe Merge pull request #3 from electron/master 
update from electron
 2016-04-19 09:13:30 +08:00
Jessica Lord
c3200ba7f6 Revert "Fix headers" 
This reverts commit 4dd2716865.
 2016-04-18 18:00:32 -07:00
Cheng Zhao
1c87acbb75 Merge pull request #5194 from Stone-Jay/patch-5 
Create frameless-window.md
 2016-04-19 08:59:45 +09:00
Cheng Zhao
5c75fbe369 Merge pull request #5192 from andrewda/patch-1 
Update link to setFeatureEnabledFromString
 2016-04-19 08:59:15 +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
Rob Brackett
3a9bbe30ac Test for #5183 - webContents.executeJavaScript hangs on subframe load. 2016-04-18 10:33:56 -07:00