From: Greg Pazo Date: Mon, 29 Sep 2014 19:56:58 +0000 (-0400) Subject: Merge pull request #1858 from shackbarth/1854 X-Git-Tag: v4.7.0-beta.2~1 X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=78cafc1dcc6c67f29dc61d5c88ee91d99cbb0ed6;hp=-c;p=xtuple Merge pull request #1858 from shackbarth/1854 allow headers on transaction lists --- 78cafc1dcc6c67f29dc61d5c88ee91d99cbb0ed6 diff --combined lib/enyo-x/source/views/transaction_list_container.js index 2116df4d1,aeab3307d..7e3518e83 --- a/lib/enyo-x/source/views/transaction_list_container.js +++ b/lib/enyo-x/source/views/transaction_list_container.js @@@ -33,8 -33,7 +33,8 @@@ trailing:true, white:true, strict:false onListItemMenuTap: "showListItemMenu", onParameterChange: "requery", onProcessingChanged: "processingChanged", - onSelectionChanged: "selectionChanged" + onSelectionChanged: "selectionChanged", + onUpdateHeader: "updateHeader" }, init: false, components: [ @@@ -49,7 -48,7 +49,7 @@@ {kind: "onyx.Menu", name: "actionMenu"} ]} ]}, - {classes: "xv-header", content: "_search".loc()}, + {classes: "xv-header", name: "transactionListHeader", content: "_search".loc()}, {kind: "XV.ScrollableGroupbox", name: "parameterScroller", classes: "xv-search-container", fit: true} ]}, {name: "listPanel", kind: "FittableRows", components: [ @@@ -227,7 -226,8 +227,8 @@@ */ setList: function (options) { var component, - list = options.list; + contentHeader = this.$.contentHeader, + list = options.list; component = this.createComponent({ name: "list", @@@ -248,6 -248,12 +249,12 @@@ memoizeEnabled: false, fit: true }); + + contentHeader.destroyClientControls(); + if (component.headerComponents) { + contentHeader.createComponents(component.headerComponents); + contentHeader.render(); + } } this.init = true; @@@ -271,14 -277,6 +278,14 @@@ for (i = 0; i < collection.length; i++) { collection.at(i).transactionDate = transDate; } + }, + updateHeader: function (inSender, inEvent) { + if (inEvent.noItemFound) { + this.$.transactionListHeader.setContent("_noItemFound".loc() + ": " + inEvent.data); + + } else if (this.$.transactionListHeader.getContent() !== "_search".loc()) { + this.$.transactionListHeader.setContent(""); + } } };