summaryrefslogtreecommitdiff
path: root/src/web/app/mobile
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-02-20 14:33:30 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-02-20 14:33:30 +0900
commit12cba7a76d368c21468c1dd4ddb0b5b164e1d9ae (patch)
tree4466feb3f4b796fafe5d2deca422333d95a6cf4d /src/web/app/mobile
parentUpdate room.tag (diff)
downloadmisskey-12cba7a76d368c21468c1dd4ddb0b5b164e1d9ae.tar.gz
misskey-12cba7a76d368c21468c1dd4ddb0b5b164e1d9ae.tar.bz2
misskey-12cba7a76d368c21468c1dd4ddb0b5b164e1d9ae.zip
wip
Diffstat (limited to 'src/web/app/mobile')
-rw-r--r--src/web/app/mobile/tags/follow-button.tag16
-rw-r--r--src/web/app/mobile/tags/notify.tag8
-rw-r--r--src/web/app/mobile/tags/stream-indicator.tag12
-rw-r--r--src/web/app/mobile/tags/user-followers.tag2
-rw-r--r--src/web/app/mobile/tags/user-following.tag2
-rw-r--r--src/web/app/mobile/tags/user-timeline.tag4
-rw-r--r--src/web/app/mobile/tags/user.tag2
-rw-r--r--src/web/app/mobile/tags/users-list.tag2
8 files changed, 24 insertions, 24 deletions
diff --git a/src/web/app/mobile/tags/follow-button.tag b/src/web/app/mobile/tags/follow-button.tag
index 71a38254d4..ff4c6586d0 100644
--- a/src/web/app/mobile/tags/follow-button.tag
+++ b/src/web/app/mobile/tags/follow-button.tag
@@ -58,7 +58,7 @@
this.wait = false
this.on('mount', () => {
- @user-promise.then (user) =>
+ this.user-promise.then (user) =>
this.user = user
this.init = false
this.update();
@@ -70,22 +70,22 @@
this.stream.off 'unfollow' this.on-stream-unfollow
this.on-stream-follow = (user) => {
- if user.id == @user.id
+ if user.id == this.user.id
this.user = user
this.update();
this.on-stream-unfollow = (user) => {
- if user.id == @user.id
+ if user.id == this.user.id
this.user = user
this.update();
this.onclick = () => {
this.wait = true
- if @user.is_following
+ if this.user.is_following
this.api 'following/delete' do
- user_id: @user.id
+ user_id: this.user.id
.then =>
- @user.is_following = false
+ this.user.is_following = false
.catch (err) ->
console.error err
.then =>
@@ -93,9 +93,9 @@
this.update();
else
this.api 'following/create' do
- user_id: @user.id
+ user_id: this.user.id
.then =>
- @user.is_following = true
+ this.user.is_following = true
.catch (err) ->
console.error err
.then =>
diff --git a/src/web/app/mobile/tags/notify.tag b/src/web/app/mobile/tags/notify.tag
index 5d27860e41..3003528fe4 100644
--- a/src/web/app/mobile/tags/notify.tag
+++ b/src/web/app/mobile/tags/notify.tag
@@ -17,17 +17,17 @@
</style>
<script>
this.on('mount', () => {
- Velocity this.root, {
+ Velocity(this.root, {
bottom: '0px'
- } {
+ }, {
duration: 500ms
easing: 'ease-out'
}
setTimeout =>
- Velocity this.root, {
+ Velocity(this.root, {
bottom: '-64px'
- } {
+ }, {
duration: 500ms
easing: 'ease-out'
complete: =>
diff --git a/src/web/app/mobile/tags/stream-indicator.tag b/src/web/app/mobile/tags/stream-indicator.tag
index c3669c0744..9ca311c479 100644
--- a/src/web/app/mobile/tags/stream-indicator.tag
+++ b/src/web/app/mobile/tags/stream-indicator.tag
@@ -30,24 +30,24 @@
this.mixin('stream');
this.on('before-mount', () => {
- this.state = @get-stream-state!
+ this.state = this.getStreamState();
- if @state == 'connected'
+ if this.state == 'connected'
this.root.style.opacity = 0
this.stream-state-ev.on('connected', () => {
- this.state = @get-stream-state!
+ this.state = this.getStreamState();
this.update();
setTimeout =>
- Velocity this.root, {
+ Velocity(this.root, {
opacity: 0
} 200ms 'linear'
, 1000ms
this.stream-state-ev.on('closed', () => {
- this.state = @get-stream-state!
+ this.state = this.getStreamState();
this.update();
- Velocity this.root, {
+ Velocity(this.root, {
opacity: 1
} 0ms
</script>
diff --git a/src/web/app/mobile/tags/user-followers.tag b/src/web/app/mobile/tags/user-followers.tag
index 4eafb1ed90..cdde081dc7 100644
--- a/src/web/app/mobile/tags/user-followers.tag
+++ b/src/web/app/mobile/tags/user-followers.tag
@@ -12,7 +12,7 @@
this.fetch = (iknow, limit, cursor, cb) => {
this.api 'users/followers' do
- user_id: @user.id
+ user_id: this.user.id
iknow: iknow
limit: limit
cursor: if cursor? then cursor else undefined
diff --git a/src/web/app/mobile/tags/user-following.tag b/src/web/app/mobile/tags/user-following.tag
index 25d3c9926e..37ee0ee390 100644
--- a/src/web/app/mobile/tags/user-following.tag
+++ b/src/web/app/mobile/tags/user-following.tag
@@ -12,7 +12,7 @@
this.fetch = (iknow, limit, cursor, cb) => {
this.api 'users/following' do
- user_id: @user.id
+ user_id: this.user.id
iknow: iknow
limit: limit
cursor: if cursor? then cursor else undefined
diff --git a/src/web/app/mobile/tags/user-timeline.tag b/src/web/app/mobile/tags/user-timeline.tag
index 82a6413546..80311924fa 100644
--- a/src/web/app/mobile/tags/user-timeline.tag
+++ b/src/web/app/mobile/tags/user-timeline.tag
@@ -16,7 +16,7 @@
this.init = new Promise (res, rej) =>
this.api 'users/posts' do
- user_id: @user.id
+ user_id: this.user.id
with_media: @with-media
.then (posts) =>
res posts
@@ -24,7 +24,7 @@
this.more = () => {
this.api 'users/posts' do
- user_id: @user.id
+ user_id: this.user.id
with_media: @with-media
max_id: this.refs.timeline.tail!.id
</script>
diff --git a/src/web/app/mobile/tags/user.tag b/src/web/app/mobile/tags/user.tag
index d36455e6e9..660b08879d 100644
--- a/src/web/app/mobile/tags/user.tag
+++ b/src/web/app/mobile/tags/user.tag
@@ -165,7 +165,7 @@
this.on('mount', () => {
this.api 'users/show' do
- username: @username
+ username: this.username
.then (user) =>
this.fetching = false
this.user = user
diff --git a/src/web/app/mobile/tags/users-list.tag b/src/web/app/mobile/tags/users-list.tag
index fc582e2665..ef225d5b5d 100644
--- a/src/web/app/mobile/tags/users-list.tag
+++ b/src/web/app/mobile/tags/users-list.tag
@@ -102,7 +102,7 @@
this.mode == 'iknow'
@limit
@cursor
- this.users = @users.concat obj.users
+ this.users = this.users.concat obj.users
this.next = obj.next
this.more-fetching = false
this.update();