mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2025-01-08 16:19:17 +03:00
Use ‘atom-pane-axis’ custom tag name for PaneAxisElement
This commit is contained in:
parent
ee9284e228
commit
ddf36a013c
@ -74,13 +74,13 @@ describe "PaneContainerView", ->
|
|||||||
describe "serialization", ->
|
describe "serialization", ->
|
||||||
it "can be serialized and deserialized, and correctly adjusts dimensions of deserialized panes after attach", ->
|
it "can be serialized and deserialized, and correctly adjusts dimensions of deserialized panes after attach", ->
|
||||||
newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
|
newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
|
||||||
expect(newContainer.find('.pane-row > :contains(1)')).toExist()
|
expect(newContainer.find('atom-pane-axis.horizontal > :contains(1)')).toExist()
|
||||||
expect(newContainer.find('.pane-row > .pane-column > :contains(2)')).toExist()
|
expect(newContainer.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > :contains(2)')).toExist()
|
||||||
expect(newContainer.find('.pane-row > .pane-column > :contains(3)')).toExist()
|
expect(newContainer.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > :contains(3)')).toExist()
|
||||||
|
|
||||||
newContainer.height(200).width(300).attachToDom()
|
newContainer.height(200).width(300).attachToDom()
|
||||||
expect(newContainer.find('.pane-row > :contains(1)').width()).toBe 150
|
expect(newContainer.find('atom-pane-axis.horizontal > :contains(1)').width()).toBe 150
|
||||||
expect(newContainer.find('.pane-row > .pane-column > :contains(2)').height()).toBe 100
|
expect(newContainer.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > :contains(2)').height()).toBe 100
|
||||||
|
|
||||||
describe "if there are empty panes after deserialization", ->
|
describe "if there are empty panes after deserialization", ->
|
||||||
beforeEach ->
|
beforeEach ->
|
||||||
@ -90,14 +90,14 @@ describe "PaneContainerView", ->
|
|||||||
describe "if the 'core.destroyEmptyPanes' config option is false (the default)", ->
|
describe "if the 'core.destroyEmptyPanes' config option is false (the default)", ->
|
||||||
it "leaves the empty panes intact", ->
|
it "leaves the empty panes intact", ->
|
||||||
newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
|
newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
|
||||||
expect(newContainer.find('.pane-row > :contains(1)')).toExist()
|
expect(newContainer.find('atom-pane-axis.horizontal > :contains(1)')).toExist()
|
||||||
expect(newContainer.find('.pane-row > .pane-column > atom-pane').length).toBe 2
|
expect(newContainer.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane').length).toBe 2
|
||||||
|
|
||||||
describe "if the 'core.destroyEmptyPanes' config option is true", ->
|
describe "if the 'core.destroyEmptyPanes' config option is true", ->
|
||||||
it "removes empty panes on deserialization", ->
|
it "removes empty panes on deserialization", ->
|
||||||
atom.config.set('core.destroyEmptyPanes', true)
|
atom.config.set('core.destroyEmptyPanes', true)
|
||||||
newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
|
newContainer = atom.workspace.getView(container.model.testSerialization()).__spacePenView
|
||||||
expect(newContainer.find('.pane-row, .pane-column')).not.toExist()
|
expect(newContainer.find('atom-pane-axis.horizontal, atom-pane-axis.vertical')).not.toExist()
|
||||||
expect(newContainer.find('> :contains(1)')).toExist()
|
expect(newContainer.find('> :contains(1)')).toExist()
|
||||||
|
|
||||||
describe "pane-container:active-pane-item-changed", ->
|
describe "pane-container:active-pane-item-changed", ->
|
||||||
|
@ -289,7 +289,7 @@ describe "PaneView", ->
|
|||||||
expect(paneModel.isActive()).toBe true
|
expect(paneModel.isActive()).toBe true
|
||||||
|
|
||||||
describe "when a pane is split", ->
|
describe "when a pane is split", ->
|
||||||
it "builds the appropriate pane-row and pane-column views", ->
|
it "builds the appropriateatom-pane-axis.horizontal and pane-column views", ->
|
||||||
pane1 = pane
|
pane1 = pane
|
||||||
pane1Model = pane.getModel()
|
pane1Model = pane.getModel()
|
||||||
pane.activateItem(editor1)
|
pane.activateItem(editor1)
|
||||||
@ -300,11 +300,11 @@ describe "PaneView", ->
|
|||||||
pane2 = containerModel.getView(pane2Model).__spacePenView
|
pane2 = containerModel.getView(pane2Model).__spacePenView
|
||||||
pane3 = containerModel.getView(pane3Model).__spacePenView
|
pane3 = containerModel.getView(pane3Model).__spacePenView
|
||||||
|
|
||||||
expect(container.find('> .pane-row > atom-pane').toArray()).toEqual [pane1[0]]
|
expect(container.find('> atom-pane-axis.horizontal > atom-pane').toArray()).toEqual [pane1[0]]
|
||||||
expect(container.find('> .pane-row > .pane-column > atom-pane').toArray()).toEqual [pane2[0], pane3[0]]
|
expect(container.find('> atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane').toArray()).toEqual [pane2[0], pane3[0]]
|
||||||
|
|
||||||
pane1Model.destroy()
|
pane1Model.destroy()
|
||||||
expect(container.find('> .pane-column > atom-pane').toArray()).toEqual [pane2[0], pane3[0]]
|
expect(container.find('> atom-pane-axis.vertical > atom-pane').toArray()).toEqual [pane2[0], pane3[0]]
|
||||||
|
|
||||||
describe "serialization", ->
|
describe "serialization", ->
|
||||||
it "focuses the pane after attach only if had focus when serialized", ->
|
it "focuses the pane after attach only if had focus when serialized", ->
|
||||||
|
@ -82,10 +82,10 @@ describe "WorkspaceView", ->
|
|||||||
simulateReload()
|
simulateReload()
|
||||||
|
|
||||||
expect(atom.workspaceView.getEditorViews().length).toBe 4
|
expect(atom.workspaceView.getEditorViews().length).toBe 4
|
||||||
editorView1 = atom.workspaceView.panes.find('.pane-row > atom-pane .editor:eq(0)').view()
|
editorView1 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane .editor:eq(0)').view()
|
||||||
editorView3 = atom.workspaceView.panes.find('.pane-row > atom-pane .editor:eq(1)').view()
|
editorView3 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane .editor:eq(1)').view()
|
||||||
editorView2 = atom.workspaceView.panes.find('.pane-row > .pane-column > atom-pane .editor:eq(0)').view()
|
editorView2 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane .editor:eq(0)').view()
|
||||||
editorView4 = atom.workspaceView.panes.find('.pane-row > .pane-column > atom-pane .editor:eq(1)').view()
|
editorView4 = atom.workspaceView.panes.find('atom-pane-axis.horizontal > atom-pane-axis.vertical > atom-pane .editor:eq(1)').view()
|
||||||
|
|
||||||
expect(editorView1.getEditor().getPath()).toBe atom.project.resolve('a')
|
expect(editorView1.getEditor().getPath()).toBe atom.project.resolve('a')
|
||||||
expect(editorView2.getEditor().getPath()).toBe atom.project.resolve('b')
|
expect(editorView2.getEditor().getPath()).toBe atom.project.resolve('b')
|
||||||
|
@ -17,9 +17,9 @@ class PaneAxisElement extends HTMLElement
|
|||||||
|
|
||||||
switch @model.getOrientation()
|
switch @model.getOrientation()
|
||||||
when 'horizontal'
|
when 'horizontal'
|
||||||
@classList.add('pane-row')
|
@classList.add('horizontal', 'pane-row')
|
||||||
when 'vertical'
|
when 'vertical'
|
||||||
@classList.add('pane-column')
|
@classList.add('vertical', 'pane-column')
|
||||||
|
|
||||||
childAdded: ({child, index}) ->
|
childAdded: ({child, index}) ->
|
||||||
view = @model.getView(child)
|
view = @model.getView(child)
|
||||||
@ -39,6 +39,4 @@ class PaneAxisElement extends HTMLElement
|
|||||||
hasFocus: ->
|
hasFocus: ->
|
||||||
this is document.activeElement or @contains(document.activeElement)
|
this is document.activeElement or @contains(document.activeElement)
|
||||||
|
|
||||||
module.exports = PaneAxisElement = document.registerElement 'atom-pane-axis',
|
module.exports = PaneAxisElement = document.registerElement 'atom-pane-axis', prototype: PaneAxisElement.prototype
|
||||||
prototype: PaneAxisElement.prototype
|
|
||||||
extends: 'div'
|
|
||||||
|
@ -7,13 +7,13 @@
|
|||||||
display: -webkit-flex;
|
display: -webkit-flex;
|
||||||
-webkit-flex: 1;
|
-webkit-flex: 1;
|
||||||
|
|
||||||
.pane-column {
|
atom-pane-axis.vertical {
|
||||||
display: -webkit-flex;
|
display: -webkit-flex;
|
||||||
-webkit-flex: 1;
|
-webkit-flex: 1;
|
||||||
-webkit-flex-direction: column;
|
-webkit-flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pane-row {
|
atom-pane-axis.horizontal {
|
||||||
display: -webkit-flex;
|
display: -webkit-flex;
|
||||||
-webkit-flex: 1;
|
-webkit-flex: 1;
|
||||||
-webkit-flex-direction: row;
|
-webkit-flex-direction: row;
|
||||||
|
@ -28,14 +28,14 @@ h6 {
|
|||||||
background-color: @app-background-color;
|
background-color: @app-background-color;
|
||||||
font-family: @font-family;
|
font-family: @font-family;
|
||||||
|
|
||||||
.horizontal {
|
> .horizontal {
|
||||||
display: -webkit-flex;
|
display: -webkit-flex;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
|
||||||
|
|
||||||
.vertical {
|
> .vertical {
|
||||||
display: -webkit-flex;
|
display: -webkit-flex;
|
||||||
-webkit-flex: 1;
|
-webkit-flex: 1;
|
||||||
-webkit-flex-flow: column;
|
-webkit-flex-flow: column;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user