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

9805 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin Sawicki
07ccb6af2b 🎨 2016-07-06 09:42:43 -07:00
Kevin Sawicki
b900ff93e4 Make OnCapturePageDone static 2016-07-06 09:32:58 -07:00
Kevin Sawicki
c2ecc49be2 Defer to webContents docs 2016-07-06 09:21:29 -07:00
Kevin Sawicki
4a4a8528ea Fix linter warnings 2016-07-06 09:21:29 -07:00
Kevin Sawicki
ce4ef1ccb8 Update capturePage documentation for new location 2016-07-06 09:21:28 -07:00
Kevin Sawicki
12dddae2ca Remove unused callback 2016-07-06 09:21:28 -07:00
Kevin Sawicki
f7b72f0948 Move capturePage to WebContents 2016-07-06 09:21:28 -07:00
Kevin Sawicki
d42d10a47c Merge pull request #6368 from vsemozhetbyt/patch-1 
Fix disordered definitions in webContents doc
 2016-07-06 09:02:35 -07:00
vsemozhetbyt
c2bf6c2460 Fix disordered definitions in webContents doc 
📝 Swap `clearSelection` and `keepSelection` definitions
for `webContents.stopFindInPage(action)` that seems to be in wrong order.

[ci skip]
 2016-07-06 18:58:50 +03:00
Cheng Zhao
92b97d3576 Bump v1.2.6 2016-07-06 13:20:36 +09:00
Paul Betts
7ffab11f1a Merge pull request #6356 from jonathansampson/patch-1 
modern.ie is no longer in use
 2016-07-05 19:37:38 -07:00
Jonathan Sampson
7baf7372af modern.ie is no longer in use 
The URL exists for historical reasons, but is no longer the primary URL for developer resources.
 2016-07-05 19:34:33 -07:00
Cheng Zhao
6fe4653b54 Merge pull request #6354 from electron/package-json-bom 
Use require to load package.json
 2016-07-06 09:48:37 +09:00
Kevin Sawicki
b8e5180132 Use require to load package.json instead of fs/JSON 2016-07-05 15:50:12 -07:00
Cheng Zhao
83ae14f2ed Merge pull request #6333 from electron/drag-item 
Add `webContents.startDrag(item)` API
 2016-07-04 13:30:56 +09:00
Cheng Zhao
23582cc9d3 Reduce the scope of ScopedNestableTaskAllower 2016-07-03 15:30:27 +09:00
Cheng Zhao
ba1fe322e9 docs: Use <a> as example 2016-07-03 15:27:26 +09:00
Cheng Zhao
b7459d50f9 docs: Dragging files out of the window 2016-07-03 15:26:22 +09:00
Cheng Zhao
f072d9dd3a docs: webContents.startDrag(item) 2016-07-03 15:10:59 +09:00
Cheng Zhao
7916f0ea18 win: Use drag_utils::CreateDragImageForFile 2016-07-03 14:44:47 +09:00
Cheng Zhao
63a8961ed1 views: Implement webContents.startDrag 2016-07-03 14:34:35 +09:00
Cheng Zhao
fa468a529b Support dragging multiple files 2016-07-03 13:58:31 +09:00
Cheng Zhao
13c668f22b mac: Implement webContents.startDrag 2016-07-03 12:26:43 +09:00
Cheng Zhao
74ebbf9c78 docs: Add trailing period 2016-07-02 20:27:14 +09:00
Cheng Zhao
ff5745f36f Merge pull request #6324 from MarshallOfSound/master 
Document possible getLocale returns values.
 2016-07-02 11:25:15 +00:00
Samuel Attard
7f914c65de Update docs to match style guide 2016-07-02 23:21:45 +12:00
Samuel Attard
bbaab9b355 Document possible getLocale returns values. Closes #5363 2016-07-02 21:17:37 +12:00
Cheng Zhao
14c4be50c1 Avoid calling GetWebContentsFromProcessID for twice 2016-07-02 16:54:12 +09:00
Cheng Zhao
b0faa62f76 Merge pull request #6313 from MarshallOfSound/silent-notification-when-muted 
Override the Notification API constructor to create silent notificatons when the webContents is muted
 2016-07-02 07:44:33 +00:00
Cheng Zhao
6eda76336f Merge pull request #6323 from electron/icon-fix 
Set window icon before showing window
 2016-07-02 07:41:30 +00:00
Cheng Zhao
e76ec92812 Set window icon before showing window 2016-07-02 16:16:47 +09:00
Cheng Zhao
6ffcb9f06c Merge pull request #6322 from electron/chrome-51.0.2704.106 
Update to Chrome 51.0.2704.106
 2016-07-02 07:12:23 +00:00
Cheng Zhao
cd38e5c85e Update to Chrome 51.0.2704.106 2016-07-02 13:54:34 +09:00
Cheng Zhao
ee0eb9ae08 Merge pull request #6309 from electron/app-launcher-rename 
Implement app.setBadgeCount on Mac
 2016-07-02 01:51:47 +00:00
Cheng Zhao
767124c45c Update for reviews 2016-07-02 10:36:46 +09:00
Samuel Attard
4f660f3e6f Implement WebContenstAudioMuted in AtomBrowserClient 2016-07-02 13:28:28 +12:00
Kevin Sawicki
5dcc354432 Merge pull request #6298 from jhen0409/patch-5 
Support background.page in extension manifest
 2016-07-01 08:59:39 -07:00
Kevin Sawicki
b47d0e3e58 Tweak launcher note text 2016-07-01 08:51:25 -07:00
Jhen
d4f64ce943 Use background page path instead of generated path 
if extension use manifest.background.page
 2016-07-01 23:50:31 +08:00
Cheng Zhao
df3e651fbf Merge pull request #6315 from electron/fix-extension-match 
Don't use MatchesExtension for matching filters
 2016-07-01 14:14:18 +00:00
Cheng Zhao
cff50614e5 Merge pull request #6314 from electron/suppress-session-protocol 
spec: Suppress the session.protocol test
 2016-07-01 13:56:48 +00:00
Cheng Zhao
431ea61ff8 Don't use MatchesExtension for matching filters 
MatchesExtension compares double extensions like .tar.gz, which does not
match the filters.
 2016-07-01 22:55:15 +09:00
Cheng Zhao
bb92765ecf spec: Suppress the session.protocol test 2016-07-01 22:24:30 +09:00
Cheng Zhao
1da2a1c2ae app.setBadgeCount should return boolean 2016-07-01 22:20:05 +09:00
Samuel Attard
54f06b0ba9 Override the Notification API constructor to create silent notifications when the webContents is muted 2016-07-01 23:26:40 +12:00
Cheng Zhao
f8ec377123 docs: app.setBadgeCount 2016-07-01 17:44:09 +09:00
Cheng Zhao
cb00d3cfb3 mac: Implement app.setBadgeCount 2016-07-01 17:39:26 +09:00
Cheng Zhao
36a0a491c9 Merge pull request #6216 from electron/class-docs 
Add details to docs/styleguide.md
 2016-07-01 05:34:01 +00:00
Cheng Zhao
3965440952 conjunctions don't have to be capitalized 2016-07-01 14:33:22 +09:00
Cheng Zhao
1626c3bf0a Use * instead of - for lists 
`*` is used in most lists in our docs, let's keep consistency.
 2016-07-01 14:30:55 +09:00