@bennerinformatics/ember-fw-table 2.1.2 → 2.1.4

package/addon/templates/components/fw-table-resort.hbs

@@ -1,6 +1,6 @@
-<SortableGroup @tagName="ul" @class="js-list-sort resort-list" @onChange={{action "reorderItems"}} as |group|>
+<ul {{sortable-group onChange=(action "reorderItems")}} class="js-list-sort resort-list">
     {{#each sortedItems as |item|}}
-        <SortableItem @tagName="li" @model={{item}} @group={{group}} @handle=".handle" @spacing={{spacing}}>
+        <li {{sortable-item model=item handle=".handle" spacing=spacing}}>
             <div class="input-group">
                 <span class="input-group-addon handle draggable">
                     <i class="fa-solid fa-ellipsis-vertical fa-2"></i>
@@ -35,8 +35,8 @@
                     <span class="input-group-addon"/>
                 {{/if}}
             </div>
-        </SortableItem>
+        </li>
     {{else}}
         {{empty}}
     {{/each}}
-</SortableGroup>
+</ul>

package/addon/utils/formats.js

@@ -60,7 +60,7 @@ export function formatNullable(nullText = 'None') {
 }
 
 /**
- * Generates a function which formats a moment based on the specified format. Designed to be used in the following way with a column displaying a date (after importing `formatMoment` in the way described above):
+ * Generates a function which formats a date based on the specified format. Designed to be used in the following way with a column displaying a date (after importing `formatMoment` in the way described above):
  * ```js
  * column: [
  *   //will display date as 1970-01-01
@@ -80,15 +80,18 @@ export function formatNullable(nullText = 'None') {
  * @method formatMoment
  * @param  {String} format       moment format. For a list of valid strings, see [Moment docs](https://momentjs.com/docs/#/displaying/format/)
  * @param  {String} exportFormat moment format used on exporting
- * @return {Function}      Function to pass into a column which formats by a moment
+ * @return {Function}      Function to pass into a column which formats a date
  */
 export function formatMoment(format, exportFormat = null) {
     return function(date) {
+        if (!date) {
+            return null;
+        }
         if (!moment.isMoment(date)) {
             date = moment(date);
         }
         // if we are exporting and have an export format, use that
-        let useFormat = exportFormat && this['export'] ? exportFormat : format;
+        let useFormat = exportFormat && this.export ? exportFormat : format;
         return date.format(useFormat);
     };
 }

package/package.json

@@ -1,65 +1,65 @@
-{
-  "name": "@bennerinformatics/ember-fw-table",
-  "version": "2.1.2",
-  "description": "Additional resources related to tables for the Ember FW App System.",
-  "keywords": [
-    "ember-addon",
-    "fw"
-  ],
-  "license": "MIT",
-  "author": "David Burnett <djburnett@olivet.edu>",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  },
-  "repository": "",
-  "scripts": {
-    "build": "ember build",
-    "start": "ember server",
-    "test": "npm run lint && ember try:each",
-    "lint": "ember test --launch phantomjs --filter=\"ESLint\""
-  },
-  "dependencies": {
-    "ember-cli-babel": "7.13.2",
-    "ember-cli-htmlbars": "^3.1.0",
-    "ember-light-table": "2.0.0-beta.5",
-    "ember-papaparse": "^1.0.0",
-    "ember-truth-helpers": "^2.1.0",
-    "sass": "1.32.13",
-    "papaparse": "^5.0.2"
-  },
-  "devDependencies": {
-    "@bennerinformatics/ember-fw": "^2.0.29",
-    "broccoli-asset-rev": "^3.0.0",
-    "ember-ajax": "^5.0.0",
-    "ember-cli": "~3.10.0",
-    "ember-cli-addon-docs-yuidoc": "^1.0.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
-    "ember-cli-inject-live-reload": "^2.0.1",
-    "ember-cli-qunit": "^4.4.0",
-    "ember-cli-shims": "^1.2.0",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^3.0.0",
-    "ember-cli-yuidoc": "^0.8.8",
-    "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^2.0.0",
-    "ember-resolver": "^5.2.1",
-    "ember-responsive": "^3.0.5",
-    "ember-sortable": "1.12.9",
-    "ember-source": "~3.10.0",
-    "eslint-plugin-ember": "^6.9.1",
-    "eslint-plugin-ember-suave": "^1.0.0",
-    "loader.js": "^4.7.0",
-    "moment": "^2.24.0"
-  },
-  "engines": {
-    "node": ">= 0.10.0"
-  },
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
-  }
-}
+{
+  "name": "@bennerinformatics/ember-fw-table",
+  "version": "2.1.4",
+  "description": "Additional resources related to tables for the Ember FW App System.",
+  "keywords": [
+    "ember-addon",
+    "fw"
+  ],
+  "license": "MIT",
+  "author": "David Burnett <djburnett@olivet.edu>",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
+  "repository": "",
+  "scripts": {
+    "build": "ember build",
+    "start": "ember server",
+    "test": "npm run lint && ember try:each",
+    "lint": "ember test --launch phantomjs --filter=\"ESLint\""
+  },
+  "dependencies": {
+    "ember-cli-babel": "7.13.2",
+    "ember-cli-htmlbars": "^3.1.0",
+    "ember-light-table": "3.0.0-beta.1",
+    "ember-papaparse": "^1.0.0",
+    "ember-sortable": "https://bitbucket.org/linformatics/ember-sortable#firefox-fix",
+    "ember-truth-helpers": "^2.1.0",
+    "papaparse": "^5.0.2",
+    "sass": "1.32.13"
+  },
+  "devDependencies": {
+    "@bennerinformatics/ember-fw": "^2.0.32",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-ajax": "^5.0.0",
+    "ember-cli": "~3.10.0",
+    "ember-cli-addon-docs-yuidoc": "^1.0.0",
+    "ember-cli-app-version": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-eslint": "^5.1.0",
+    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
+    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-qunit": "^4.4.0",
+    "ember-cli-shims": "^1.2.0",
+    "ember-cli-sri": "^2.1.0",
+    "ember-cli-uglify": "^3.0.0",
+    "ember-cli-yuidoc": "^0.8.8",
+    "ember-disable-prototype-extensions": "^1.1.3",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^2.0.0",
+    "ember-resolver": "^5.2.1",
+    "ember-responsive": "^3.0.5",
+    "ember-source": "~3.10.0",
+    "eslint-plugin-ember": "^6.9.1",
+    "eslint-plugin-ember-suave": "^1.0.0",
+    "loader.js": "^4.7.0",
+    "moment": "^2.24.0"
+  },
+  "engines": {
+    "node": ">= 0.10.0"
+  },
+  "ember-addon": {
+    "configPath": "tests/dummy/config"
+  }
+}

package/yalc.lock

@@ -0,0 +1,10 @@
+{
+  "version": "v1",
+  "packages": {
+    "ember-sortable": {
+      "signature": "ab25b0d0909fb9a6a84df88f6bf1f2f5",
+      "file": true,
+      "replaced": "^4.0.0"
+    }
+  }
+}