diff --git a/package.json b/package.json index 0d0c6323839bc6ea84b0a5f495058b5266b3089a..8cd65bbe36f604e62177f5f34b96d1de810a7afd 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,10 @@ "axios": "^0.17.1", "client-oauth2": "^4.2.0", "mithril": "^1.1.6", - "mithril-infinite": "^1.2.0", - "polythene-core-css": "^1.0.0", - "polythene-css": "^1.0.0", - "polythene-mithril": "^1.0.0", + "mithril-infinite": "^1.2.4", + "polythene-core-css": "^1.2.0", + "polythene-css": "^1.2.0", + "polythene-mithril": "^1.2.0", "querystring": "^0.2.0" }, "devDependencies": { diff --git a/src/groups/viewGroup.js b/src/groups/viewGroup.js index 0f10de47b699722dccb99579b111249b12a6ccdf..0ed9a3242b29d1e43e686126a59d5a4485504bc1 100644 --- a/src/groups/viewGroup.js +++ b/src/groups/viewGroup.js @@ -60,12 +60,14 @@ class MembersTable { group: this.group_id, }).then(() => { this.ctrl.refresh(); + m.redraw(); }); }, onCancel: () => { this.addmode = false; m.redraw(); }, selectedText: user => `${user.firstname} ${user.lastname}`, }) : '', m(TableView, { + tableHeight: '420px', controller: this.ctrl, keys: ['user.lastname', 'user.firstname', 'user.email'], tileContent: data => this.itemRow(data), diff --git a/src/views/selectList.js b/src/views/selectList.js index 3dd17fa65139f3d4797923e4d5343dd0f51cb748..ed2f98df709637d55e3cc9263a386cf19a68eb8c 100644 --- a/src/views/selectList.js +++ b/src/views/selectList.js @@ -146,7 +146,7 @@ export default class SelectList { defaultValue: '', })), (this.showList && !this.selected) ? m(List, { - className: 'scrollTable', + style: { height: '400px' }, tiles: m(infinite, controller.infiniteScrollParams(this.item())), }) : null, ]); diff --git a/src/views/tableView.js b/src/views/tableView.js index 91ef8bed14b30d8272432092abe4717b1ed2433b..d9b8b486625b69a17dbbf3877b07363b3154552c 100644 --- a/src/views/tableView.js +++ b/src/views/tableView.js @@ -10,7 +10,8 @@ const tableStyles = [ '.tabletool': { display: 'grid', height: '100%', - 'grid-template-rows': '48px calc(100% - 48px)', + 'grid-template-rows': '48px calc(100% - 78px)', + 'background-color': 'white', }, '.toolbar': { 'grid-row': 1, @@ -18,7 +19,6 @@ const tableStyles = [ }, '.scrollTable': { 'grid-row': 2, - 'background-color': 'white', }, '.tableTile': { padding: '10px', @@ -84,6 +84,7 @@ export default class TableView { controller, titles, onAdd = () => {}, + tableHeight = false, }, }) { const updateList = debounce(() => { @@ -115,6 +116,7 @@ export default class TableView { }), m(List, { className: 'scrollTable', + style: tableHeight ? { height: tableHeight } : {}, tiles: [ m(ListTile, { className: 'tableTile',