Merge branch 'develop' into rav/roomview_works

src/SlashCommands.js

@@ -352,11 +352,12 @@ module.exports = {
     },
 
     getCommandList: function() {
-        // Return all the commands plus /me which isn't handled like normal commands
+        // Return all the commands plus /me and /markdown which aren't handled like normal commands
         var cmds = Object.keys(commands).sort().map(function(cmdKey) {
             return commands[cmdKey];
         })
         cmds.push(new Command("me", "<action>", function(){}));
+        cmds.push(new Command("markdown", "<on|off>", function(){}));
 
         return cmds;
     }

src/components/views/elements/TruncatedList.js

@@ -51,7 +51,7 @@ module.exports = React.createClass({
         if (this.props.truncateAt >= 0) {
             var overflowCount = childCount - this.props.truncateAt;
 
-            if (overflowCount > 0) {
+            if (overflowCount > 1) {
                 overflowJsx = this.props.createOverflowElement(
                     overflowCount, childCount
                 );

src/components/views/rooms/InviteMemberList.js

@@ -89,7 +89,7 @@ module.exports = React.createClass({
         }
 
         return (
-            <SearchableEntityList searchPlaceholderText={"Invite / Search"}
+            <SearchableEntityList searchPlaceholderText={"Invite/search by name, email, id"}
                 onSubmit={this.props.onInvite}
                 onQueryChanged={this.onSearchQueryChanged}
                 entities={entities}

src/components/views/rooms/MemberList.js

@@ -35,21 +35,23 @@ var invite_defer = q.defer();
 
 module.exports = React.createClass({
     displayName: 'MemberList',
+
     getInitialState: function() {
-        if (!this.props.roomId) return { members: [] };
-        var cli = MatrixClientPeg.get();
-        var room = cli.getRoom(this.props.roomId);
-        if (!room) return { members: [] };
-
-        this.memberDict = this.getMemberDict();
-
-        var members = this.roomMembers(INITIAL_LOAD_NUM_MEMBERS);
-        return {
-            members: members,
+        var state = {
+            members: [],
             // ideally we'd size this to the page height, but
             // in practice I find that a little constraining
             truncateAt: INITIAL_LOAD_NUM_MEMBERS,
         };
+        if (!this.props.roomId) return state;
+        var cli = MatrixClientPeg.get();
+        var room = cli.getRoom(this.props.roomId);
+        if (!room) return state;
+
+        this.memberDict = this.getMemberDict();
+
+        state.members = this.roomMembers(INITIAL_LOAD_NUM_MEMBERS);
+        return state;
     },
 
     componentWillMount: function() {

src/components/views/rooms/SearchableEntityList.js

@@ -140,6 +140,7 @@ var SearchableEntityList = React.createClass({
         }
 
         var list;
+        if (this.state.results.length) {
             if (this.props.truncateAt) { // caller wants list truncated
                 var TruncatedList = sdk.getComponent("elements.TruncatedList");
                 list = (
@@ -161,13 +162,15 @@ var SearchableEntityList = React.createClass({
                     </div>
                 );
             }
+            list = <GeminiScrollbar autoshow={true} className="mx_SearchableEntityList_listWrapper">
+                        { list }
+                    </GeminiScrollbar>;
+        }
 
         return (
             <div className={ "mx_SearchableEntityList " + (this.state.query.length ? "mx_SearchableEntityList_expanded" : "") }>
-                {inputBox}
-                <GeminiScrollbar autoshow={true} className="mx_SearchableEntityList_listWrapper">
+                { inputBox }
                 { list }
-                </GeminiScrollbar>
                 { this.state.query.length ? <div className="mx_SearchableEntityList_hrWrapper"><hr/></div> : '' }
             </div>
         );