mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-05-05 23:15:22 +02:00
Code Issues Releases Wiki Activity

Update to ember-data b14, comment out bug for now

Browse Source
This commit is contained in:
Toby Zerner 2015-01-07 17:24:12 +10:30
parent 2800a7e0cc
commit 087eb098ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ember/app/controllers/discussions.js
View File

@ -108,9 +108,9 @@ export default Ember.ArrayController.extend(Ember.Evented, {
var results = Em.A();
discussions.forEach(function(discussion) {
var relevantPosts = Em.A();
discussion.get('relevantPosts.content').forEach(function(post) {
relevantPosts.pushObject(PostResult.create(post));
});
// discussion.get('relevantPosts.content').forEach(function(post) {
// relevantPosts.pushObject(PostResult.create(post));
// });
results.pushObject(DiscussionResult.create({
content: discussion,
relevantPosts: relevantPosts,

2
ember/bower.json
View File

@ -4,7 +4,7 @@
"handlebars": "2.0.0",
"jquery": "^1.11.1",
"ember": "1.9.1",
"ember-data": "1.0.0-beta.12",
"ember-data": "1.0.0-beta.14",
"ember-resolver": "~0.1.10",
"loader.js": "stefanpenner/loader.js#1.0.1",
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",