Skip to content

Commit 05c94b0

Browse files
committed
Updated several features. Added table addon.
1 parent 06f9527 commit 05c94b0

File tree

26 files changed

+254
-42
lines changed

26 files changed

+254
-42
lines changed

MarvelWorld-Cli/.jshintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"predef": [
33
"document",
44
"window",
5-
"-Promise"
5+
"-Promise",
6+
"moment"
67
],
78
"browser": true,
89
"boss": true,

MarvelWorld-Cli/Brocfile.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ var app = new EmberApp();
1919

2020
app.import('bower_components/bootstrap/dist/css/bootstrap.css');
2121
app.import('bower_components/bootstrap/dist/css/bootstrap.css.map');
22-
app.import('bower_components/bootstrap/dist/js/bootstrap.min.js')
22+
app.import('bower_components/bootstrap/dist/js/bootstrap.min.js');
23+
app.import('bower_components/moment/moment.js');
24+
2325

2426
module.exports = app.toTree();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import Ember from 'ember';
22

3-
export default Ember.Controller.extend({
3+
export default Ember.ArrayController.extend({
44
});

MarvelWorld-Cli/app/controllers/movies/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import Ember from 'ember';
22

33
export default Ember.ArrayController.extend({
44
needs:['actors'],
5+
sortProperties: ['title'],
6+
sortAscending: true,
57
watches: Ember.computed.mapBy('model', 'watches'),
68
maxWatches: Ember.computed.max('watches'),
79
minWatches: Ember.computed.min('watches'),
@@ -11,6 +13,7 @@ export default Ember.ArrayController.extend({
1113
}
1214
return false;
1315
}),
16+
/*favorites: Ember.computed.collect('model.favActorName'),*/
1417
actions:{
1518
seeAllActors:function(){
1619
this.get('controllers.actors').send('showAllActors');

MarvelWorld-Cli/app/controllers/movies/view.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ export default Ember.Controller.extend({
99
return actor;
1010
}
1111
}),
12+
hasAward: Ember.computed.gt('model.award', 0),
13+
/*hasAward: Ember.computed.gte('model.award', 1),*/
14+
/*hasNotAward: Ember.computed.lte('model.award', 1),*/
15+
actorNames: Ember.computed.map('model.actors', function(actor){
16+
return actor._data.name.split(' ')[0] + ' ';
17+
}),
1218
checkReviewChanged: function(e){
1319
if(e.target.router.activeTransition === null){
1420
console.log('Observers');
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Ember from 'ember';
2+
3+
export default Ember.Handlebars.makeBoundHelper(function(){
4+
return moment().format('LL');
5+
});

MarvelWorld-Cli/app/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<link rel="stylesheet" href="assets/vendor.css">
1313
<link rel="stylesheet" href="assets/marvel-world-cli.css">
14+
<link rel="shortcut icon" href="assets/images/favicon.ico" type="image/x-icon" />
1415

1516
{{content-for 'head-footer'}}
1617
</head>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import DS from 'ember-data';
2+
3+
export default DS.Model.extend({
4+
name: DS.attr('string'),
5+
available: DS.attr('bool')
6+
});

MarvelWorld-Cli/app/models/movie.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,9 @@ export default DS.Model.extend({
1010
favActorName: DS.attr('string'),
1111
watches: DS.attr('number'),
1212
award: DS.attr('number'),
13-
date: DS.attr('string', {
14-
defaultValue: function() { return new Date(); }
15-
}),
13+
date: DS.attr('date'),
1614
profile: DS.belongsTo('profile'),
17-
// Ember Computed properties.
1815
hasGoodRating: Em.computed.gt('review', 9),
19-
// Custom Cmputed property.
2016
code: function(){
2117
return '000001A#000' + this.get('id');
2218
}.property('id')

0 commit comments

Comments
 (0)