Created
August 13, 2013 17:53
-
-
Save kokeroulis/6223804 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/public/javascripts/models/channel.js b/public/javascripts/models/channel.js | |
index 3289365..acf083b 100644 | |
--- a/public/javascripts/models/channel.js | |
+++ b/public/javascripts/models/channel.js | |
@@ -1,12 +1,28 @@ | |
var utils = require('../utils.js'); | |
-var ChannelModel = Ember.Object.extend({}); | |
-ChannelModel.reopenClass({ | |
+var ChannelModel = Ember.Object.extend({ | |
+ jsonData: {}, | |
+ | |
+ //}); | |
+//ChannelModel.reopenClass({ | |
find: function(channelId) { | |
+ var a = Ember.A() | |
+ consoel.log(asdsdasdaads) | |
utils.get('channel/' + channelId, function(response) { | |
- return ChannelModel.create(response); | |
+ a.pushObject(ChannelModel.create(response)); | |
+ console.log(response) | |
+ this.set('jsonData', a); | |
+ return a; | |
+ }) | |
+ }, | |
+ assets: function() { | |
+ var json = this.get('jsonData'); | |
+ var assets = Ember.A() | |
+ json.assets.forEach(function(c) { | |
+ assets.pushObject(ChannelModel.create(c)); | |
}) | |
- } | |
+ }.property('jsonData') | |
+ | |
}); | |
module.exports = ChannelModel; | |
diff --git a/public/javascripts/routes/channel_route.js b/public/javascripts/routes/channel_route.js | |
index f337a25..bbe9c1a 100644 | |
--- a/public/javascripts/routes/channel_route.js | |
+++ b/public/javascripts/routes/channel_route.js | |
@@ -12,8 +12,7 @@ var ChannelRoute = Ember.Route.extend({ | |
}, | |
setupController: function(controller,model) { | |
- this.controllerFor('channel').set('assets', ChannelModel.find(model.id)); | |
- this.controllerFor('channels').set('currentChannel', ChannelModel.find(model.id)); | |
+ this.controller.set('json', ChannelModel.create().get('assets')) | |
} | |
}); | |
diff --git a/public/javascripts/templates/channel.hbs b/public/javascripts/templates/channel.hbs | |
index 0c1e303..49813af 100644 | |
--- a/public/javascripts/templates/channel.hbs | |
+++ b/public/javascripts/templates/channel.hbs | |
@@ -1,6 +1,6 @@ | |
<div class="row-fluid show-grid"> | |
<ul class="thumbnails"> | |
- {{#each item in assets}} | |
+ {{#each item in json}} | |
<li class="span4"> | |
<div class="thumbnail" data-toggle="modal" align="center"> | |
<a href="#modalId_{{unbound item.id}}" data-toggle="modal"> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment