recent merge from upstream
This commit is contained in:
@ -20,4 +20,6 @@ function($,_,Backbone,LessonData) {
|
||||
this.$el.html(this.content);
|
||||
}
|
||||
});
|
||||
|
||||
return contentView;
|
||||
});
|
@ -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() {
|
||||
|
Reference in New Issue
Block a user