Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show inline discussion component on Team view

Browse Source 
TNL-2515
This commit is contained in:
Andy Armstrong
2015-07-21 17:39:44 -04:00
parent df936837ae
commit 63da1907eb
34 changed files with 1492 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
lms/static/js/spec/main.js
View File

@@ -21,6 +21,7 @@
'jquery.inputnumber': 'xmodule_js/common_static/js/vendor/html5-input-polyfills/number-polyfill',
'jquery.immediateDescendents': 'xmodule_js/common_static/coffee/src/jquery.immediateDescendents',
'jquery.simulate': 'xmodule_js/common_static/js/vendor/jquery.simulate',
'jquery.timeago': 'xmodule_js/common_static/js/vendor/jquery.timeago',
'jquery.url': 'xmodule_js/common_static/js/vendor/url.min',
'datepair': 'xmodule_js/common_static/js/vendor/timepicker/datepair',
'date': 'xmodule_js/common_static/js/vendor/date',
@@ -30,8 +31,8 @@
'backbone': 'xmodule_js/common_static/js/vendor/backbone-min',
'backbone.associations': 'xmodule_js/common_static/js/vendor/backbone-associations-min',
'backbone.paginator': 'xmodule_js/common_static/js/vendor/backbone.paginator.min',
'backbone-super': 'js/vendor/backbone-super',
'URI': 'xmodule_js/common_static/js/vendor/URI.min',
"backbone-super": "js/vendor/backbone-super",
'tinymce': 'xmodule_js/common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min',
'jquery.tinymce': 'xmodule_js/common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce',
'xmodule': 'xmodule_js/src/xmodule',
@@ -57,6 +58,12 @@
'capa/display': 'xmodule_js/src/capa/display',
'string_utils': 'xmodule_js/common_static/js/src/string_utils',
'logger': 'xmodule_js/common_static/js/src/logger',
'Markdown.Converter': 'js/Markdown.Converter',
'Markdown.Editor': 'js/Markdown.Editor',
'Markdown.Sanitizer': 'js/Markdown.Sanitizer',
'_split': 'js/split',
'mathjax_delay_renderer': 'coffee/src/mathjax_delay_renderer',
'MathJaxProcessor': 'coffee/src/customwmd',
// Manually specify LMS files that are not converted to RequireJS
'history': 'js/vendor/history',
@@ -83,6 +90,9 @@
'js/student_profile/views/learner_profile_view': 'js/student_profile/views/learner_profile_view',
'js/ccx/schedule': 'js/ccx/schedule',
// Discussion classes loaded explicitly until they are converted to use RequireJS
'DiscussionModuleView': 'xmodule_js/common_static/coffee/src/discussion/discussion_module_view',
// edxnotes
'annotator_1.2.9': 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min'
},
@@ -149,6 +159,10 @@
deps: ['jquery'],
exports: 'jQuery.fn.simulate'
},
'jquery.timeago': {
deps: ['jquery'],
exports: 'jQuery.timeago'
},
'jquery.tinymce': {
deps: ['jquery', 'tinymce'],
exports: 'jQuery.fn.tinymce'
@@ -192,11 +206,32 @@
exports: 'Backbone.Paginator'
},
"backbone-super": {
deps: ["backbone"],
deps: ["backbone"]
},
'youtube': {
exports: 'YT'
},
'Markdown.Converter': {
deps: ['mathjax'],
exports: 'Markdown.Converter'
},
'Markdown.Editor': {
deps: ['Markdown.Converter'],
exports: 'Markdown.Editor'
},
'Markdown.Sanitizer': {
deps: ['Markdown.Converter'],
exports: 'Markdown.Sanitizer'
},
'_split': {
exports: '_split'
},
'MathJaxProcessor': {
deps: [
'Markdown.Converter', 'Markdown.Sanitizer', 'Markdown.Editor', '_split', 'mathjax_delay_renderer'
],
exports: 'MathJaxProcessor'
},
'codemirror': {
exports: 'CodeMirror'
},
@@ -417,7 +452,7 @@
exports: 'edx.verify_student.IntroStepView',
deps: [
'jquery',
'js/verify_student/views/step_view',
'js/verify_student/views/step_view'
]
},
'js/verify_student/views/make_payment_step_view': {
@@ -429,7 +464,7 @@
'jquery.cookie',
'jquery.url',
'string_utils',
'js/verify_student/views/step_view',
'js/verify_student/views/step_view'
]
},
'js/verify_student/views/payment_confirmation_step_view': {
@@ -438,7 +473,7 @@
'jquery',
'underscore',
'gettext',
'js/verify_student/views/step_view',
'js/verify_student/views/step_view'
]
},
'js/verify_student/views/face_photo_step_view': {
@@ -475,14 +510,14 @@
exports: 'edx.verify_student.EnrollmentConfirmationStepView',
deps: [
'jquery',
'js/verify_student/views/step_view',
'js/verify_student/views/step_view'
]
},
'js/verify_student/views/reverify_success_step_view': {
exports: 'edx.verify_student.ReverifySuccessStepView',
deps: [
'jquery',
'js/verify_student/views/step_view',
'js/verify_student/views/step_view'
]
},
'js/verify_student/views/pay_and_verify_view': {
@@ -520,21 +555,169 @@
'annotator_1.2.9': {
exports: 'Annotator',
deps: ['jquery']
},
// Discussions
'xmodule_js/common_static/coffee/src/discussion/utils': {
deps: [
'jquery',
'jquery.timeago',
'underscore',
'backbone',
'gettext',
'MathJaxProcessor',
'URI'
],
exports: 'DiscussionUtil',
init: function() {
// Set global variables that the discussion code is expecting to be defined
window.Backbone = require('backbone');
window.URI = require('URI');
}
},
'xmodule_js/common_static/coffee/src/discussion/content': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'Content'
},
'xmodule_js/common_static/coffee/src/discussion/discussion': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils',
'xmodule_js/common_static/coffee/src/discussion/content'
],
exports: 'Discussion'
},
'xmodule_js/common_static/coffee/src/discussion/discussion_filter': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionFilter'
},
'xmodule_js/common_static/coffee/src/discussion/models/discussion_course_settings': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionCourseSettings'
},
'xmodule_js/common_static/coffee/src/discussion/models/discussion_user': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionUser'
},
'xmodule_js/common_static/coffee/src/discussion/views/discussion_content_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionContentView'
},
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_edit_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionThreadEditView'
},
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_list_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionThreadListView'
},
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_profile_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionThreadProfileView'
},
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_show_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionThreadShowView'
},
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionThreadView'
},
'xmodule_js/common_static/coffee/src/discussion/views/discussion_topic_menu_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionTopicMenuView'
},
'xmodule_js/common_static/coffee/src/discussion/views/discussion_user_profile_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionUserProfileView'
},
'xmodule_js/common_static/coffee/src/discussion/views/new_post_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'NewPostView'
},
'xmodule_js/common_static/coffee/src/discussion/views/thread_response_edit_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'ThreadResponseEditView'
},
'xmodule_js/common_static/coffee/src/discussion/views/thread_response_show_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'ThreadResponseShowView'
},
'xmodule_js/common_static/coffee/src/discussion/views/thread_response_view': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'ThreadResponseView'
},
'DiscussionModuleView': {
deps: [
'jquery',
'underscore',
'backbone',
'gettext',
'URI',
'xmodule_js/common_static/coffee/src/discussion/content',
'xmodule_js/common_static/coffee/src/discussion/discussion',
'xmodule_js/common_static/coffee/src/discussion/discussion_filter',
'xmodule_js/common_static/coffee/src/discussion/utils',
'xmodule_js/common_static/coffee/src/discussion/models/discussion_course_settings',
'xmodule_js/common_static/coffee/src/discussion/models/discussion_user',
'xmodule_js/common_static/coffee/src/discussion/views/discussion_content_view',
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_edit_view',
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_list_view',
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_profile_view',
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_show_view',
'xmodule_js/common_static/coffee/src/discussion/views/discussion_thread_view',
'xmodule_js/common_static/coffee/src/discussion/views/discussion_topic_menu_view',
'xmodule_js/common_static/coffee/src/discussion/views/discussion_user_profile_view',
'xmodule_js/common_static/coffee/src/discussion/views/new_post_view',
'xmodule_js/common_static/coffee/src/discussion/views/thread_response_edit_view',
'xmodule_js/common_static/coffee/src/discussion/views/thread_response_show_view',
'xmodule_js/common_static/coffee/src/discussion/views/thread_response_view'
],
exports: 'DiscussionModuleView'
},
'xmodule_js/common_static/coffee/spec/discussion/discussion_spec_helper': {
deps: [
'xmodule_js/common_static/coffee/src/discussion/utils'
],
exports: 'DiscussionSpecHelper'
}
}
});
// TODO: why do these need 'lms/include' at the front but the CMS equivalent logic doesn't?
define([
// Run the LMS tests
'lms/include/teams/js/spec/teams_factory_spec.js',
'lms/include/teams/js/spec/topic_card_spec.js',
'lms/include/teams/js/spec/topic_collection_spec.js',
'lms/include/teams/js/spec/topics_spec.js',
'lms/include/teams/js/spec/teams_spec.js',
'lms/include/teams/js/spec/teams_tab_spec.js',
'lms/include/teams/js/spec/team_actions_spec.js',
'lms/include/teams/js/spec/edit_team_spec.js',
'lms/include/js/spec/components/header/header_spec.js',
'lms/include/js/spec/components/tabbed/tabbed_view_spec.js',
'lms/include/js/spec/components/card/card_spec.js',
@@ -605,7 +788,17 @@
'lms/include/js/spec/discovery/views/refine_sidebar_spec.js',
'lms/include/js/spec/discovery/views/search_form_spec.js',
'lms/include/js/spec/discovery/discovery_factory_spec.js',
'lms/include/js/spec/ccx/schedule_spec.js'
'lms/include/js/spec/ccx/schedule_spec.js',
'lms/include/teams/js/spec/collections/topic_collection_spec.js',
'lms/include/teams/js/spec/edit_team_spec.js',
'lms/include/teams/js/spec/team_actions_spec.js',
'lms/include/teams/js/spec/teams_factory_spec.js',
'lms/include/teams/js/spec/views/team_discussion_spec.js',
'lms/include/teams/js/spec/views/team_profile_spec.js',
'lms/include/teams/js/spec/views/teams_spec.js',
'lms/include/teams/js/spec/views/teams_tab_spec.js',
'lms/include/teams/js/spec/views/topic_card_spec.js',
'lms/include/teams/js/spec/views/topics_spec.js',
]);
}).call(this, requirejs, define);

