Commit graph

9636 commits

Author SHA1 Message Date
Cheng Zhao
d959ccb47c Merge pull request #6201 from electron/did-fail-load
Do not emit did-fail-load for canceled requests
2016-06-23 11:55:39 +00:00
Cheng Zhao
ed6213e951 Do not emit did-fail-load for canceled requests 2016-06-23 20:32:19 +09:00
Cheng Zhao
a00c5e3363 Bump v1.2.5 2016-06-23 14:37:58 +09:00
Cheng Zhao
e70c622a70 Merge pull request #6190 from electron/default-label-and-accelerator
Add default label and accelerator for menu item roles
2016-06-23 05:34:10 +00:00
Cheng Zhao
19d8a366b3 Merge pull request #6180 from jhen0409/patch-4
Fix chrome.runtime.sendMessage
2016-06-23 04:58:30 +00:00
Cheng Zhao
6aef8f4fea Merge pull request #6197 from electron/fix-api-call-yosemite
mac: Avoid calling setTitleVisibility for OS X 10.9
2016-06-23 04:49:11 +00:00
Cheng Zhao
d313639bbb Merge pull request #6198 from electron/fix-session-protocol-test
Split the session.protocol test into multiple tests
2016-06-23 04:49:06 +00:00
Cheng Zhao
2893974c05 spec: Set mimeType for protocol's handler 2016-06-23 13:29:18 +09:00
Cheng Zhao
a04c0ce196 spec: Split the session.protocol test into multiple tests 2016-06-23 13:16:53 +09:00
Cheng Zhao
71ab69314c spec: Put protocol registration in beforeEach 2016-06-23 13:11:19 +09:00
Cheng Zhao
6cfd078d19 Merge pull request #6174 from electron/session-docs-cleanup
docs: Separate Cookies and WebRequest classes in session.md
2016-06-23 04:05:18 +00:00
Cheng Zhao
7f3a296050 mac: Avoid calling setTitleVisibility for OS X 10.9 2016-06-23 13:00:14 +09:00
Cheng Zhao
74a2b77359 Merge pull request #6195 from electron/eagerly-require-protocol
Eagerly require protocol
2016-06-23 03:31:26 +00:00
Cheng Zhao
75972abc84 Merge pull request #6192 from electron/native-image-api-names
Upper case initialisms in nativeImage API
2016-06-23 03:06:42 +00:00
Cheng Zhao
7fa4a7889b Update brightray for #6178 2016-06-23 12:05:10 +09:00
Kevin Sawicki
5a122b5ea0 Eagerly require protocol 2016-06-22 18:51:39 -07:00
Kevin Sawicki
c686997209 Ctrl -> Control for consistency 2016-06-22 16:56:45 -07:00
Jhen
233355ed09 Fix chrome.runtime.sendMessage
add a case of not provide extension-id: (message, responseCallback)
2016-06-23 07:40:15 +08:00
Cheng Zhao
293a1edc35 Merge pull request #6183 from joshaber/patch-1
Update external frameworks version
2016-06-22 23:33:30 +00:00
Kevin Sawicki
e9222583cb toPng/toJpeg -> toPNG/toJPEG 2016-06-22 15:47:42 -07:00
Kevin Sawicki
813e528350 Update expected accelerator 2016-06-22 15:41:45 -07:00
Kevin Sawicki
6165908ba7 Incorporate review feedback 2016-06-22 15:26:17 -07:00
Kevin Sawicki
be642612c0 Export app before requiring modules 2016-06-22 15:21:45 -07:00
Kevin Sawicki
4dbdcad05e Remove label/accelerators with role defaults 2016-06-22 14:37:16 -07:00
Kevin Sawicki
b7afe44a5c Add assert for role with app name in label 2016-06-22 14:22:15 -07:00
Kevin Sawicki
ece319a687 🎨 2016-06-22 14:14:32 -07:00
Kevin Sawicki
58c1d38c96 Remove lint errors 2016-06-22 14:13:12 -07:00
Kevin Sawicki
c98f419bc8 Doc role defaults 2016-06-22 14:10:44 -07:00
Kevin Sawicki
5096d7835f Add spec for default role label/accelerator 2016-06-22 14:07:46 -07:00
Kevin Sawicki
c6dc6a8905 Specify focused window to execute call 2016-06-22 14:02:31 -07:00
Kevin Sawicki
30e3a6ed83 Add app require 2016-06-22 13:59:49 -07:00
Kevin Sawicki
66f2fb2fe4 Add execute helper to roles file 2016-06-22 13:48:26 -07:00
Kevin Sawicki
653370974a 🎨 Sort roles alphabetically 2016-06-22 13:15:20 -07:00
Kevin Sawicki
c0562d16d5 Add more role defaults 2016-06-22 13:09:49 -07:00
Kevin Sawicki
888068b597 Add default help/window labels 2016-06-22 13:09:49 -07:00
Kevin Sawicki
566a407b36 Use default labels and accelerators 2016-06-22 13:09:49 -07:00
Kevin Sawicki
13a6d32ee9 Add default label/accelerator to role menu items 2016-06-22 13:09:48 -07:00
Kevin Sawicki
25b2724ab9 Add menu item role defaults 2016-06-22 13:09:48 -07:00
Kevin Sawicki
56b3478760 Merge pull request #6184 from electron/read-only-command-id
Make MenuItem.commandId read only
2016-06-22 13:09:16 -07:00
Kevin Sawicki
ad110fc806 Make commandId a read only property 2016-06-22 10:07:02 -07:00
Kevin Sawicki
90600ba653 Add failing spec for writeable command id 2016-06-22 10:06:54 -07:00
Josh Abernathy
bd74412501 Update external frameworks version
Bump to [1.1.0](https://github.com/electron/electron-frameworks/releases/tag/v1.1.0) which upgraded Squirrel.Mac.
2016-06-22 13:00:31 -04:00
Kevin Sawicki
c6db5f6baa Merge pull request #6182 from electron/format-menu-item
Reformat MenuItem class
2016-06-22 10:00:01 -07:00
Kevin Sawicki
50a62429e4 Add back event param 2016-06-22 09:35:11 -07:00
Kevin Sawicki
4e8d4dfda9 Move click variable near this.click 2016-06-22 09:21:46 -07:00
Kevin Sawicki
38e1abc599 🎨 Destructure requires 2016-06-22 09:21:46 -07:00
Kevin Sawicki
51b8c0292c Add spec for submenu type with no submenu 2016-06-22 09:21:46 -07:00
Kevin Sawicki
93cbe6539f Add spec for invalid menu item type 2016-06-22 09:21:46 -07:00
Kevin Sawicki
ca57f8a391 Remove CoffeeScript class wrapper 2016-06-22 09:21:46 -07:00
Cheng Zhao
7274c69bc6 Merge pull request #6175 from miniak/content-protection
Add BrowserWindow.prototype.setContentProtection(enable)
2016-06-22 11:25:49 +00:00