summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-11-09 20:38:07 -0700
committermo khan <mo@mokhan.ca>2014-11-09 20:38:07 -0700
commit66bfa27d676dfea0964f17dbc4e1f29d31730ed4 (patch)
tree998f70d340d102e3c2a478c8a596876500a4c5bc /app
parent8d72e0b4bbd02ddf367122a966dcef5634f23d35 (diff)
sort videos and convert some files to coffeescript.
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/controllers/videos_controller.js2
-rw-r--r--app/assets/javascripts/controllers/videos_controller.js.coffee1
-rw-r--r--app/assets/javascripts/controllers/videos_index_controller.js.coffee2
-rw-r--r--app/assets/javascripts/routes/video_route.js8
-rw-r--r--app/assets/javascripts/routes/video_route.js.coffee3
-rw-r--r--app/assets/javascripts/templates/video.hbs2
-rw-r--r--app/assets/javascripts/templates/videos.hbs6
-rw-r--r--app/assets/javascripts/templates/videos/index.hbs6
8 files changed, 12 insertions, 18 deletions
diff --git a/app/assets/javascripts/controllers/videos_controller.js b/app/assets/javascripts/controllers/videos_controller.js
deleted file mode 100644
index 5bbe01f..0000000
--- a/app/assets/javascripts/controllers/videos_controller.js
+++ /dev/null
@@ -1,2 +0,0 @@
-App.VideosController = Ember.ArrayController.extend({
-});
diff --git a/app/assets/javascripts/controllers/videos_controller.js.coffee b/app/assets/javascripts/controllers/videos_controller.js.coffee
new file mode 100644
index 0000000..fb23fea
--- /dev/null
+++ b/app/assets/javascripts/controllers/videos_controller.js.coffee
@@ -0,0 +1 @@
+App.VideosController = Ember.ArrayController.extend()
diff --git a/app/assets/javascripts/controllers/videos_index_controller.js.coffee b/app/assets/javascripts/controllers/videos_index_controller.js.coffee
new file mode 100644
index 0000000..0547cd6
--- /dev/null
+++ b/app/assets/javascripts/controllers/videos_index_controller.js.coffee
@@ -0,0 +1,2 @@
+App.VideosIndexController = Ember.ArrayController.extend
+ sortProperties: ['title']
diff --git a/app/assets/javascripts/routes/video_route.js b/app/assets/javascripts/routes/video_route.js
deleted file mode 100644
index 035eeb6..0000000
--- a/app/assets/javascripts/routes/video_route.js
+++ /dev/null
@@ -1,8 +0,0 @@
-App.VideoRoute = Ember.Route.extend({
- model: function(params) {
- return this.store.find('video', params.video_id);
- },
- serialize: function(post) {
- return { post_id: post.get('id') };
- }
-});
diff --git a/app/assets/javascripts/routes/video_route.js.coffee b/app/assets/javascripts/routes/video_route.js.coffee
new file mode 100644
index 0000000..0e093ab
--- /dev/null
+++ b/app/assets/javascripts/routes/video_route.js.coffee
@@ -0,0 +1,3 @@
+App.VideoRoute = Ember.Route.extend
+ model: (params) ->
+ return @store.find('video', params.video_id)
diff --git a/app/assets/javascripts/templates/video.hbs b/app/assets/javascripts/templates/video.hbs
index a71b192..5467aa0 100644
--- a/app/assets/javascripts/templates/video.hbs
+++ b/app/assets/javascripts/templates/video.hbs
@@ -1,2 +1,4 @@
<h3>Video {{title}}</h3>
+<p>{{description}}</p>
+<a href="{{uri}}">{{uri}}</a>
{{outlet}}
diff --git a/app/assets/javascripts/templates/videos.hbs b/app/assets/javascripts/templates/videos.hbs
index e7ba719..e491da5 100644
--- a/app/assets/javascripts/templates/videos.hbs
+++ b/app/assets/javascripts/templates/videos.hbs
@@ -1,6 +1,2 @@
+<h1>Videos</h1>
{{outlet}}
-<ul class="nav nav-pills nav-stacked well">
- {{#each}}
- <li> {{#link-to 'video' this.id}}{{title}}{{/link-to}} </li>
- {{/each}}
-</ul>
diff --git a/app/assets/javascripts/templates/videos/index.hbs b/app/assets/javascripts/templates/videos/index.hbs
index 1ce53e0..5ff984c 100644
--- a/app/assets/javascripts/templates/videos/index.hbs
+++ b/app/assets/javascripts/templates/videos/index.hbs
@@ -1,6 +1,6 @@
-<h1>Videos Index</h1>
+<h2>Index</h2>
<ul class="nav nav-pills nav-stacked well">
- {{#each}}
- <li> {{#link-to 'video' this.id}}{{title}}{{/link-to}} </li>
+ {{#each video in controller}}
+ <li> {{#link-to 'video' video}}{{video.title}}{{/link-to}} </li>
{{/each}}
</ul>