recent merge from upstream

This commit is contained in:
Jason White
2015-05-07 18:19:10 -04:00
parent 33dc855da7
commit f85132284f
12 changed files with 7 additions and 724 deletions

View File

@ -20,4 +20,6 @@ function($,_,Backbone,LessonData) {
this.$el.html(this.content);
}
});
return contentView;
});

View File

@ -5,7 +5,7 @@ define(['jquery',
'goatApp/controller/MenuController',
'goatApp/view/LessonContentView',
'goatApp/view/MenuView'
], function ($,_,Backbone,LessonController,MenuController,LessonView,MenuView) {
], function ($,_,Backbone,LessonController,MenuController,LessonContentView,MenuView) {
var lessonView = new LessonContentView();
var menuView = new MenuView();
@ -20,7 +20,7 @@ define(['jquery',
}),
menuView: new MenuController({
menuView:menuView
});
})
});
var init = function() {