Cheng Zhao
04872bb001
spec: Fix the failing coffee-script test
...
The latest version has some regression causing our test to fail.
2017-11-30 21:10:22 +09:00
Cheng Zhao
d09e8cc37f
Merge pull request #11108 from oktapodia/feature/add-ansi-color-into-menu-title
...
Feature/add ansi color into menu title
2017-11-29 18:37:52 +09:00
Cheng Zhao
0dc094fffc
Do not change logic on highlighing
2017-11-28 17:37:58 +09:00
Cheng Zhao
d1ebce0395
Remove unused methods
2017-11-28 17:31:13 +09:00
Cheng Zhao
590578c187
Cache the attributed string
2017-11-28 17:26:09 +09:00
Cheng Zhao
eab3342065
Fix the detection of ANSI code
2017-11-28 16:36:07 +09:00
Cheng Zhao
c9acccaddc
Fix memory leak in ANSCI parsing code
...
We do not have ARC enabled.
2017-11-28 16:36:07 +09:00
Cheng Zhao
4ded79801f
Remove unused code in NSColor+Hex.h
2017-11-28 16:10:24 +09:00
Cheng Zhao
08f30e4ca6
Add license for the vendored files
...
Checked the original files and they were compatible with MIT.
2017-11-28 15:38:42 +09:00
Cheng Zhao
edede7f33f
Fix cpplint warning
2017-11-28 15:36:45 +09:00
Sebastien Bramille
a4905b3c95
Lint
2017-11-28 15:34:13 +09:00
Sebastien Bramille
e8b0897ea1
Fix margin
2017-11-28 15:34:13 +09:00
Sebastien Bramille
71cfb7441c
Update header file
2017-11-28 15:34:13 +09:00
Sebastien Bramille
7a8431086c
Update doc
2017-11-28 15:34:13 +09:00
Sebastien Bramille
9f89bd8d8e
Add isHighlighted method
2017-11-28 15:34:13 +09:00
Sebastien Bramille
6a1cfafbd8
Clean
2017-11-28 15:34:13 +09:00
Sebastien Bramille
85f254316c
Add logic
2017-11-28 15:34:13 +09:00
Sebastien Bramille
d722d20974
Use NSString+ANSI on the Menu title
2017-11-28 15:34:13 +09:00
Sebastien Bramille
1d807c552e
Add NSString+ANSI class
2017-11-28 15:34:13 +09:00
Cheng Zhao
124667c29b
Merge pull request #11227 from emmkimme/Fix_10470_sandbox_preload
...
🐞 #10470 - prevent from loading preload in each iframe context
2017-11-28 15:25:34 +09:00
Cheng Zhao
b161a4f515
Merge pull request #11166 from sethlu/openrecent
...
feat: Recent documents menu item
2017-11-28 10:55:14 +09:00
Charles Kerr
2ad425955b
Merge pull request #11249 from electron/upgrading-chromium-tweaks
...
Apply some of my summit notes to the upgrading-chrome docs.
2017-11-28 00:55:12 +01:00
Charles Kerr
18dc63ce77
fix conflicts
2017-11-27 16:40:10 -06:00
Charles Kerr
e24cd329d9
Merge pull request #11268 from electron/fix_crash
...
Don't access unique pointer after it was moved from
2017-11-27 19:20:44 +01:00
Ales Pergl
f8b683ca3d
Don't access unique pointer after it was moved from
2017-11-27 17:55:21 +01:00
Charles Kerr
defa42b458
Merge pull request #11257 from electron/fix-11242
...
Remove "async" flag from the `menu.popup()` options
2017-11-27 16:41:56 +01:00
Cheng Zhao
141c4e9a0e
Merge pull request #11241 from electron/update-to-the-latest-libcc
...
Use latest libcc with Chromium 61
2017-11-27 17:49:05 +09:00
Zhuo Lu
104d307a4a
Use base::scoped_nsobject
2017-11-27 17:26:23 +09:00
Zhuo Lu
8fa3e71ce4
Format code
2017-11-27 17:26:22 +09:00
Zhuo Lu
2f73f4f77e
Fix typo
2017-11-27 17:26:22 +09:00
Zhuo Lu
4934685f53
Declare with static
2017-11-27 17:26:22 +09:00
Zhuo Lu
0c4e425872
Do not autorelease global variables
2017-11-27 17:26:22 +09:00
Zhuo Lu
2de7b338ad
Update API docs
2017-11-27 17:26:22 +09:00
Zhuo Lu
dcdc3621ac
Rename roles
2017-11-27 17:26:22 +09:00
Zhuo Lu
1ab4504e94
No need to make visible
2017-11-27 17:26:22 +09:00
Zhuo Lu
cf73fb737f
Small optimization
2017-11-27 17:26:22 +09:00
Zhuo Lu
3e6e327711
Remove redundant menu item
...
Already addressed with role: clearrecent
2017-11-27 17:26:22 +09:00
Zhuo Lu
5d44dbaf54
Redesign recent documents role API
...
- For more flexibility in designing the recent documents menu, now there can be one menu item (known issue: you may specify more but AppKit doens't display more than one) in the submenu list, rather than separating the labels with a tab.
- Also added is the role `clearrecent` that can be given to a menu item that can clear the recent documents.
2017-11-27 17:26:22 +09:00
Zhuo Lu
828d233f2a
Rollback duplicated feature
2017-11-27 17:26:22 +09:00
Zhuo Lu
0b9cea334f
Specify "Clear Menu" through label option
...
Like a bit of a hack right now, conforming to the existing menu item definition
2017-11-27 17:26:22 +09:00
Zhuo Lu
970babbfd7
Document openrecent menu item
2017-11-27 17:26:22 +09:00
Zhuo Lu
8b720c120d
Hide "Open Recent" in xib
2017-11-27 17:26:22 +09:00
Zhuo Lu
4da2eb9366
Introduce openrecent role
...
- Does not yet accept any options except label--"Clear Menu" can't be modified through exposed node API
- If `openrecent` is present across multiple menu items, the last seen will be visible in the main menu due to that it is designed to behave like a singleton
2017-11-27 17:26:22 +09:00
Zhuo Lu
0ba2fa5cba
Use else if
2017-11-27 17:26:22 +09:00
Zhuo Lu
f0bff74995
Add "Open Recent" submenu to default
2017-11-27 17:26:22 +09:00
Cheng Zhao
c0e9dbcc00
Merge pull request #11144 from dittos/mas-login-helper-again
...
Re-land MAS login helper (w/ regression fix)
2017-11-27 17:02:57 +09:00
Cheng Zhao
1c0ea0286e
Merge pull request #11235 from electron/standard-10
...
infra: Upgrade to StandardJS 10
2017-11-27 15:42:52 +09:00
Charles Kerr
295945b806
copyediting
2017-11-26 08:44:37 +01:00
Charles Kerr
81bc0efc75
fix styleguide errors
2017-11-26 08:38:58 +01:00
Charles Kerr
a75a85449d
sync with master
2017-11-26 08:28:27 +01:00
