Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Update legacy shim and @argument #485

Merged
merged 2 commits into from
Feb 5, 2018
Merged

chore(deps): Update legacy shim and @argument #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31288a8
chore(deps): Update legacy shim and @argument
pzuraq Feb 5, 2018
43f7437
remove event name collisions
pzuraq Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addon/components/ember-table-footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default class EmberTableFooter extends EmberTableBaseCell {
}

@action
onFooterEvent() {
sendFooterEvent() {
this.sendAction('onFooterEvent', ...arguments);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to update this name too for consistency?

}
}
2 changes: 1 addition & 1 deletion addon/components/ember-table-header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export default class EmberTableHeader extends EmberTableBaseCell {
}

@action
onHeaderEvent() {
sendHeaderEvent() {
this.sendAction('onHeaderEvent', ...arguments);
}
}
4 changes: 2 additions & 2 deletions addon/components/ember-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,12 +720,12 @@ export default class EmberTable extends Component {
}

@action
onHeaderEvent() {
sendHeaderEvent() {
this.sendAction('onHeaderEvent', ...arguments);
}

@action
onFooterEvent() {
sendFooterEvent() {
this.sendAction('onFooterEvent', ...arguments);
}
}
4 changes: 2 additions & 2 deletions addon/templates/components/ember-table-footer.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
rowValue=rowValue
rowIndex=rowIndex
columnIndex=columnIndex
onFooterEvent="onFooterEvent"
onFooterEvent="sendFooterEvent"
}}
{{/component}}
{{else}}
Expand All @@ -20,7 +20,7 @@
rowValue=rowValue
rowIndex=rowIndex
columnIndex=columnIndex
onFooterEvent="onFooterEvent"
onFooterEvent="sendFooterEvent"
}}
{{/component}}
{{else}}
Expand Down
4 changes: 2 additions & 2 deletions addon/templates/components/ember-table-header.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{#component column.headerComponent
column=column
columnIndex=columnIndex
onHeaderEvent="onHeaderEvent"
onHeaderEvent="sendHeaderEvent"
}}
{{/component}}
{{else}}
Expand All @@ -21,7 +21,7 @@
{{#component column.headerComponent
column=column
columnIndex=columnIndex
onHeaderEvent="onHeaderEvent"
onHeaderEvent="sendHeaderEvent"
}}
{{/component}}
{{else}}
Expand Down
6 changes: 3 additions & 3 deletions addon/templates/components/ember-table.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
onColumnResizeEnded="onColumnResizeEnded"
onColumnReorder="onColumnReorder"
onColumnReorderEnded="onColumnReorderEnded"
onHeaderEvent="onHeaderEvent"
onHeaderEvent="sendHeaderEvent"
width=column.width
}}
{{/each}}
Expand All @@ -30,7 +30,7 @@
onColumnResizeEnded="onColumnResizeEnded"
onColumnReorder="onColumnReorder"
onColumnReorderEnded="onColumnReorderEnded"
onHeaderEvent="onHeaderEvent"
onHeaderEvent="sendHeaderEvent"
width=column.width
}}
{{/each}}
Expand Down Expand Up @@ -70,7 +70,7 @@
rowIndex=footerRowIndex
columnIndex=columnIndex
numFixedColumns=numFixedColumns
onFooterEvent="onFooterEvent"
onFooterEvent="sendFooterEvent"
}}
{{/each}}
</tr>
Expand Down
8 changes: 3 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,19 @@
},
"dependencies": {
"@addepar/ice-box": "^0.1.3",
"@ember-decorators/argument": "^0.8.8",
"@ember-decorators/argument": "^0.8.10",
"@ember-decorators/babel-transforms": "^0.1.1",
"@html-next/vertical-collection": "1.0.0-beta.10",
"css-element-queries": "^0.4.0",
"ember": "^1.0.3",
"ember-cli-babel": "^6.7.1",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-node-assets": "^0.2.2",
"ember-cli-sass": "^7.0.0",
"ember-compatibility-helpers": "^0.1.2",
"ember-decorators": "^1.3.3",
"ember-legacy-class-transform": "^0.1.4",
"ember-legacy-class-shim": "^1.0.0",
"ember-raf-scheduler": "^0.1.0",
"hammerjs": "^2.0.8",
"install": "^0.10.1"
"hammerjs": "^2.0.8"
},
"devDependencies": {
"@addepar/eslint-config": "^3.0.0",
Expand Down