Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrating flow-router into 2.0 #368

Merged
merged 1 commit into from
Jul 29, 2015
Merged

Migrating flow-router into 2.0 #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .meteor/packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ chrismbeckett:toastr
francocatena:status
jparker:gravatar
kevohagan:sweetalert
meteorhacks:flow-layout
meteorhacks:flow-router
meteorhacks:kadira
mizzao:autocomplete
mizzao:timesync
Expand All @@ -76,3 +74,5 @@ reactive-dict
yasinuslu:blaze-meta
nimble:restivus
dispatch:run-as-user
kadira:flow-router
kadira:blaze-layout
4 changes: 2 additions & 2 deletions .meteor/versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ jparker:crypto-md5@0.1.1
jparker:gravatar@0.3.1
jquery@1.11.3_2
json@1.0.3
kadira:blaze-layout@2.0.0
kadira:flow-router@2.0.0
kevohagan:sweetalert@1.0.0
konecty:autolinker@1.0.2
konecty:change-case@2.3.0
Expand All @@ -73,8 +75,6 @@ matb33:collection-hooks@0.7.13
meteor@1.1.6
meteor-developer@1.1.3
meteor-platform@1.2.2
meteorhacks:flow-layout@1.4.2
meteorhacks:flow-router@1.19.0
meteorhacks:kadira@2.22.1
meteorhacks:meteorx@1.3.1
meteorspark:util@0.2.0
Expand Down
6 changes: 3 additions & 3 deletions client/routes/roomRoute.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FlowRouter.route '/room/:_id',
action: (params, queryParams) ->
Session.set 'openedRoom', null

FlowLayout.render 'main', {center: 'loading'}
BlazeLayout.render 'main', {center: 'loading'}

Meteor.defer ->
track = Tracker.autorun ->
Expand Down Expand Up @@ -42,5 +42,5 @@ FlowRouter.route '/room/:_id',
if child?
if child.classList.contains('room-container')
child.oldScrollTop = child.querySelector('.messages-box > .wrapper').scrollTop
child.remove()
]
child.remove()
]
10 changes: 5 additions & 5 deletions client/routes/router.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Blaze.registerHelper 'pathFor', (path, kw) ->
return FlowRouter.path path, kw.hash

FlowLayout.setRoot 'body'
BlazeLayout.setRoot 'body'


FlowRouter.subscriptions = ->
Expand Down Expand Up @@ -32,20 +32,20 @@ FlowRouter.route '/home',
name: 'home'

action: ->
FlowLayout.render 'main', {center: 'home'}
BlazeLayout.render 'main', {center: 'home'}
KonchatNotification.getDesktopPermission()

FlowRouter.route '/changeavatar',
name: 'changeAvatar'

action: ->
FlowLayout.render 'main', {center: 'avatarPrompt'}
BlazeLayout.render 'main', {center: 'avatarPrompt'}

FlowRouter.route '/settings/:group?',
name: 'settings'

action: ->
FlowLayout.render 'main', {center: 'settings'}
BlazeLayout.render 'main', {center: 'settings'}

FlowRouter.route '/history/private',
name: 'privateHistory'
Expand All @@ -55,4 +55,4 @@ FlowRouter.route '/history/private',

action: ->
Session.setDefault('historyFilter', '')
FlowLayout.render 'main', {center: 'privateHistory'}
BlazeLayout.render 'main', {center: 'privateHistory'}