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
24f386df2d
Wait 30 seconds for move events
2014-01-15 17:54:06 -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
Kevin Sawicki
fd1477fc92
Only depend on jasmine-tagged
...
jasmine-tagged now depends on jasmine-focused and everything needed
should be reachable from just a dependency on jasmine-tagged.
2014-01-15 15:48:19 -08: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
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
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
1c6564f7a5
Move non-focus serialization specs from pane-view-spec to pane-spec
2014-01-14 21:39:47 -07:00
Nathan Sobo
d9d28b5236
Move ::itemForUri specs from pane-view-spec to pane-spec
2014-01-14 20:39:13 -07:00
Nathan Sobo
8734eab8cb
💄 Give dummy pane items ::getUri and ::getPath methods
2014-01-14 20:38:07 -07:00
Nathan Sobo
1ad5158f19
Streamline active status and focus specs in pane-view-spec
...
The specs can be simplified now that much of this logic is covered in
the model specs.
2014-01-14 20:27:30 -07:00
Nathan Sobo
453e034a5f
Simplify PaneView split specs because it's largely covered at the model
2014-01-14 20:21:24 -07:00
Nathan Sobo
9841a3588f
Move specs on PaneView::remove to Pane::destroy in pane-spec
2014-01-14 20:10:01 -07:00
Nathan Sobo
d8ddd52df8
Move ::activateItemAtIndex specs from pane-view-spec to pane-spec
2014-01-14 19:49:15 -07:00
Nathan Sobo
83696bb9c7
Move ::activateNext/PreviousItem specs from pane-view-spec to pane-spec
2014-01-14 19:46:12 -07:00
Nathan Sobo
243c4efe20
Move ::saveActiveItemAs specs from pane-view-spec to pane-spec
2014-01-14 19:43:09 -07:00
Nathan Sobo
22c65f2407
Move ::saveActiveItem specs from pane-view-spec to pane-spec
2014-01-14 19:41:00 -07:00
Nathan Sobo
e553fefc25
Add spec for Pane::destroyInactiveItems to pane-spec
2014-01-14 19:32:39 -07:00
Nathan Sobo
cf6fc22c87
Add spec for Pane::destroyItems to pane-spec
2014-01-14 19:31:13 -07:00
Nathan Sobo
a6d8f588c3
💄
2014-01-14 19:29:01 -07:00
Nathan Sobo
2ef74de0f8
Move ::moveItemToPane specs from pane-view-spec to pane-spec
2014-01-14 19:26:47 -07:00
Nathan Sobo
2ee6469b17
Move ::moveItem specs from pane-view-spec to pane-spec
2014-01-14 19:15:11 -07:00
Nathan Sobo
9977884a2c
Move ::destroyItem specs from pane-view-spec to pane-spec
2014-01-14 19:12:27 -07:00
Nathan Sobo
c331723c55
Move ::activateItem specs from pane-view-spec to pane-spec
2014-01-14 19:12:26 -07:00
Nathan Sobo
e4b934d3fa
Remove 'workspace' from serialized state in spec helper
...
…Instead of 'workspaceView'.
2014-01-14 13:06:42 -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
6ef6fb77f9
Rename pane-*-model specs
2014-01-13 17:22:02 -07: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
97999f1080
Rename PaneContainerModel to PaneContainer
2014-01-13 13:56:31 -07:00
Nathan Sobo
a268b3e963
Rename PaneAxisModel to PaneAxis
2014-01-13 13:54:04 -07:00
Nathan Sobo
8931bf8f3a
Rename PaneModel to Pane
2014-01-13 13:51:15 -07:00
Nathan Sobo
918c31905f
Rename PaneContainer to PaneContainerView
2014-01-13 13:46:28 -07:00
Nathan Sobo
4f604ced3c
Rename Pane to PaneView
2014-01-13 13:46:22 -07:00
Cheng Zhao
efbd508163
Fix git specs when running under symbolic path.
2014-01-13 17:31:03 +08:00
Nathan Sobo
3fc3d48def
Destroy empty panes after deserializing
...
Fixes #1399
2014-01-12 17:53:25 -07:00
Nathan Sobo
b438b311f3
Rename showItem methods to activateItem
...
These methods set the *active* item, so the verb activate provides a
clearer correspondence. We could change the noun to "shown" item, but
that's awkward and having both active panes and active items is a nice
correspondence in terminology.
2014-01-12 17:40:57 -07:00
Nathan Sobo
561e31c0c5
Remove ::removeItemAtIndex and make ::removeItem private
...
Call ::destroyItem or just destroy the item directly (it should emit the
'destroyed' event)
2014-01-12 17:25:51 -07:00
Nathan Sobo
28b085be1c
Rename ::makeActive to ::activate and focus panes when they're activated
2014-01-11 20:48:01 -07:00
Nathan Sobo
72fe586101
Remove the concept of focus from the model
2014-01-10 17:27:28 -07:00
