Commit Graph

13421 Commits

Author SHA1 Message Date
Wliu
71574d785c Merge remote-tracking branch 'master' into wl-electron-35
# Conflicts:
#	package.json
#	src/application-delegate.coffee
2015-11-25 18:44:40 -05:00
Nathan Sobo
8978691831 Merge pull request #9773 from atom/mb-ns-prepare-stack-trace-fixes
Allow Error.prepareStackTrace to be temporarily reassigned
2015-11-24 11:59:53 -07:00
Antonio Scandurra
8dbb9cfd55 Use CommandRegistry to listen for native-key-bindings 2015-11-24 16:24:51 +01:00
Antonio Scandurra
7bd62790d2 📝 2015-11-24 14:02:34 +01:00
Antonio Scandurra
b3738cfc34 Interact with DevTools on process.nextTick
Using any of the DevTools synchronous methods causes the bad character input
issue.
2015-11-24 12:51:13 +01:00
Antonio Scandurra
6b5ef9a0aa 🔥 2015-11-24 12:45:15 +01:00
Antonio Scandurra
9e931b15c3 Switch to a Promise-based version of DevTools interaction 2015-11-24 12:21:16 +01:00
Antonio Scandurra
9655d8184e Interact with DevTools asynchronously 2015-11-24 11:43:09 +01:00
Max Brunsfeld
4bc46db355 Still assign error's raw stack when prepareStackTrace is overridden
Signed-off-by: Nathan Sobo <nathan@github.com>
2015-11-23 15:30:11 -08:00
Max Brunsfeld
4616b426b0 Allow Error.prepareStackTrace to be temporarily reassigned
Fixes https://github.com/atom/atom/issues/9660

Signed-off-by: Nathan Sobo <nathan@github.com>
2015-11-23 15:22:15 -08:00
Chen Shen
d17ab332ec fix bug in getRawStack 2015-11-23 14:29:17 -08:00
Max Brunsfeld
30b3cb249e Merge pull request #9636 from DouweM/unique-title
Use unique text editor title in window and tab titles
2015-11-20 16:55:38 -08:00
Nathan Sobo
3e22d9f7a2 Merge PR #9607 with a small change 2015-11-20 10:41:22 -07:00
Antonio Scandurra
a546005c65 Merge pull request #9709 from atom/as-fix-longest-screen-row-issue
Compute content width when the longest row is the first one
2015-11-20 09:24:33 -08:00
Douwe Maan
a7809d6772 Add 'Close Empty Windows' option.' 2015-11-20 16:40:55 +01:00
Antonio Scandurra
93481c8a0d Move ::isTextEditor down into Workspace 2015-11-19 17:56:53 -08:00
Wliu
dfe27ff989 More deprecations 2015-11-19 20:49:05 -05:00
Wliu
577b85e76c Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35 2015-11-19 20:20:24 -05:00
Wliu
9a850f9cb2 This is ridiculous 2015-11-19 20:11:26 -05:00
Wliu
c85cd80544 Fix missing parentheses 2015-11-19 19:49:29 -05:00
Antonio Scandurra
0218431c62 🐛 Compute content width when the longest row is the first one 2015-11-19 16:38:20 -08:00
Wliu
50a42af9fd ...try this? 2015-11-19 18:20:51 -05:00
Wliu
f6328fb511 One more ipc fix 2015-11-19 16:37:11 -05:00
Nathan Sobo
a126374a7b Coerce boolean options to booleans
Pairing with @as-cii
2015-11-19 08:14:24 -08:00
Nathan Sobo
e572763cf7 Remove unnecessary fat arrow 2015-11-18 22:21:27 -08:00
Nathan Sobo
b04c26ba30 Discard highlights that end above the visible row range
Fixes #9628
2015-11-18 21:32:05 -08:00
Wliu
5fca7b6582 More ipc-renderer fixes 2015-11-18 21:20:45 -05:00
Wliu
fec1507ff4 Require ipc-renderer where it belongs 2015-11-18 21:10:40 -05:00
Wliu
d2a86e2466 Add 'home' argument to app.getPath() 2015-11-18 18:46:38 -05:00
Wliu
0945383d78 Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35 2015-11-18 16:11:49 -05:00
Max Brunsfeld
799a792f7f Remove public docs for DirectorySearch and DefaultDirectorySearcher 2015-11-18 13:05:27 -08:00
Thomas Johansen
a8147c09a2 🔥 Remove console.log shims 2015-11-18 17:46:20 +01:00
Wliu
6c811433cf Fix executeJavaScriptInDevTools
The joy of Atom and Electron having identically-named functions
2015-11-17 23:11:55 -05:00
Wliu
6cd480b37e Fix Electron deprecations 2015-11-17 21:16:09 -05:00
Nathan Sobo
9537007a2a Merge branch 'beta' 2015-11-17 16:57:33 -08:00
Nathan Sobo
e475065b45 Merge branch 'stable' into beta 2015-11-17 16:57:19 -08:00
Nathan Sobo
668aa0532e Merge pull request #9665 from atom/ns-fix-remove-event-listeners
Fix removeListener calls
2015-11-17 16:46:25 -08:00
Nathan Sobo
6e72ebb886 Load packages before deserializing workspace
This ensures that package-defined deserializers work.
2015-11-17 16:28:53 -08:00
Nathan Sobo
3b2c6afdaf Fix removeListener calls 2015-11-17 16:23:38 -08:00
Douwe Maan
4bc4c6888f Use unique text editor title in window and tab titles 2015-11-17 23:34:41 +01:00
Douwe Maan
a9bf2a73a5 Improve TextEditor::getLongTitle 2015-11-17 23:34:31 +01:00
Nathan Sobo
8da44c4dfc Discard highlights that end above the visible row range
Fixes #9628
2015-11-17 11:45:51 -08:00
Nathan Sobo
6862610e70 Merge branch 'beta' 2015-11-17 08:53:27 -08:00
Nathan Sobo
af22a149bd Replace getLongTitle with getUniqueTitle 2015-11-16 13:47:23 -08:00
Douwe Maan
f93565708b Close empty active window when Close command is given 2015-11-16 17:54:06 +01:00
abe33
2696f49385 🐛 Fix typo in project deserializer method
Addresses #9598
2015-11-16 10:06:35 +01:00
Antonio Scandurra
1a8e2c6f8d 🎨 2015-11-13 16:23:32 -07:00
Antonio Scandurra
62de930b03 Set initialLoadComplete to true only in test mode 2015-11-13 16:23:24 -07:00
Antonio Scandurra
7c6fcea441 Set initialLoadComplete to true only in test mode 2015-11-13 16:00:54 -07:00
Antonio Scandurra
967fca7214 🎨 2015-11-13 18:51:06 +01:00