Skip to content

replaces events hash with actions hash #5

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

replaces events hash with actions hash #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a098972
replaces events hash with actions hash
kavitshah8 Nov 17, 2014
63d8622
uses new pattern for sending response from the server
kavitshah8 Nov 17, 2014
65da38a
adds signle quotes in link-to action helpers
kavitshah8 Nov 19, 2014
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
8 changes: 4 additions & 4 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<div class="navbar-inner">
<a class="brand" href="#">Ember Digest</a>
<ul class="nav pull-right">
<li>{{#linkTo articles}}Articles{{/linkTo}}</li>
<li>{{#linkTo photos}}Photos{{/linkTo}}</li>
<li>{{#linkTo login}}Login{{/linkTo}}</li>
<li>{{#linkTo 'articles'}}Articles{{/linkTo}}</li>
<li>{{#linkTo 'photos'}}Photos{{/linkTo}}</li>
<li>{{#linkTo 'login'}}Login{{/linkTo}}</li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -63,7 +63,7 @@ <h2>Photos</h2>
{{#if loggedIn}}
<p>You are already logged in!</p>
{{else}}
<form class="form-inline" {{action login on="submit"}}>
<form class="form-inline" {{action 'login' on="submit"}}>
<h2>Log In</h2>
{{input value=username type="text" placeholder="Username"}}
{{input value=password type="password" placeholder="Password"}}
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ App.AuthenticatedRoute = Ember.Route.extend({
return $.getJSON(url, { token: token });
},

events: {
actions: {
error: function(reason, transition) {
if (reason.status === 401) {
this.redirectToLogin(transition);
Expand Down
2 changes: 1 addition & 1 deletion server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function validTokenProvided(req, res) {
var userToken = req.body.token || req.param('token') || req.headers.token;

if (!currentToken || userToken != currentToken) {
res.send(401, { error: 'Invalid token. You provided: ' + userToken });
res.status(401).send({ error: 'Invalid token. You provided: ' + userToken });
return false;
}

Expand Down