Commit Graph

13484 Commits

Author SHA1 Message Date
Wliu
74e830358d Save the state before the browser window is closed 2015-12-14 17:31:27 -05:00
Wliu
ed96ac7daf browserWindow.restart -> .reload 2015-12-12 21:35:14 -05:00
Wliu
d6fa46acce Update browser files to use require 'electron' 2015-12-12 13:22:22 -05:00
Wliu
678c390e2e Fix indentation 2015-12-10 22:52:06 -05:00
Cheng Zhao
2e5c7f8573 executeJavaScriptInDevTools is deprecated 2015-12-11 11:00:08 +08:00
Cheng Zhao
2150790596 Use the new style of remote 2015-12-11 10:21:46 +08:00
Cheng Zhao
c186d70bec Also use require('electron') in specs 2015-12-11 10:03:20 +08:00
Cheng Zhao
1f9cfc929c Update the API usages after merge 2015-12-11 09:50:18 +08:00
Cheng Zhao
f6e889aeb2 Merge branch 'master' into wl-electron-35 2015-12-11 09:32:32 +08:00
Cheng Zhao
1725b9bf54 Use require('electron') 2015-12-11 09:30:58 +08:00
Nathan Sobo
85c6139579 Don’t force DOM updates in LinesYardstick
Instead, determine the need for a DOM update in the component before
measuring with the lines yardstick, and break `updateSync` into two
explicit pre- and post-measurement phases.
2015-12-10 14:47:05 -07:00
Antonio Scandurra
769b7bcd89 Merge branch 'master' into as-deserialize-untitled-editors
# Conflicts:
#	package.json
2015-12-09 08:48:04 +01:00
Nathan Sobo
9bd22d35b4 Merge branch 'beta' 2015-12-08 14:13:37 -07:00
Max Brunsfeld
314a1234f4 Track which packages are in the process of activating
This fixes a race condition where a package's activation promise resolves asynchronously
after it has been deactivated, causing it to stay in the package manager's @activePackages
object.
2015-12-08 11:09:52 -08:00
Max Brunsfeld
05e10bfaeb Register config schemas from package.json in theme packages 2015-12-07 16:52:33 -08:00
Max Brunsfeld
ec759f1322 Clear out loaded packages in PackageManager.prototype.reset
This way, when the AtomEnvironment is reset, packages will have .load() called
on them again, so their config schemas will be registered again.
2015-12-07 16:49:57 -08:00
Nathan Sobo
4f9e1a8ca3 Increase stack trace size limit to 30 2015-12-07 14:25:11 -07:00
Max Brunsfeld
5825fb51b5 Merge pull request #9948 from dirk-thomas/order_config_cson
save config.cson in alphabetic order
2015-12-07 11:19:56 -08:00
Antonio Scandurra
a8a9581ef4 🎨 Use only id 2015-12-07 19:57:30 +01:00
Dirk Thomas
fbbcdbf518 order keys in config.cson alphabetically 2015-12-07 09:54:18 -08:00
Antonio Scandurra
08f48a8a9d 🔥 2015-12-07 15:20:20 +01:00
Antonio Scandurra
afd05f391f Don't prompt to save when a window close is requested
Fixes #942
2015-12-07 14:50:34 +01:00
Antonio Scandurra
f7a4ef4a84 Deserialize also untitled buffers 2015-12-07 14:47:23 +01:00
Antonio Scandurra
0896142ea2 Merge pull request #9831 from atom/as-user-keybindings-priority
Do not override user-defined keymaps when reloading packages
2015-12-04 21:34:20 +01:00
Kevin Sawicki
7f9da428b0 Merge pull request #9609 from DouweM/recent-documents
Add opened files and folders to recent documents menu
2015-12-04 09:18:17 -08:00
Antonio Scandurra
1c5c973823 Merge branch 'master' into as-user-keybindings-priority
# Conflicts:
#	spec/package-manager-spec.coffee
2015-12-04 16:18:56 +01:00
Kevin Sawicki
1fac3cb4e2 Merge pull request #9620 from DouweM/window-title
Use em-dash in window title and exclude app name on OS X
2015-12-03 16:23:43 -08:00
Max Brunsfeld
fe5b1b70e8 Fix paragraph motions in the presence of CRLF line endings 2015-12-03 12:07:15 -08:00
Max Brunsfeld
76b6ca5043 Make CRLF word-movement tests pass 2015-12-03 11:52:45 -08:00
Max Brunsfeld
71d2761c1a Merge pull request #9763 from dranzerashi/patch-1 2015-12-03 10:30:48 -08:00
Douwe Maan
2f78a274a1 Only add explicitly opened files/folders as recent documents 2015-12-01 11:07:10 +01:00
Douwe Maan
948aaa0652 Add opened files and folders to recent documents menu 2015-12-01 11:07:10 +01:00
Kevin Sawicki
838f6fb7b1 Merge pull request #9606 from DouweM/dock-menu
Add OS X dock menu with 'New Window' option
2015-11-30 17:15:32 -08:00
Kevin Sawicki
c5a8a81da7 Merge pull request #9802 from ssorallen/config-docs
Correct config.coffee doc references to `scope`
2015-11-30 17:06:51 -08:00
Max Brunsfeld
3827b19da4 Merge pull request #9687 from atom/mb-deprecate-load-time-package-code
Provide package.json fields so we can defer requiring packages' main modules
2015-11-30 15:53:37 -08:00
Nathan Sobo
f139992585 Avoid infinite recursion in Error.prepareStackTrace
Previously, prepareStackTraceWithStackAssignment could end up calling
itself when third-party code assigned Error.prepareStackTrace back
to its original value. Now, we short-circuit this process if the
rawStack property has already been assigned.

Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>
2015-11-30 10:51:21 -08:00
Max Brunsfeld
d058814957 Merge remote-tracking branch 'origin/master' into mb-deprecate-load-time-package-code
Conflicts:
	package.json
2015-11-30 10:20:31 -08:00
Wliu
8e6c8b02bb Switch back to ipc-main in atom-portable.coffee 2015-11-27 13:20:22 -05:00
Antonio Scandurra
5dfd765bcf Do not override user-defined keymaps when reloading packages 2015-11-26 10:39:47 +01:00
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
Ross Allen
aac52b7020 Correct config.coffee doc references to scope
The scope selector is referred to with the key `scope` on the options
object, not `scopeDescriptor` as the current docs claim. Reference
`scope` correctly.

Mark `options` as optional for `::observe` because the arguments
collection is checked for length, and a length of 2 assumes the second
argument is `callback`. `options` is actually optional.
2015-11-25 09:44:20 -08:00
Max Brunsfeld
aecc2598f9 Restore private activateConfig method to fix settings-view 2015-11-24 15:14:39 -08: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
f35dddee2f Reregister config schema when package is reactivated
Signed-off-by: Nathan Sobo <nathan@github.com>
2015-11-23 18:01:26 -08:00