diff --git a/src/web/app/mobile/tags/users-list.tag b/src/web/app/mobile/tags/users-list.tag index 82dfa3df45..e323f23f96 100644 --- a/src/web/app/mobile/tags/users-list.tag +++ b/src/web/app/mobile/tags/users-list.tag @@ -1,15 +1,18 @@ <mk-users-list> - <nav><span data-is-active={ mode == 'all' } onclick={ setMode.bind(this, 'all') }>すべて<span>{ opts.count }</span></span> - <!-- ↓ https://github.com/riot/riot/issues/2080--><span if={ SIGNIN && opts.youKnowCount != '' } data-is-active={ mode == 'iknow' } onclick={ setMode.bind(this, 'iknow') }>知り合い<span>{ opts.youKnowCount }</span></span> + <nav> + <span data-is-active={ mode == 'all' } onclick={ setMode.bind(this, 'all') }>すべて<span>{ opts.count }</span></span> + <!-- ↓ https://github.com/riot/riot/issues/2080--> + <span if={ SIGNIN && opts.youKnowCount != '' } data-is-active={ mode == 'iknow' } onclick={ setMode.bind(this, 'iknow') }>知り合い<span>{ opts.youKnowCount }</span></span> </nav> <div class="users" if={ !fetching && users.length != 0 }> <mk-user-preview each={ users } user={ this }></mk-user-preview> </div> - <button class="more" if={ !fetching && next != null } onclick={ more } disabled={ moreFetching }><span if={ !moreFetching }>もっと</span><span if={ moreFetching }>読み込み中 - <mk-ellipsis></mk-ellipsis></span></button> + <button class="more" if={ !fetching && next != null } onclick={ more } disabled={ moreFetching }> + <span if={ !moreFetching }>もっと</span> + <span if={ moreFetching }>読み込み中<mk-ellipsis></mk-ellipsis></span></button> <p class="no" if={ !fetching && users.length == 0 }>{ opts.noUsers }</p> - <p class="fetching" if={ fetching }><i class="fa fa-spinner fa-pulse fa-fw"></i>読み込んでいます - <mk-ellipsis></mk-ellipsis> + <p class="fetching" if={ fetching }> + <i class="fa fa-spinner fa-pulse fa-fw"></i>読み込んでいます<mk-ellipsis></mk-ellipsis> </p> <style> :scope @@ -100,7 +103,7 @@ this.update({ moreFetching: true }); - this.opts.fetch(this.mode == 'iknow', this.limit, this.cursor, obj => { + this.opts.fetch(this.mode == 'iknow', this.limit, this.next, obj => { this.update({ moreFetching: false, users: this.users.concat(obj.users),