Do not trigger unnecessary reloads when locale *could* have changed
This commit is contained in:
parent
3fdd2d50ab
commit
72f14fb594
|
@ -39,6 +39,7 @@ Travis.Router = Ember.Router.extend
|
||||||
@set 'repoController.lineNumberHash', match[0]
|
@set 'repoController.lineNumberHash', match[0]
|
||||||
|
|
||||||
reload: ->
|
reload: ->
|
||||||
|
console.log 'Triggering reload'
|
||||||
url = @get('location').getURL()
|
url = @get('location').getURL()
|
||||||
@transitionTo('loading')
|
@transitionTo('loading')
|
||||||
# Without ember next @route sometimes hit the place where HistoryLocation
|
# Without ember next @route sometimes hit the place where HistoryLocation
|
||||||
|
|
|
@ -8,8 +8,9 @@
|
||||||
|
|
||||||
localeDidChange: (->
|
localeDidChange: (->
|
||||||
if locale = Travis.app.get('auth.user.locale')
|
if locale = Travis.app.get('auth.user.locale')
|
||||||
Travis.setLocale(locale)
|
if Travis.needsLocaleChange(locale)
|
||||||
Travis.app.get('router').reload()
|
Travis.setLocale(locale)
|
||||||
|
Travis.app.get('router').reload()
|
||||||
).observes('Travis.app.auth.user.locale')
|
).observes('Travis.app.auth.user.locale')
|
||||||
|
|
||||||
click: (event) ->
|
click: (event) ->
|
||||||
|
|
|
@ -40,6 +40,9 @@ require 'ext/ember/namespace'
|
||||||
I18n.locale = locale
|
I18n.locale = locale
|
||||||
localStorage.setItem('travis.locale', locale)
|
localStorage.setItem('travis.locale', locale)
|
||||||
|
|
||||||
|
needsLocaleChange: (locale) ->
|
||||||
|
I18n.locale != locale
|
||||||
|
|
||||||
run: (attrs) ->
|
run: (attrs) ->
|
||||||
location.href = location.href.replace('#!/', '') if location.hash.slice(0, 2) == '#!'
|
location.href = location.href.replace('#!/', '') if location.hash.slice(0, 2) == '#!'
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
a6f7d323
|
b4eb0b8e
|
Loading…
Reference in New Issue
Block a user