OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

add error dialogs and order search results by recents

pull/351/head
Matthew Hodgson 2015-11-08 16:19:53 +00:00
parent d462e0b21b
commit 9526deb024
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/controllers/organisms/RoomView.js
View File

@ -350,8 +350,12 @@ module.exports = {
self.setState({ self.setState({
upload: undefined upload: undefined
}); });
}).done(undefined, function() { }).done(undefined, function(error) {
// display error message var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Failed to upload file",
description: error.toString()
});
}); });
}, },
@ -377,6 +381,7 @@ module.exports = {
room_events: { room_events: {
search_term: term, search_term: term,
filter: filter, filter: filter,
order_by: "recent",
event_context: { event_context: {
before_limit: 1, before_limit: 1,
after_limit: 1, after_limit: 1,
@ -390,7 +395,11 @@ module.exports = {
searchResults: data, searchResults: data,
}); });
}, function(error) { }, function(error) {
// TODO: show dialog or something var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Search failed",
description: error.toString()
});
}); });
}, },
@ -408,7 +417,7 @@ module.exports = {
var eventIds = Object.keys(results); var eventIds = Object.keys(results);
// XXX: todo: merge overlapping results somehow? // XXX: todo: merge overlapping results somehow?
// XXX: why doesn't searching on name work? // XXX: why doesn't searching on name work?
var resultList = eventIds.map(function(key) { return results[key]; }).sort(function(a, b) { b.rank - a.rank }); var resultList = eventIds.map(function(key) { return results[key]; }); // .sort(function(a, b) { b.rank - a.rank });
for (var i = 0; i < resultList.length; i++) { for (var i = 0; i < resultList.length; i++) {
var ts1 = resultList[i].result.origin_server_ts; var ts1 = resultList[i].result.origin_server_ts;
ret.push(<li key={ts1 + "-search"}><DateSeparator ts={ts1}/></li>); // Rank: {resultList[i].rank} ret.push(<li key={ts1 + "-search"}><DateSeparator ts={ts1}/></li>); // Rank: {resultList[i].rank}