Commit graph

8002 commits

Author SHA1 Message Date
Cheng Zhao
8c3ff97ba4 Make the logic of ParseHexColor more easy to understand
This also fixes the #FFFF style of color hex.
2016-04-03 10:42:49 +09:00
Cheng Zhao
8bc95fe279 Merge pull request #4993 from atom/background-color
Use BrowserWindow's backgroundColor as renderer view's background color
2016-04-03 09:39:10 +09:00
Cheng Zhao
19a172f2f5 Remove the hacks because of transparent background 2016-04-02 21:21:30 +09:00
Cheng Zhao
1980d85f3e Fix converting SkColor to NSColor
Close #4992.
2016-04-02 21:18:15 +09:00
Cheng Zhao
cb470cb94b Use BrowserWindow's backgroundColor as renderer view's background color 2016-04-02 20:46:50 +09:00
Cheng Zhao
70ca49e36a Merge pull request #4989 from atom/document-option-vs-alt
use alt, not option
2016-04-02 19:19:09 +09:00
Cheng Zhao
7bfe80f835 Merge pull request #4897 from atom/node-integration-inheritance
Disable node on child window when disabled on parent
2016-04-02 19:14:58 +09:00
Kevin Sawicki
527ff66115 Pull app/session from remote 2016-04-01 16:59:13 -07:00
Kevin Sawicki
3695e38719 Remove duplicate require 2016-04-01 16:53:44 -07:00
Kevin Sawicki
7734f6af62 Remove semicolons 2016-04-01 16:52:55 -07:00
Kevin Sawicki
909ed54bef Remove stray log 2016-04-01 16:52:28 -07:00
Kevin Sawicki
230ed78dd6 Remove lint warnings 2016-04-01 16:51:17 -07:00
Kevin Sawicki
ef2a28ca86 Listen for browser-window-created event for asserts 2016-04-01 16:50:20 -07:00
Kevin Sawicki
55b12c184b Doc node integration inheritance 2016-04-01 16:48:21 -07:00
Kevin Sawicki
eafe9c245b Disable guest node integration when embedder has it disabled 2016-04-01 16:48:21 -07:00
Kevin Sawicki
fd12e1f506 Add failing spec for webview nodeIntegration inheritance 2016-04-01 16:47:17 -07:00
Kevin Sawicki
4890734f66 Add missing title param 2016-04-01 16:42:53 -07:00
Kevin Sawicki
e5164d2255 Check of nodeIntegration is strictly equal to false 2016-04-01 16:42:21 -07:00
Kevin Sawicki
dbe1c1d4e4 Check nodeIntegration on embedder's webPreferences 2016-04-01 16:40:50 -07:00
Kevin Sawicki
9e66df23d0 Add clearer assertion of process being undefined 2016-04-01 16:40:33 -07:00
Kevin Sawicki
d7b1792503 Use template strings 2016-04-01 16:39:31 -07:00
Kevin Sawicki
2713580d09 Remove stray log 2016-04-01 16:39:31 -07:00
Kevin Sawicki
463e077c3a Disable node on child when disabled on parent 2016-04-01 16:39:18 -07:00
Kevin Sawicki
777704e659 Add failing spec for nodeIntegration inheritance 2016-04-01 16:39:06 -07:00
Kevin Sawicki
afdad927b7 Merge pull request #4976 from atom/electron-resources
Rename atom to electron in bundled resources
2016-04-01 16:26:05 -07:00
Kevin Sawicki
3c96d7b726 Rename atom.asar to electron.asar in specs 2016-04-01 16:12:57 -07:00
Kevin Sawicki
ee9128268e Rename atom.icns to electron.icns 2016-04-01 16:12:12 -07:00
Kevin Sawicki
ce95747a25 atom.asar -> electron.asar 2016-04-01 16:12:12 -07:00
Kevin Sawicki
c036986cc4 atom.gyp -> electron.gyp 2016-04-01 16:11:40 -07:00
Kevin Sawicki
ef08138a8d Merge pull request #4969 from atom/null-dialog-callback
Add dialog callback fallback
2016-04-01 16:11:09 -07:00
Zeke Sikelianos
2853356b10 use alt, not option 2016-04-01 15:48:12 -07:00
Kevin Sawicki
400efa1b7d Fallback to using the last argument as the callback 2016-04-01 12:54:06 -07:00
Kevin Sawicki
b2ad0a05d7 Merge pull request #4956 from atom/default-app-asar
Store default_app in .asar archive
2016-04-01 12:52:51 -07:00
Kevin Sawicki
5221154653 Remove logging 2016-04-01 12:40:32 -07:00
Kevin Sawicki
464dad3135 Store default_app in .asar archive 2016-04-01 12:40:32 -07:00
Cheng Zhao
4b9b630e80 Merge pull request #4982 from atom/fix-windows
Fix various problems on Windows build
2016-04-01 16:57:27 +09:00
Cheng Zhao
b35f4c1805 spec: Fix failing test due to path delimiter 2016-04-01 16:42:44 +09:00
Cheng Zhao
247b3f3605 Fix the background color in test app 2016-04-01 16:35:19 +09:00
Cheng Zhao
576b54320a Fix compilation errors on Windows 2016-04-01 16:34:20 +09:00
Cheng Zhao
6f7a98d7c9 Merge pull request #4981 from atom/member-object-reference
Remote object should be referenced by its members
2016-04-01 16:11:21 +09:00
Cheng Zhao
39d2b95a33 Reference the remote object in its prototype chain's methods 2016-04-01 15:46:01 +09:00
Cheng Zhao
b9ead472a5 spec: Remote object should be referenced by methods in its prototype chain 2016-04-01 15:35:34 +09:00
Cheng Zhao
4ebb01f8c9 Remote object's members should reference itself 2016-04-01 15:26:30 +09:00
Cheng Zhao
f36851fcff spec: Remote object should be referenced by its members 2016-04-01 15:05:05 +09:00
Cheng Zhao
0416e65b8b Merge pull request #4917 from deepak1556/new_window_disposition_patch
browser: fix disposition value for new-window event
2016-04-01 13:52:29 +09:00
deepak1556
e14c91771b removed redundant delegation 2016-04-01 08:14:29 +05:30
deepak1556
7e366dd5c8 Update libchromiumcontent 2016-04-01 08:14:29 +05:30
deepak1556
e0fe478ae7 decide early on render initiated window creations 2016-04-01 08:14:29 +05:30
Robo
7016fbe258 browser: fix disposition value for new-window event 2016-04-01 08:14:29 +05:30
Cheng Zhao
7353fb4296 Merge pull request #4955 from atom/remove-node-integration-disable-path
Remove path for nodeIntegration value of 'disable'
2016-04-01 11:14:30 +09:00