diff --git a/routes/_components/compose/ComposeBox.html b/routes/_components/compose/ComposeBox.html index def06350..18fe97da 100644 --- a/routes/_components/compose/ComposeBox.html +++ b/routes/_components/compose/ComposeBox.html @@ -9,7 +9,7 @@ {{/if}} - + @@ -188,10 +188,10 @@ dialogs.showComposeDialog() } else { // else we're actually posting a new toot - this.onPostAction(); + this.doPostStatus(); } }, - onPostAction() { + doPostStatus() { let text = this.get('text') let media = this.get('media') let postPrivacyKey = this.get('postPrivacyKey') diff --git a/routes/_components/compose/ComposeInput.html b/routes/_components/compose/ComposeInput.html index d34d5df1..d27b406d 100644 --- a/routes/_components/compose/ComposeInput.html +++ b/routes/_components/compose/ComposeInput.html @@ -101,8 +101,8 @@ }, onKeydown(e) { let { keyCode } = e - const ctrlPressed = - e.getModifierState('Control') || e.getModifierState('Meta') + // ctrl or cmd (on macs) was pressed; ctrl-enter means post a toot + const ctrlPressed = e.getModifierState('Control') || e.getModifierState('Meta') switch (keyCode) { case 9: // tab this.clickSelectedAutosuggestion(e)