github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,705 Commits 140 Branches 571 Tags
e437673fbcca6e0d1f83a441443b5926631e5eeb
Commit Graph

7400 Commits

Author SHA1 Message Date
Nathan Sobo
fe2def8321 Merge remote-tracking branch 'origin/master' into ns-empty-panes 2014-01-16 11:16:00 -07:00
probablycorey
23d9f6e41f Use actual indentation length when setting indentation for row. 
Closes #1293
 2014-01-16 09:27:26 -08:00
Nathan Sobo
649f0ac246 Merge branch 'master' into ns-empty-panes 
Conflicts:
	package.json
 2014-01-16 10:21:59 -07:00
Cheng Zhao
b7ae12f86f Merge branch 'master' into chrome31 
Conflicts:
	package.json
 2014-01-16 23:42:22 +08:00
Kevin Sawicki
1006706cf6 Consistently order less cache import paths 2014-01-15 17:42:17 -08:00
Cheng Zhao
fcffcc83f9 Merge branch 'master' into chrome31 
Conflicts:
	package.json
	vendor/apm
 2014-01-16 09:11:34 +08:00
probablycorey
b620be7780 Fix cut, copy and paste key bindings 
Closes #1425
 2014-01-15 16:00:09 -08:00
Nathan Sobo
ccd86d91de Make PaneContainer::activePaneItem behavior distinct until changed 
If we switch from one empty active pane to another empty active pane,
there's no reason to emit a value from the activePaneItem behavior.
 2014-01-15 16:08:36 -07:00
Nathan Sobo
5e14d44d6a Destroy all pane models when workspace view is removed 2014-01-15 16:07:47 -07:00
Nathan Sobo
41dd4a386a Restore PaneView::getContainer. Turns out it's actually public. 2014-01-15 16:07:47 -07:00
Nathan Sobo
9af4b14716 Never allow PaneContainer::root to be null 2014-01-15 16:07:47 -07:00
Nathan Sobo
aed9f18457 Accivate the first added pane item 2014-01-15 16:07:47 -07:00
Nathan Sobo
edf2fbe0e5 Make 'core:close' destroy the pane itself if it is empty 2014-01-15 16:07:47 -07:00
Nathan Sobo
ca71bf224b Destroy the pane completely on 'pane:close' (not just its items) 2014-01-15 16:07:47 -07:00
Nathan Sobo
012363a785 Null guard item in ::destroyActiveItem 2014-01-15 16:07:47 -07:00
Nathan Sobo
1a48903f96 Only destroy empty panes on deserialization if config option is enabled 2014-01-15 16:07:47 -07:00
Nathan Sobo
44331d0ba6 Fix issues splitting panes with DOM events 
* ::copyActiveItem guards against not having an active item
* The Pane constructor removes undefined items from params.items
 2014-01-15 16:07:47 -07:00
Nathan Sobo
fe7c5b4bc1 Only destroy an empty panes if 'core.destroyEmptyPanes' is true 2014-01-15 16:07:47 -07:00
Nathan Sobo
1825af1309 Merge pull request #1415 from atom/ns-pane-model-specs 
Move relevant pane specs from PaneView to Pane model
 2014-01-15 15:06:43 -08:00
Nathan Sobo
b5947f5a56 Merge branch 'master' into ns-pane-model-specs 2014-01-15 15:54:49 -07:00
probablycorey
ac07cf3d9a Merge remote-tracking branch 'origin/master' into cj-remove-editor-view-delegate-methods 
Conflicts:
	package.json
 2014-01-15 13:52:42 -08:00
Nathan Sobo
d57e5f389d Don't null out the model of a pane item view when removing it 
Fixes #1422 (I think)
 2014-01-15 14:20:30 -07:00
Cheng Zhao
2023aeef97 Use screen module to get screen's available size. 
In Chrome31 the window.screen.availHeight and availWidth are sometimes
0, this is a workaround of this bug.
 2014-01-15 12:49:22 +08:00
Nathan Sobo
dd0ae8a8ea Don't remove PaneViews when their model is destroyed 
They will be removed by their parent PaneContainerView or PaneAxisView,
and removing them in the previous way circumvented some of our focus
preservation logic.
 2014-01-14 20:09:14 -07:00
