csvalpha · DrumsnChocolate · May 18, 2022 · May 18, 2022 · Aug 30, 2022 · Aug 30, 2022
diff --git a/app/components/photo-comments/comments.hbs b/app/components/photo-comments/comments.hbs
@@ -36,7 +36,7 @@
             aria-label='Reactie'
             minlength='1'
             maxlength='500'
-            @enter={{action 'submitPhotoComment'}}
+            @enter={{this.submitPhotoComment}}
           />
           <span class='input-group-btn'>
             <button

diff --git a/app/components/tools/board-room-presence.hbs b/app/components/tools/board-room-presence.hbs
@@ -47,8 +47,8 @@
   <EmberWormhole @to='ember-wormhole-destination'>
     <BasicModal
       @title='Bestuurskamer beschikbaarheid opgeven'
-      @closeModal={{action 'setPresenceModalState' 'closed'}}
-      @onSubmit={{action 'save'}}
+      @closeModal={{fn 'setPresenceModalState' 'closed'}}
+      @onSubmit={{this.save}}
       @submitText='Beschikbaarheid opslaan'
       @submitDisabled={{saveButtonDisabled}}
     >

diff --git a/app/controllers/application/edit.js b/app/controllers/application/edit.js
@@ -26,7 +26,10 @@ export default class EditController extends Controller {
   }
 
   @action
