Convert sortable-objects sortEndAction to DDAU

mharris717 · Mar 4, 2018 · 98cb024 · 98cb024
1 parent 9db86fb
commit 98cb024
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -183,7 +183,7 @@ This only applies if you use the sort capabilities, regular dragging is not vers
 An Example:
 
 ```handlebars
-{{#sortable-objects sortableObjectList=sortableObjectList sortEndAction='sortEndAction' enableSort=true useSwap=true inPlace=false sortingScope="sortingGroup"}}
+{{#sortable-objects sortableObjectList=sortableObjectList sortEndAction=(action 'sortEndAction') enableSort=true useSwap=true inPlace=false sortingScope="sortingGroup"}}
   {{#each sortableObjectList as |item|}}
     {{#draggable-object content=item isSortable=true sortingScope="sortingGroup"}}
       {{item.name}}

diff --git a/addon/components/sortable-objects.js b/addon/components/sortable-objects.js
@@ -47,8 +47,8 @@ export default Component.extend( {
 
   drop(event) {
     event.stopPropagation();
-    if (this.get('enableSort')) {
-      this.sendAction('sortEndAction', event);
+    if (this.get('enableSort') && this.get('sortEndAction')) {
+      this.get('sortEndAction')(event);
     }
   }
 });
diff --git a/tests/dummy/app/templates/horizontal.hbs b/tests/dummy/app/templates/horizontal.hbs
@@ -8,7 +8,7 @@ This demo demonstrates the different between the flag useSwap=true (default) and
   <p>{{input type="checkbox" checked=useSwap}} useSwap={{#if useSwap}}true{{else}} false{{/if}}</p>
   <p>Typically for a horizontal list, sending in useSwap=false is the right choice.  <br>By default (useSwap=true) the box being dragged will be swapped with the item it's over. <br>If useSwap=false the item will be swapped with the one it's over and the items in the list under it will be pushed down the line.</p>
   <div class="u-pullLeft">
-    {{#sortable-objects sortableObjectList=sortableObjectList sortEndAction='sortEndAction' useSwap=useSwap}}
+    {{#sortable-objects sortableObjectList=sortableObjectList sortEndAction=(action 'sortEndAction') useSwap=useSwap}}
       {{#each sortableObjectList as |item|}}
         {{#draggable-object content=item  overrideClass='sortObject u-pullLeft' isSortable=true}}
           {{item.title}}

diff --git a/tests/dummy/app/templates/multiple.hbs b/tests/dummy/app/templates/multiple.hbs
@@ -4,7 +4,7 @@
   <p>Drag any item from this block to the block on the right</p>
   <p>You can control which blocks can be interacted with by setting the sortingScope </p>
   <div class="u-pullLeft">
-  {{#sortable-objects sortableObjectList=sortableObjectList sortEndAction='sortEndAction' sortingScope='a' }}
+  {{#sortable-objects sortableObjectList=sortableObjectList sortEndAction=(action 'sortEndAction') sortingScope='a' }}
     {{#each sortableObjectList as |item|}}
       {{#draggable-object content=item  overrideClass='sortObject' isSortable=true sortingScope='a'}}
         {{item.title}}

diff --git a/tests/dummy/app/templates/sort.hbs b/tests/dummy/app/templates/sort.hbs
@@ -3,7 +3,7 @@
 <div class="u-halfBlock u-pullLeft">
   <p>Drag any box to another position and drop to re-sort the list</p>
   <div class="u-pullLeft">
-  {{#sortable-objects sortableObjectList=sortableObjectList sortEndAction='sortEndAction' sortingScope='a' }}
+  {{#sortable-objects sortableObjectList=sortableObjectList sortEndAction=(action 'sortEndAction') sortingScope='a' }}
     {{#each sortableObjectList as |item|}}
       {{#draggable-object content=item  overrideClass='sortObject' isSortable=true sortingScope='a'}}
         {{item.title}}

diff --git a/tests/dummy/app/templates/sortdata.hbs b/tests/dummy/app/templates/sortdata.hbs
@@ -2,7 +2,7 @@
 <p>Drag any box to another position and drop to re-sort the list</p>
 
 <div class="u-pullLeft">
-  {{#sortable-objects sortableObjectList=model.pages sortEndAction='sortEndAction' enableSort=true}}
+  {{#sortable-objects sortableObjectList=model.pages sortEndAction=(action 'sortEndAction') enableSort=true}}
     {{#each model.pages as |item|}}
       {{#draggable-object content=item overrideClass='sortObject' isSortable=true}}
         {{item.title}}

diff --git a/tests/integration/components/sortable-objects-test.js b/tests/integration/components/sortable-objects-test.js
@@ -71,7 +71,7 @@ test('sortable object renders draggable objects', async function(assert) {
   });
 
   this.render(hbs`
-    {{#sortable-objects sortableObjectList=pojoData sortEndAction='sortEndAction' class='sortContainer' sortingScope='sortable-objects'}}
+    {{#sortable-objects sortableObjectList=pojoData sortEndAction=(action 'sortEndAction') class='sortContainer' sortingScope='sortable-objects'}}
       {{#each pojoData as |item|}}
         {{#draggable-object content=item overrideClass='sortObject' isSortable=true sortingScope='sortable-objects'}}
           {{item.title}}
@@ -119,7 +119,7 @@ test('sortable object renders draggable objects using shift algorithm', async fu
   });
 
   this.render(hbs`
-    {{#sortable-objects sortableObjectList=pojoData sortEndAction='sortEndAction' class='sortContainer' useSwap=false}}
+    {{#sortable-objects sortableObjectList=pojoData sortEndAction=(action 'sortEndAction') class='sortContainer' useSwap=false}}
       {{#each pojoData as |item|}}
         {{#draggable-object content=item overrideClass='sortObject' isSortable=true}}
           {{item.title}}
@@ -164,7 +164,7 @@ test('sorting does not happen if off', async function(assert) {
   });
 
   this.render(hbs`
-    {{#sortable-objects sortableObjectList=pojoData sortEndAction='sortEndAction' class='sortContainer' enableSort=false}}
+    {{#sortable-objects sortableObjectList=pojoData sortEndAction=(action 'sortEndAction') class='sortContainer' enableSort=false}}
       {{#each pojoData as |item|}}
         {{#draggable-object content=item overrideClass='sortObject' isSortable=false}}
           {{item.title}}