From 3a34051bb1ab72878a13071eadff056d8c4fb539 Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Fri, 2 Jan 2015 17:48:34 +0100 Subject: [PATCH] Made search term resilient to UI refresh --- frontend/delta/js/Clipperz/PM/UI/Components/Selections.js | 2 +- frontend/delta/js/Clipperz/PM/UI/MainController.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Selections.js b/frontend/delta/js/Clipperz/PM/UI/Components/Selections.js index d396e11..1615f0a 100644 --- a/frontend/delta/js/Clipperz/PM/UI/Components/Selections.js +++ b/frontend/delta/js/Clipperz/PM/UI/Components/Selections.js @@ -79,7 +79,7 @@ Clipperz.PM.UI.Components.Selections = React.createClass({ React.DOM.form({'className':'searchForm'}, [ React.DOM.div({}, [ React.DOM.label({'htmlFor':'searchValue'}, 'search'), - React.DOM.input({'type':'text', 'id':'searchValue', 'onFocus':this.handleSearchChange, 'onChange':this.handleSearchChange, 'name':'search'}) + React.DOM.input({'type':'text', 'id':'searchValue', 'onFocus':this.handleSearchChange, 'onChange':this.handleSearchChange, 'name':'search', 'value':this.props['searchTerm']}) ]), React.DOM.div({}, [ React.DOM.span({'className':'count'}, selectedCardCount) ]) ]) diff --git a/frontend/delta/js/Clipperz/PM/UI/MainController.js b/frontend/delta/js/Clipperz/PM/UI/MainController.js index ed7397f..3c02876 100644 --- a/frontend/delta/js/Clipperz/PM/UI/MainController.js +++ b/frontend/delta/js/Clipperz/PM/UI/MainController.js @@ -496,7 +496,7 @@ console.log("SET USER", aUser); selectedCardReference: function () { return this.pages()['mainPage'].props && this.pages()['mainPage'].props['selectedCard'] && - this.pages()['mainPage'].props['selectedCard'] && +// this.pages()['mainPage'].props['selectedCard'] && this.pages()['mainPage'].props['selectedCard']['_reference'] ? this.pages()['mainPage'].props['selectedCard']['_reference'] : ''; @@ -722,7 +722,6 @@ console.log("SET USER", aUser); }, runDirectLogin_handler: function (someParameters) { -//console.log("RUN DIRECT LOGIN", someParameters); var deferredResult; deferredResult = new Clipperz.Async.Deferred('MainController.runDirectLogin', {trace:false}); @@ -1259,7 +1258,6 @@ console.log("SET USER", aUser); }, search_handler: function (aValue) { -//console.log("SEARCH", aValue); this.resetCardSelection(); if (aValue == "") { @@ -1268,6 +1266,7 @@ console.log("SET USER", aUser); this.setFilter('SEARCH', aValue); } + this.setPageProperties('mainPage', 'searchTerm', aValue); return this.refreshSelectedCards(); },