3
lms/static/js_test.yml
View File

@@ -39,6 +39,7 @@ lib_paths:
- xmodule_js/common_static/js/vendor/jquery.min.js
- xmodule_js/common_static/js/vendor/jquery-ui.min.js
- xmodule_js/common_static/js/vendor/jquery.cookie.js
- xmodule_js/common_static/js/vendor/jquery.timeago.js
- xmodule_js/common_static/js/vendor/flot/jquery.flot.js
- xmodule_js/common_static/js/vendor/CodeMirror/codemirror.js
- xmodule_js/common_static/js/vendor/URI.min.js
@@ -66,8 +67,10 @@ lib_paths:
# Paths to source JavaScript files
src_paths:
- js
- coffee/src
- common/js
- teams/js
- xmodule_js/common_static/coffee
# Paths to spec (test) JavaScript files
spec_paths:

1
lms/static/lms/js/build.js
View File

@@ -64,6 +64,7 @@
'logger': 'empty:',
'utility': 'empty:',
'URI': 'empty:',
'DiscussionModuleView': 'empty:'
},
/**

1
lms/static/lms/js/require-config.js
View File

@@ -23,6 +23,7 @@
defineDependency("Logger", "logger");
defineDependency("URI", "URI");
defineDependency("Backbone", "backbone");
// utility.js adds two functions to the window object, but does not return anything
defineDependency("isExternal", "utility", true);
}