mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-10-31 16:21:46 +01:00 
			
		
		
		
	WIP search stuff
This commit is contained in:
		
							parent
							
								
									00a7ea994a
								
							
						
					
					
						commit
						0bfb1416c1
					
				| @ -38,7 +38,7 @@ module.exports = { | ||||
|             uploadingRoomSettings: false, | ||||
|             numUnreadMessages: 0, | ||||
|             draggingFile: false, | ||||
|             searching: false, | ||||
|             searchResults: [], | ||||
|         } | ||||
|     }, | ||||
| 
 | ||||
| @ -357,6 +357,16 @@ module.exports = { | ||||
|         return WhoIsTyping.whoIsTypingString(this.state.room); | ||||
|     }, | ||||
| 
 | ||||
|     onSearch: function(term) { | ||||
|         MatrixClientPeg.get().searchMessageText(term).then(function(data) { | ||||
|             self.setState({ | ||||
|                 searchResults: data, | ||||
|             }); | ||||
|         }, function(error) { | ||||
|             // TODO: show dialog or something
 | ||||
|         }); | ||||
|     }, | ||||
| 
 | ||||
|     getEventTiles: function() { | ||||
|         var DateSeparator = sdk.getComponent('molecules.DateSeparator'); | ||||
| 
 | ||||
| @ -365,6 +375,10 @@ module.exports = { | ||||
| 
 | ||||
|         var EventTile = sdk.getComponent('molecules.EventTile'); | ||||
| 
 | ||||
|         if (this.state.searchResults.length) { | ||||
|             return ret; | ||||
|         } | ||||
| 
 | ||||
|         for (var i = this.state.room.timeline.length-1; i >= 0 && count < this.state.messageCap; --i) { | ||||
|             var mxEv = this.state.room.timeline[i]; | ||||
| 
 | ||||
|  | ||||
| @ -63,10 +63,6 @@ module.exports = React.createClass({ | ||||
|         this.setState(this.getInitialState()); | ||||
|     }, | ||||
| 
 | ||||
|     onSearchClick: function() { | ||||
|         this.setState({searching: true}); | ||||
|     }, | ||||
| 
 | ||||
|     onConferenceNotificationClick: function() { | ||||
|         dis.dispatch({ | ||||
|             action: 'place_call', | ||||
| @ -203,7 +199,7 @@ module.exports = React.createClass({ | ||||
|                 aux = <Loader/>; | ||||
|             } | ||||
|             else if (this.state.searching) { | ||||
|                 aux = <SearchBar onCancelClick={this.onCancelClick}/>; | ||||
|                 aux = <SearchBar ref="search_bar" onCancelClick={this.onCancelClick} onSearch={this.onSearch}/>; | ||||
|             } | ||||
| 
 | ||||
|             var conferenceCallNotification = null; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user