Nathan Sobo
c0c2d797b1 Add some API documentation 2014-01-14 14:44:27 -07:00
Nathan Sobo
c350285044 Move Workspace and PaneContainer serialization to the model layer 
The views are now stateless. You just construct them with a model to
deserialize.
 2014-01-14 11:38:27 -07:00
Nathan Sobo
4a7b43f609 Write focusNext/PreviousPane in terms of activateNext/PreviousPane 
"Activate" is the model level equivalent of focus.
 2014-01-14 11:15:14 -07:00
Nathan Sobo
0d66c68fe8 Add delegator to model for PaneContainerView::saveAll 2014-01-14 11:12:08 -07:00
Nathan Sobo
a1d540d288 Revert WorkspaceView::getActivePane. It needs to return a PaneView. 2014-01-14 11:02:36 -07:00
Nathan Sobo
af4034ba39 Move WorkspaceView::destroyActivePaneItem to the model 2014-01-14 10:58:35 -07:00
Nathan Sobo
89cbd6b834 Move PaneContainerView::saveAll to the model 2014-01-14 10:58:35 -07:00
Nathan Sobo
fe01ded75b Move WorkspaceView::saveActivePaneItem* to Workspace model 2014-01-14 10:58:35 -07:00
Nathan Sobo
aab4f3b761 Remove methods that I'm pretty sure are unused 2014-01-14 10:58:35 -07:00
Nathan Sobo
adf5cfc78c Move WorkspaceView::reopenItemSync to the Workspace model 2014-01-14 10:58:34 -07:00
Nathan Sobo
66bb9dab93 Move WorkspaceView::openSingletonSync to the Workspace model 2014-01-14 10:58:34 -07:00
Nathan Sobo
c8e4535e8b Move WorkspaceView::openSync to the Workspace model 2014-01-14 10:58:34 -07:00
Nathan Sobo
7199cda549 Derive PaneView::activeView from the model's activeItem 
We're getting into some strange order-sensitive cases where we respond
to a change of the active item before the pane has a chance to reassign
the active view. Therefore it makes more sense to always just derive the
active view from the active item.
 2014-01-14 10:58:34 -07:00
Nathan Sobo
1eb9c3d0d5 Move WorkspaceView::open to Workspace model 2014-01-14 10:58:34 -07:00
Nathan Sobo
27c03ae3f3 Move management of destroyedItemUris to Workspace model 2014-01-14 10:58:34 -07:00
Nathan Sobo
a8ddc530a2 Emit a pane-item-destroyed event from the workspace model 
…Instead of calling itemDestroyed on the workspace view via a DOM query
 2014-01-14 10:58:34 -07:00
Nathan Sobo
8e78583521 Emit 'item-destroyed' in ::removeItem when destroying flag is true 2014-01-14 10:58:34 -07:00
Nathan Sobo
7317d52896 Move paneForUri to PaneContainer model 2014-01-14 10:58:34 -07:00
Nathan Sobo
54dd5ea28e Destroy the model when PaneContainerView is removed 2014-01-14 10:58:34 -07:00
Nathan Sobo
22fe04fb27 Drop out a basic workspace model 2014-01-14 10:58:33 -07:00
Nathan Sobo
adb174ef5f Remove pane-model, which should have been removed during rename 
Missed this somehow.
 2014-01-14 10:57:50 -07:00
Nathan Sobo
159adcb00c Bump serialization version on WorkspaceView 
Since we've replaced views with models, the 'PaneContainer' deserializer
now loads a model instead of a view, which isn't what we want at this
layer.
 2014-01-13 16:57:17 -07:00
Kevin Sawicki
06ccb48efe Remove trailing } 2014-01-13 15:40:33 -08:00
probablycorey
95f2d02d18 Merge branch 'master' into cj-remove-editor-view-delegate-methods 
Conflicts:
	package.json
	spec/workspace-view-spec.coffee
	src/editor.coffee
	src/gutter.coffee
 2014-01-13 15:06:18 -08:00
Kevin Sawicki
63df8dfcdb Merge remote-tracking branch 'origin/master' into chrome31 
Conflicts:
	package.json
 2014-01-13 15:01:52 -08:00
Nathan Sobo
08716fd888 Merge pull request #1410 from atom/ns-rename-pane-views 
Add -View suffix to pane views and remove -Model suffix from pane models
 2014-01-13 13:39:13 -08:00