-
Notifications
You must be signed in to change notification settings - Fork 286
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* <DraggableColumn> `</>, this, @, etc.` * <DragHandle> `</>, this, @, etc.` * Install element-modifiers * <ResizableColumn> `</>, this, @, etc.` * Move DraggableColumn components under Ui * Remove #setWidth from Ui::ResizableColumn This seems to be covering an edge case that no longer exists * <MainContent> `</>, this, @, etc.` * Remove {{x-app}} * Remove isDragging from application controller isDragging was used to keep the col-resize cursor active * Rename component MainContent to MonitorContentHeight
- Loading branch information
1 parent
7458d7b
commit 1044293
Showing
34 changed files
with
241 additions
and
248 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import Controller, { inject as controller } from '@ember/controller'; | ||
import Controller from '@ember/controller'; | ||
|
||
export default Controller.extend({ | ||
application: controller() | ||
navWidth: 180, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,84 +1,80 @@ | ||
<div class="ember-view"> | ||
{{#x-app | ||
active=this.active | ||
isDragging=this.isDragging | ||
}} | ||
{{#if isEmberApplication}} | ||
<div class="split"> | ||
<div class="split__panel"> | ||
{{!-- Begin main --}} | ||
<div class="split split--main"> | ||
{{#draggable-column | ||
width=this.navWidth | ||
classes="split__panel split__panel--sidebar-1" | ||
setIsDragging=(action "setIsDragging") | ||
}} | ||
<div class="split__panel__hd"> | ||
{{app-picker}} | ||
</div> | ||
<div class="split__panel__bd"> | ||
<SideNav @deprecationCount={{this.deprecationCount}} /> | ||
</div> | ||
<div class="split__panel__ft"> | ||
<a target="_blank" href="https://github.com/emberjs/ember-inspector/issues"> | ||
Submit an Issue | ||
</a> | ||
</div> | ||
{{/draggable-column}} | ||
|
||
<div class="split__panel"> | ||
<div class="split__panel__hd"> | ||
{{outlet "toolbar"}} | ||
<button | ||
class="sidebar-toggle toolbar__icon-button {{if this.inspectorExpanded "flip"}}" | ||
{{on "click" this.toggleInspector}} | ||
> | ||
{{svg-jar "sidebar-toggle" width="16" height="16"}} | ||
</button> | ||
</div> | ||
<div | ||
class="ember-view app {{if this.active "" "inactive"}}" | ||
tabindex="1" | ||
{{on "focusin" (fn this.setActive true)}} | ||
{{on "focusout" (fn this.setActive false)}} | ||
> | ||
{{#if this.isEmberApplication}} | ||
<div class="split"> | ||
<div class="split__panel"> | ||
<div class="split split--main"> | ||
<Ui::DraggableColumn | ||
@classes="split__panel split__panel--sidebar-1" | ||
@side="left" | ||
@width={{this.navWidth}} | ||
> | ||
<div class="split__panel__hd"> | ||
{{app-picker}} | ||
</div> | ||
<div class="split__panel__bd"> | ||
<SideNav @deprecationCount={{this.deprecationCount}} /> | ||
</div> | ||
<div class="split__panel__ft"> | ||
<a target="_blank" href="https://github.com/emberjs/ember-inspector/issues"> | ||
Submit an Issue | ||
</a> | ||
</div> | ||
</Ui::DraggableColumn> | ||
|
||
{{#main-content class="split__panel__bd"}} | ||
{{outlet}} | ||
{{/main-content}} | ||
<div class="split__panel"> | ||
<div class="split__panel__hd"> | ||
{{outlet "toolbar"}} | ||
<button | ||
class="sidebar-toggle toolbar__icon-button {{if this.inspectorExpanded "flip"}}" | ||
{{on "click" this.toggleInspector}} | ||
> | ||
{{svg-jar "sidebar-toggle" width="16" height="16"}} | ||
</button> | ||
</div> | ||
</div> | ||
|
||
{{!-- End main --}} | ||
<MonitorContentHeight class="split__panel__bd"> | ||
{{outlet}} | ||
</MonitorContentHeight> | ||
</div> | ||
</div> | ||
|
||
{{#if this.inspectorExpanded}} | ||
{{#draggable-column | ||
side="right" | ||
width=this.inspectorWidth | ||
classes="split__panel" | ||
setIsDragging=(action "setIsDragging") | ||
}} | ||
<ObjectInspector | ||
@popMixinDetails={{this.popMixinDetails}} | ||
@model={{this.mixinStack}} | ||
@mixinDetails={{this.mixinDetails}} | ||
/> | ||
{{/draggable-column}} | ||
{{/if}} | ||
</div> | ||
{{else}} | ||
<Ui::ErrorPage @description="Ember application not detected!"> | ||
<ul> | ||
<li>This is not an Ember application.</li> | ||
<li>You are using an old version of Ember (< rc5).</li> | ||
{{#if this.isChrome}} | ||
<li> | ||
You are using the file:// protocol (instead of http://), in which case: | ||
|
||
<ul> | ||
<li>Visit the URL: chrome://extensions.</li> | ||
<li>Find the Ember Inspector.</li> | ||
<li>Make sure "Allow access to file URLs" is checked.</li> | ||
</ul> | ||
</li> | ||
{{/if}} | ||
</ul> | ||
</Ui::ErrorPage> | ||
{{/if}} | ||
{{/x-app}} | ||
{{#if this.inspectorExpanded}} | ||
<Ui::DraggableColumn | ||
@classes="split__panel" | ||
@side="right" | ||
@width={{this.inspectorWidth}} | ||
> | ||
<ObjectInspector | ||
@popMixinDetails={{this.popMixinDetails}} | ||
@model={{this.mixinStack}} | ||
@mixinDetails={{this.mixinDetails}} | ||
/> | ||
</Ui::DraggableColumn> | ||
{{/if}} | ||
</div> | ||
{{else}} | ||
<Ui::ErrorPage @description="Ember application not detected!"> | ||
<ul> | ||
<li>This is not an Ember application.</li> | ||
<li>You are using an old version of Ember (< rc5).</li> | ||
{{#if this.isChrome}} | ||
<li> | ||
You are using the file:// protocol (instead of http://), in which case: | ||
|
||
<ul> | ||
<li>Visit the URL: chrome://extensions.</li> | ||
<li>Find the Ember Inspector.</li> | ||
<li>Make sure "Allow access to file URLs" is checked.</li> | ||
</ul> | ||
</li> | ||
{{/if}} | ||
</ul> | ||
</Ui::ErrorPage> | ||
{{/if}} | ||
</div> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.