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

Resolved race condition when starting adapter after logging in. #29

Open
wants to merge 2 commits into
base: more_ziniki
Choose a base branch
from
Open

Resolved race condition when starting adapter after logging in. #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
550033e
Resolved race condition when starting adapter after logging in.
gmmapowell Oct 17, 2013
0a7054c
Used latest ziniki.js
gmmapowell Oct 25, 2013
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
1 change: 0 additions & 1 deletion app/initializers/ziniki.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var initializer = {
after: 'store',

initialize: function (container, application) {
Ember.Logger.log("Should be an initializer");
Ziniki.init(host + "/resources", host + "/adapter");
var dashboard = ZinikiSerializer.mapType(Glazier.Dashboard, "dashboard", "us.yapp.glazier.Dashboard", "us.yapp.glazier.dashboard");
// Glazier's rails server stupidly uses non-standard ids
Expand Down
4 changes: 1 addition & 3 deletions app/routes/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ var ApplicationRoute = Ember.Route.extend({
var userController = this.controllerFor('user');
var login = this.container.lookup('behavior:login');

login().then(function(user){
return login().then(function(user){
// null object pattern might be better.
if (user) {
userController.set('content', user);
}
});

return null; // Ziniki related race condition
},
setupController: function(data) {
this.controllerFor('application').set('isReady', true);
Expand Down
2 changes: 1 addition & 1 deletion glazier-server
Open in desktop
Submodule glazier-server updated 5 files
+1 −1 app/controllers/dashboards_controller.rb
+0 −5 app/controllers/sections_controller.rb
+0 −4 app/serializers/shallow_dashboard_serializer.rb
+1 −1 config/routes.rb
+0 −8 spec/controllers/sections_controller_spec.rb
352 changes: 0 additions & 352 deletions vendor/ziniki-ea.js
View file
Open in desktop

This file was deleted.

Loading