Skip to content

Commit 8f3bb92

Browse files
RobbieTheWagnercyril-sf
authored andcommitted
Ember 3.7 beta, bump other deps (emberjs#911)
* Ember 3.7 beta, bump other deps * Remove route action helper to fix handlerInfos deprecation * Fix date picker issues
1 parent 33c2d7a commit 8f3bb92

16 files changed

Lines changed: 1560 additions & 1678 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/node_modules/
1313

1414
# misc
15+
/.env*
1516
/.sass-cache
1617
/connect.lock
1718
/coverage/

app/components/date-property-field.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import { on } from '@ember/object/evented';
21
import { scheduleOnce } from '@ember/runloop';
3-
import DatePicker from "ember-inspector/components/ember-flatpickr";
2+
import DatePicker from 'ember-inspector/components/ember-flatpickr';
3+
44
const KEY_EVENTS = {
55
escape: 27
66
};
77

88
export default DatePicker.extend({
9-
openDatePicker: on('didInsertElement', function() {
9+
didInsertElement() {
10+
this._super(...arguments);
11+
1012
scheduleOnce('afterRender', this, function() {
1113
this.flatpickrRef.open();
1214
});
13-
}),
15+
},
1416

1517
keyUp(e) {
1618
if (e.keyCode === KEY_EVENTS.escape) {

app/controllers/application.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,11 @@ export default Controller.extend({
7474
this.set('mixinDetails', null);
7575
}
7676

77+
},
78+
79+
actions: {
80+
setIsDragging(isDragging) {
81+
this.set('isDragging', isDragging);
82+
}
7783
}
7884
});

app/controllers/container-types.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import Controller from '@ember/controller';
1+
import Controller, { inject as controller } from '@ember/controller';
22
import { sort } from '@ember/object/computed';
33

44
export default Controller.extend({
5+
application: controller(),
6+
57
sortProperties: ['name'],
68
sorted: sort('model', 'sortProperties')
79
});

app/routes/application.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ export default Route.extend({
113113
this.get('port').send('objectInspector:inspectById', { objectId });
114114
}
115115
},
116-
setIsDragging(isDragging) {
117-
this.set('controller.isDragging', isDragging);
118-
},
119116
refreshPage() {
120117
// If the adapter defined a `reloadTab` method, it means
121118
// they prefer to handle the reload themselves

app/templates/-main.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{#draggable-column
33
width=navWidth
44
classes="split__panel split__panel--sidebar-1"
5-
setIsDragging=(route-action "setIsDragging")
5+
setIsDragging=(action "setIsDragging")
66
}}
77
<div class="split__panel__hd">
88
{{iframe-picker}}

app/templates/application.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
side="right"
1414
width=inspectorWidth
1515
classes="split__panel"
16-
setIsDragging=(route-action "setIsDragging")
16+
setIsDragging=(action "setIsDragging")
1717
}}
1818
{{object-inspector
1919
application=this

app/templates/container-types.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{item-types
22
header="Types"
3-
setIsDragging=(route-action "setIsDragging")
3+
setIsDragging=(action "setIsDragging" target=application)
44
sorted=(readonly sorted)
55
type="container"
66
width=180

app/templates/deprecations.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
headerHeight=0
44
name="deprecation-list"
55
schema=(hash columns=null)
6-
setIsDragging=(route-action "setIsDragging")
6+
setIsDragging=(action "setIsDragging" target=application)
77
as |list|
88
}}
99
{{#if filtered.length}}

app/templates/info.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="split">
22
{{#draggable-column
33
classes="split__panel split__panel--sidebar-2 nav"
4-
setIsDragging=(route-action "setIsDragging")
4+
setIsDragging=(action "setIsDragging" target=application)
55
width=180
66
}}
77
<div class="split__panel__bd">

0 commit comments

Comments
 (0)