Skip to content

Commit 153e973

Browse files
teddyzeennyteddyzeenny
committed
Merge pull request #543 from teddyzeenny/remove-list-view
Remove usage of list-view so we can upgrade Ember.
2 parents 5c08922 + 6532ebc commit 153e973

16 files changed

Lines changed: 177 additions & 152 deletions

‎app/controllers/container-type.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default ArrayController.extend({
1212

1313
search: null,
1414

15-
arrangedContent: filter('model', function(item) {
15+
filtered: filter('model', function(item) {
1616
return searchMatch(get(item, 'name'), this.get('search'));
1717
}).property('model.@each.name', 'search')
1818
});

‎app/mixins/fake-table.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const { on } = Ember;
88

99
function accountForScrollbar() {
1010
/*jshint validthis:true */
11-
let outside = this.$('.list-tree').innerWidth();
11+
let outside = this.$('.view-list').innerWidth();
1212
let inside = this.$('.ember-list-container').innerWidth();
1313
this.$('.spacer').width(outside - inside);
1414
}

‎app/styles/base.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ code {
3131
overflow: auto !important;
3232
overflow-y: scroll !important;
3333
position: relative;
34+
35+
-webkit-overflow-scrolling:touch;
36+
overflow-scrolling:touch;
3437
}
3538
.ember-list-item-view {
3639
position: absolute;

‎app/styles/fake_table.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
.row-wrapper {
6464
width: 100%;
6565
background: #f3f3f3;
66+
height: 30px;
6667
}
6768

6869
.row-wrapper:nth-of-type(2n) {

‎app/templates/container-type.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
</div>
88

99
<div class="list-view__list-container">
10-
{{view "instanceList" content=this}}
10+
{{view "instanceList" content=filtered}}
1111
</div>
1212
</div>

‎app/templates/instance-item.hbs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<div class="list-tree__item row" data-label="instance-row" {{action "inspectInstance" this}}>
2-
<div {{bind-attr class=":cell inspectable:cell_clickable"}} >
3-
{{name}}
1+
{{#with view.content as |content|}}
2+
<div class="list-tree__item row" data-label="instance-row" {{action "inspectInstance" content}}>
3+
<div class="cell {{if content.inspectable 'cell_clickable'}}">
4+
{{content.name}}
5+
</div>
46
</div>
5-
</div>
7+
{{/with}}

‎app/templates/list.hbs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="ember-list-container">
2+
{{#each view.content as |item|}}
3+
{{view view.itemViewClass content=item}}
4+
{{/each}}
5+
</div>

‎app/templates/promise-item.hbs‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
1-
<div {{bind-attr style="nodeStyle" class=":list-tree__item :row expandedClass"}} data-label="promise-item">
2-
<div class="cell_type_main cell" {{action "toggleExpand" model}} {{bind-attr style="labelStyle"}}>
3-
<div class="list-tree__limited list-tree__limited_helper_large">
4-
<span {{bind-attr title="label"}} data-label="promise-label">
5-
<span class="cell__arrow"></span>
6-
{{label}}
7-
</span>
1+
{{#with view.content as |content|}}
2+
<div style="{{content.nodeStyle}}" class="list-tree__item row {{content.expandedClass}}" data-label="promise-item">
3+
<div class="cell_type_main cell" style="{{content.labelStyle}}" {{action "toggleExpand" content.model}}>
4+
<div class="list-tree__limited list-tree__limited_helper_large">
5+
<span title="{{content.label}}" data-label="promise-label">
6+
<span class="cell__arrow"></span>
7+
{{content.label}}
8+
</span>
9+
</div>
10+
<div class="list-tree__right-helper">
11+
{{#if content.hasStack}}
12+
<div class="send-trace-to-console" {{action "tracePromise" content.model}} title="Trace promise in console" data-label="trace-promise-btn">
13+
Trace
14+
</div>
15+
{{/if}}
16+
</div>
817
</div>
9-
<div class="list-tree__right-helper">
10-
{{#if hasStack}}
11-
<div class="send-trace-to-console" {{action "tracePromise" model}} title="Trace promise in console" data-label="trace-promise-btn">
12-
Trace
13-
</div>
14-
{{/if}}
18+
<div class="cell cell_size_medium">
19+
<div class="pill pill_text_clear" style="{{content.style}}" data-label="promise-state">{{content.state}}</div>
1520
</div>
16-
</div>
17-
<div class="cell cell_size_medium">
18-
<div class="pill pill_text_clear" {{bind-attr style="style"}} data-label="promise-state">{{state}}</div>
19-
</div>
20-
<div class="cell cell_size_large" data-label="promise-value">
21-
{{#if hasValue}}
22-
<div class="list-tree__limited list-tree__limited_helper_very-large" {{bind-attr title="settledValue.inspect"}}>
23-
{{#if isValueInspectable}}
24-
25-
<span class="cell_clickable" {{action "inspectObject" settledValue.objectId}} data-label="promise-object-value">{{settledValue.inspect}}</span>
26-
{{else}}
27-
{{settledValue.inspect}}
28-
{{/if}}
29-
</div>
30-
<div class="list-tree__right-helper">
31-
{{#if isError}}
32-
<div class="send-trace-to-console" {{action "sendValueToConsole" model}} data-label="send-to-console-btn" title="Send stack trace to the console">
33-
Stack trace
21+
<div class="cell cell_size_large" data-label="promise-value">
22+
{{#if content.hasValue}}
23+
<div class="list-tree__limited list-tree__limited_helper_very-large" title="{{content.settledValue.inspect}}">
24+
{{#if content.isValueInspectable}}
25+
<span class="cell_clickable" {{action "inspectObject" content.settledValue.objectId}} data-label="promise-object-value">{{content.settledValue.inspect}}</span>
26+
{{else}}
27+
{{content.settledValue.inspect}}
28+
{{/if}}
3429
</div>
35-
{{else}}
36-
{{send-to-console action="sendValueToConsole" param=model}}
37-
{{/if}}
30+
<div class="list-tree__right-helper">
31+
{{#if content.isError}}
32+
<div class="send-trace-to-console" {{action "sendValueToConsole" content.model}} data-label="send-to-console-btn" title="Send stack trace to the console">
33+
Stack trace
34+
</div>
35+
{{else}}
36+
{{send-to-console action="sendValueToConsole" param=content.model}}
37+
{{/if}}
3838

39-
</div>
40-
{{else}}
41-
--
42-
{{/if}}
39+
</div>
40+
{{else}}
41+
--
42+
{{/if}}
43+
</div>
44+
<div class="cell cell_size_medium cell_value_numeric" data-label="promise-time">{{ms-to-time content.timeToSettle}}</div>
4345
</div>
44-
<div class="cell cell_size_medium cell_value_numeric" data-label="promise-time">{{ms-to-time timeToSettle}}</div>
45-
</div>
46+
{{/with}}

‎app/templates/record-item.hbs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
{{#record-item model=this modelTypeColumns=view.columns inspect="inspectModel" as |item|}}
2-
{{#each column in item.columns}}
3-
<div class="cell cell_clickable" data-label="record-column" {{bind-attr style="item.style"}}>
4-
{{column.value}}
5-
</div>
6-
{{/each}}
7-
{{/record-item}}
1+
{{#with view.content as |content|}}
2+
{{#record-item model=content modelTypeColumns=view.columns inspect="inspectModel" as |item|}}
3+
{{#each column in item.columns}}
4+
<div class="cell cell_clickable" data-label="record-column" style="{{item.style}}">
5+
{{column.value}}
6+
</div>
7+
{{/each}}
8+
{{/record-item}}
9+
{{/with}}

‎app/templates/route-item.hbs‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
1-
{{#route-item model=this currentRoute=view.currentRoute as |item|}}
2-
<div class="cell_type_main cell" data-label="route-name">
3-
<div {{bind-attr style="item.labelStyle"}}>
4-
<span title="{{unbound value.name}}" data-label="view-name">{{value.name}}</span>
5-
</div>
6-
</div>
7-
<div class="cell">
8-
<div class="list-tree__limited cell_clickable" {{action "inspectRoute" value.routeHandler.name}} data-label="route-handler">
9-
<span title="{{unbound value.routeHandler.className}}">{{value.routeHandler.className}}</span>
10-
</div>
11-
<div class="list-tree__right-helper">
12-
{{send-to-console action="sendRouteHandlerToConsole" param=value.routeHandler.name}}
1+
{{#with view.content as |content|}}
2+
{{#route-item model=content currentRoute=view.currentRoute as |item|}}
3+
<div class="cell_type_main cell" data-label="route-name">
4+
<div style="{{item.labelStyle}}">
5+
<span title="{{unbound content.value.name}}" data-label="view-name">{{content.value.name}}</span>
6+
</div>
137
</div>
14-
</div>
15-
<div class="cell">
16-
{{#if value.controller.exists}}
17-
<div class="list-tree__limited cell_clickable" {{action "inspectController" value.controller}} data-label="route-controller">
18-
<span title="{{unbound value.controller.className}}">{{value.controller.className}}</span>
8+
<div class="cell">
9+
<div class="list-tree__limited cell_clickable" {{action "inspectRoute" content.value.routeHandler.name}} data-label="route-handler">
10+
<span title="{{unbound content.value.routeHandler.className}}">{{content.value.routeHandler.className}}</span>
1911
</div>
2012
<div class="list-tree__right-helper">
21-
{{send-to-console action="sendControllerToConsole" param=value.controller.name}}
13+
{{send-to-console action="sendRouteHandlerToConsole" param=content.value.routeHandler.name}}
2214
</div>
15+
</div>
16+
<div class="cell">
17+
{{#if content.value.controller.exists}}
18+
<div class="list-tree__limited cell_clickable" {{action "inspectController" content.value.controller}} data-label="route-controller">
19+
<span title="{{unbound content.value.controller.className}}">{{content.value.controller.className}}</span>
20+
</div>
21+
<div class="list-tree__right-helper">
22+
{{send-to-console action="sendControllerToConsole" param=content.value.controller.name}}
23+
</div>
2324

24-
{{else}}
25-
<div data-label="route-controller">
26-
<span title="{{unbound value.controller.className}}">{{value.controller.className}}</span>
27-
</div>
28-
{{/if}}
29-
</div>
30-
<div class="cell" data-label="route-template">
31-
<span title="{{unbound value.template.name}}">{{value.template.name}}</span>
32-
</div>
33-
<div class="cell cell_size_large" data-label="route-url">
34-
<span title="{{unbound value.url}}">{{value.url}}</span>
35-
</div>
36-
{{/route-item}}
25+
{{else}}
26+
<div data-label="route-controller">
27+
<span title="{{unbound content.value.controller.className}}">{{content.value.controller.className}}</span>
28+
</div>
29+
{{/if}}
30+
</div>
31+
<div class="cell" data-label="route-template">
32+
<span title="{{unbound content.value.template.name}}">{{content.value.template.name}}</span>
33+
</div>
34+
<div class="cell cell_size_large" data-label="route-url">
35+
<span title="{{unbound content.value.url}}">{{content.value.url}}</span>
36+
</div>
37+
{{/route-item}}
38+
{{/with}}

0 commit comments

Comments
 (0)
⚡