-  submit() {
+  submit(event) {
+    if (event) {
+      event.preventDefault();
+    }
     this.modelSaveUtil.saveModel(this.model);
   }
 

diff --git a/app/controllers/debit/collections/edit.js b/app/controllers/debit/collections/edit.js
@@ -26,7 +26,10 @@ export default class DebitCollectionEditController extends EditController {
   }
 
   @action
-  async submit() {
+  async submit(event) {
+    if (event) {
+      event.preventDefault();
+    }
     this.errorMessage = null;
     try {
       await this.model.saveWithTransactions();

diff --git a/app/controllers/groups/new.js b/app/controllers/groups/new.js
@@ -1,4 +1,4 @@
-import EditGroupController from './edit';
+import EditController from './edit';
 
 export default class NewGroupController extends EditGroupController {
   successMessage = 'Groep aangemaakt!';

diff --git a/app/templates/activities/destroy.hbs b/app/templates/activities/destroy.hbs
@@ -20,11 +20,11 @@
         verwijderen?
       </p>
 
-      <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+      <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
         Verwijderen
       </button>
       <button
-        {{action 'cancel'}}
+        {{on "click" this.cancel}}
         type="button"
         class='btn btn-default'
       >

diff --git a/app/templates/activities/edit.hbs b/app/templates/activities/edit.hbs
@@ -1,13 +1,13 @@
 <Forms::ActivityForm
   @model={{@model}}
   @controller={{this}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @activityCategoryOptions={{this.activityCategoryOptions}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @groups={{this.groups}}
   @activityHasForm={{this.activityHasForm}}
   @combinedErrors={{this.combinedErrors}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
diff --git a/app/templates/activities/new.hbs b/app/templates/activities/new.hbs
@@ -1,13 +1,13 @@
 <Forms::ActivityForm
   @model={{@model}}
   @controller={{this}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @activityCategoryOptions={{this.activityCategoryOptions}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @groups={{this.groups}}
   @activityHasForm={{this.activityHasForm}}
   @combinedErrors={{this.combinedErrors}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
diff --git a/app/templates/activities/print-enrolled.hbs b/app/templates/activities/print-enrolled.hbs
@@ -7,16 +7,15 @@
           <li class='nav-item'>
             <a
               class='nav-link {{if (eq this.currentTab "form") "active"}}'
-              {{action 'selectForm'}}
+              {{on "click" this.selectForm}}
             >
               Inschrijflijst
             </a>
           </li>
           <li class='nav-item'>
             <a
-              class='nav-link
-                {{if (eq this.currentTab "consumptionList") "active"}}'
-              {{action 'selectConsumptionList'}}
+              class='nav-link {{if (eq this.currentTab "consumptionList") "active"}}'
+              {{on "click" this.selectConsumptionList}}
             >
               Streeplijst
             </a>
@@ -77,13 +76,13 @@
                   class='form-control'
                   aria-label='Optie toevoegen'
                   placeholder='Optie toevoegen'
-                  @enter={{action 'addOption'}}
+                  @enter={{this.addOption}}
                 />
                 <span class='input-group-btn'>
                   <button
                     class='btn btn-secondary'
                     type='button'
-                    {{action 'addOption'}}
+                    {{on "click" this.addOption}}
                   >
                     <FaIcon @icon='plus' />
                   </button>
@@ -129,7 +128,7 @@
           </label>
         </div>
 
-        <button type='button' class='btn btn-secondary' {{action 'print'}}>
+        <button type='button' class='btn btn-secondary' {{on "click" this.print}}>
           Afdrukken
         </button>
         <LinkTo

diff --git a/app/templates/article-comments/destroy.hbs b/app/templates/article-comments/destroy.hbs
@@ -11,11 +11,11 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <button
-      {{action 'cancel'}}
+      {{on "click" this.cancel}}
       type="button"
       class='btn btn-default'
     >

diff --git a/app/templates/articles/destroy.hbs b/app/templates/articles/destroy.hbs
@@ -11,10 +11,10 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Artikel verwijderen
     </button>
-    <button {{action 'cancel'}} type="button" class='btn btn-default'>
+    <button {{on "click" this.cancel}} type="button" class='btn btn-default'>
       Annuleren
     </button>
   </div>

diff --git a/app/templates/articles/edit.hbs b/app/templates/articles/edit.hbs
@@ -4,11 +4,11 @@
 
 <Forms::ArticleForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @canPin={{this.canPin}}
   @groups={{this.groups}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
diff --git a/app/templates/articles/new.hbs b/app/templates/articles/new.hbs
@@ -4,11 +4,11 @@
 
 <Forms::ArticleForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @canPin={{this.canPin}}
   @groups={{this.groups}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
diff --git a/app/templates/articles/show.hbs b/app/templates/articles/show.hbs
@@ -39,7 +39,7 @@
             placeholder={{t 'template.articles.show.commentHint'}}
             minlength='1'
             maxlength='500'
-            @enter={{action 'submitArticleComment'}}
+            @enter={{this.submitArticleComment}}
           />
           <span class='input-group-btn'>
             <button

diff --git a/app/templates/books/edit.hbs b/app/templates/books/edit.hbs
@@ -10,12 +10,12 @@
   @lookingUpIsbn={{this.lookingUpIsbn}}
   @lookupIsbnError={{this.lookupIsbnError}}
   @errorMessage={{this.errorMessage}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
-  @onToggleScanner={{action 'toggleScanner'}}
-  @onDevicesFound={{action 'onDevicesFound'}}
-  @onScanSuccess={{action 'onScanSuccess'}}
-  @lookupIsbn={{action 'lookupIsbn'}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
-  @setContent={{action 'setContent'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
+  @onToggleScanner={{this.toggleScanner}}
+  @onDevicesFound={{this.onDevicesFound}}
+  @onScanSuccess={{this.onScanSuccess}}
+  @lookupIsbn={{this.lookupIsbn}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
+  @setContent={{this.setContent}}
 />
diff --git a/app/templates/books/new.hbs b/app/templates/books/new.hbs
@@ -10,12 +10,12 @@
   @lookingUpIsbn={{this.lookingUpIsbn}}
   @lookupIsbnError={{this.lookupIsbnError}}
   @errorMessage={{this.errorMessage}}
-  @onSubmit={{action 'submit'}}
+  @onSubmit={{this.submit}}
   @onCancel={{this.cancel}}
-  @onToggleScanner={{action 'toggleScanner'}}
-  @onDevicesFound={{action 'onDevicesFound'}}
-  @onScanSuccess={{action 'onScanSuccess'}}
-  @lookupIsbn={{action 'lookupIsbn'}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
-  @setContent={{action 'setContent'}}
+  @onToggleScanner={{this.toggleScanner}}
+  @onDevicesFound={{this.onDevicesFound}}
+  @onScanSuccess={{this.onScanSuccess}}
+  @lookupIsbn={{this.lookupIsbn}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
+  @setContent={{this.setContent}}
 />
diff --git a/app/templates/debit/collections/destroy.hbs b/app/templates/debit/collections/destroy.hbs
@@ -11,7 +11,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <LinkTo

diff --git a/app/templates/debit/collections/edit.hbs b/app/templates/debit/collections/edit.hbs
@@ -3,7 +3,7 @@
     <h5>Incasso bewerken</h5>
   </div>
   <div class='card-body'>
-    <form {{action 'submit' on='submit'}}>
+    <form {{on 'submit' this.submit}}>
       <ModelForm::TextInput
         @model={{model}}
         @property='name'
@@ -21,7 +21,7 @@
         @model={{model}}
         @errorMessage={{this.errorMessage}}
       >
-        <button {{action 'cancel'}} type="button" class='btn btn-default'>
+        <button {{on "click" this.cancel}} type="button" class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
@@ -35,7 +35,7 @@
       <div class='col-sm-10'>
         <PowerSelect
           @options={{users}}
-          @onChange={{action 'addUser'}}
+          @onChange={{this.addUser}}
           @selected={{transaction.user}}
           @searchEnabled={{true}}
           @searchField='fullName'

diff --git a/app/templates/debit/collections/new.hbs b/app/templates/debit/collections/new.hbs
@@ -35,7 +35,7 @@
         @model={{model}}
         @property='importFile'
         @label='Import file'
-        @loadedCallback={{action 'fileLoaded'}}
+        @loadedCallback={{this.fileLoaded}}
         @validExtensions={{this.validExtensions}}
         @validMimetypes={{this.validMimetypes}}
       />

diff --git a/app/templates/debit/mandates/edit.hbs b/app/templates/debit/mandates/edit.hbs
@@ -2,8 +2,8 @@
 
 <Forms::MandateForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @users={{this.users}}
   @errorMessage={{this.errorMessage}}
 />
diff --git a/app/templates/debit/mandates/new.hbs b/app/templates/debit/mandates/new.hbs
@@ -2,8 +2,8 @@
 
 <Forms::MandateForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @users={{this.users}}
   @errorMessage={{this.errorMessage}}
 />
diff --git a/app/templates/debit/transactions/edit.hbs b/app/templates/debit/transactions/edit.hbs
@@ -2,9 +2,9 @@
 
 <Forms::TransactionForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @users={{this.users}}
-  @onSetUser={{action 'setUser'}}
+  @onSetUser={{this.setUser}}
   @errorMessage={{this.errorMessage}}
 />
diff --git a/app/templates/forum/categories/category/edit.hbs b/app/templates/forum/categories/category/edit.hbs
@@ -1,6 +1,6 @@
 <Forms::CategoryForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @errorMessage={{this.errorMessage}}
 />
diff --git a/app/templates/forum/categories/category/threads/new.hbs b/app/templates/forum/categories/category/threads/new.hbs
@@ -1,7 +1,7 @@
 <Forms::ThreadForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @errorMessage={{this.errorMessage}}
-  @setContent={{action 'setContent'}}
+  @setContent={{this.setContent}}
 />
diff --git a/app/templates/forum/categories/category/threads/thread/edit.hbs b/app/templates/forum/categories/category/threads/thread/edit.hbs
@@ -1,6 +1,6 @@
 <Forms::ThreadForm
   @model={{@model}}
-  @onSubmit={{action 'submit'}}
-  @onCancel={{action 'cancel'}}
+  @onSubmit={{this.submit}}
+  @onCancel={{this.cancel}}
   @errorMessage={{this.errorMessage}}
 />
diff --git a/app/templates/forum/categories/category/threads/thread/posts/destroy.hbs b/app/templates/forum/categories/category/threads/thread/posts/destroy.hbs
@@ -18,11 +18,11 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on "click" this.destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <button
-      {{action 'cancel'}}
+      {{on "click" this.cancel}}
       class='btn btn-default'
       type='button'
     >

diff --git a/app/templates/forum/categories/category/threads/thread/posts/edit.hbs b/app/templates/forum/categories/category/threads/thread/posts/edit.hbs
@@ -1 +1 @@
-<Forms::PostForm @model={{@model}} @onSubmit={{action 'submit'}} @onCancel={{action 'cancel'}} @setContent={{action 'setContent'}}/>
+<Forms::PostForm @model={{@model}} @onSubmit={{this.submit}} @onCancel={{this.cancel}} @setContent={{this.setContent}}/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<Forms::PostForm @model={{@model}} @onSubmit={{action 'submit'}} @onCancel={{action 'cancel'}} @setContent={{action 'setContent'}}/>
		<Forms::PostForm @model={{@model}} @onSubmit={{this.submit}} @onCancel={{this.cancel}} @setContent={{this.setContent}}/>