From 72f14fb594a134ba759f454fa419f6eac057cab5 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 22 Oct 2012 21:27:03 +0200 Subject: [PATCH] Do not trigger unnecessary reloads when locale *could* have changed --- assets/scripts/app/routes.coffee | 1 + assets/scripts/app/views/application.coffee | 5 +++-- assets/scripts/travis.coffee | 3 +++ public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- public/version | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 114858cd..cbb078f3 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -39,6 +39,7 @@ Travis.Router = Ember.Router.extend @set 'repoController.lineNumberHash', match[0] reload: -> + console.log 'Triggering reload' url = @get('location').getURL() @transitionTo('loading') # Without ember next @route sometimes hit the place where HistoryLocation diff --git a/assets/scripts/app/views/application.coffee b/assets/scripts/app/views/application.coffee index 57c2a90e..8e0576f5 100644 --- a/assets/scripts/app/views/application.coffee +++ b/assets/scripts/app/views/application.coffee @@ -8,8 +8,9 @@ localeDidChange: (-> if locale = Travis.app.get('auth.user.locale') - Travis.setLocale(locale) - Travis.app.get('router').reload() + if Travis.needsLocaleChange(locale) + Travis.setLocale(locale) + Travis.app.get('router').reload() ).observes('Travis.app.auth.user.locale') click: (event) -> diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 9489ad32..851fd04a 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -40,6 +40,9 @@ require 'ext/ember/namespace' I18n.locale = locale localStorage.setItem('travis.locale', locale) + needsLocaleChange: (locale) -> + I18n.locale != locale + run: (attrs) -> location.href = location.href.replace('#!/', '') if location.hash.slice(0, 2) == '#!' diff --git a/public/scripts/app.js b/public/scripts/app.js index bf889173..e454acb1 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -30753,4 +30753,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher_key);\n this.tailing = new Travis.Tailing();\n return this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n },\n storeAfterSignInPath: function(path) {\n return this.get('auth').storeAfterSignInPath(path);\n },\n autoSignIn: function(path) {\n return this.get('auth').autoSignIn(path);\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('afterSignOut');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('