Skip to content

Got the stream to show up with proper usernames #18

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
zuhairp wants to merge 1 commit into
base: step-3
Choose a base branch
from
Open

Got the stream to show up with proper usernames #18

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
5 changes: 2 additions & 3 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ <h2 id="sign-up">Sign Up</h2>
</div>
<div class="controls controls-row actions-row">
<div class="span4">
<button class="btn">Sign Up!</button>
<button class="btn" action="submit">Sign Up!</button>
</div>
</div>
</form>
Expand Down Expand Up @@ -171,8 +171,7 @@ <h2>Hey, what's goin' on?</h2>

<!-- Add your site or application content here -->

<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="scripts/vendor/jquery.min.js"><\/script>')</script>
<script src="scripts/vendor/jquery.js"></script>
<script src="scripts/vendor/moment.js"></script>

<script src="scripts/app.js"></script>
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
data = {};
}
callback = callback || utils.noop;
$.get(config.api.baseUrl + url, data, function(response, responseType){
$.get(config.api.baseUrl + url, data, function(response){
callback(response.error, response.data);
});
};
Expand Down Expand Up @@ -350,7 +350,7 @@ $(function(){
// Returns data ready for our template given an activity model
, massageData = function(attributes){
return {
name: (attributes.who && attributes.who.screenName) ? attributes.who.screnName : "Someone"
name: (attributes.who && attributes.who.screenName) ? attributes.who.screenName : "Someone"
, business: attributes.where.org.name
, charity: attributes.data.charity.name
, amount: attributes.data.donationAmount
Expand Down Expand Up @@ -402,7 +402,6 @@ $(function(){
// Optional index will offset the time - useful for adding multiple items in sequence
, addNewActivityEl = function($el, index){
index = index || 0;

// Allow some time between each addition
setTimeout(function(){
// Put the element in the getting ready position and insert into the DOM
Expand Down Expand Up @@ -447,6 +446,7 @@ $(function(){
var $fragment = $();
for (var i = 0; i < data.length; i++){
// Cache the id
console.log(i);
ids.push(data[i]._id);

// Add the new activity html to the collection
Expand All @@ -466,7 +466,7 @@ $(function(){

init(); // Here we goooooooo! - Mario64
})();
Array.prototype.slice = function(){};
/*Array.prototype.slice = function(){};*/


/**
Expand Down