From b7be44af4a1a1f78a7fc8a4bbcb90a4dbcb14a44 Mon Sep 17 00:00:00 2001 From: hdsdi3g Date: Mon, 18 May 2015 01:50:33 +0200 Subject: [PATCH] Update #103, force integrated search to lowercase, activate search only for directories. --- app/hd3gtv/mydmam/web/stat/Stat.java | 2 ++ app/react/mydmam/async/navigate/NavigatePage.jsx | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/hd3gtv/mydmam/web/stat/Stat.java b/app/hd3gtv/mydmam/web/stat/Stat.java index df02670b..dae94ce4 100644 --- a/app/hd3gtv/mydmam/web/stat/Stat.java +++ b/app/hd3gtv/mydmam/web/stat/Stat.java @@ -160,6 +160,8 @@ public Stat setJsonSearch(String json_search) { search = gson.fromJson(json_search, String.class); if (search.trim().equals("")) { search = null; + } else { + search = search.toLowerCase(); } return this; } diff --git a/app/react/mydmam/async/navigate/NavigatePage.jsx b/app/react/mydmam/async/navigate/NavigatePage.jsx index fa20422f..9f84c05f 100644 --- a/app/react/mydmam/async/navigate/NavigatePage.jsx +++ b/app/react/mydmam/async/navigate/NavigatePage.jsx @@ -129,7 +129,13 @@ navigate.NavigatePage = React.createClass({ inputboxsearch: dom_inputbox, }); } - this.navigateTo(this.state.pathindex, 0, this.state.default_page_size, null); + var stat = this.state.stat[md5(this.state.pathindex)]; + if (!stat) { + return; + } + if (stat.reference.directory) { + this.navigateTo(this.state.pathindex, 0, this.state.default_page_size, null); + } }, render: function() { var stat = this.state.stat[md5(this.state.pathindex)];