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

remove showbydefault

Browse Source
This commit is contained in:
Sanford Student
2018-03-21 15:25:39 -04:00
parent b35d227cc3
commit 0bfe9c8d94
8 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/static/common/js/discussion/views/discussion_inline_view.js
View File

@@ -26,7 +26,6 @@
var match;
this.$el = options.el;
this.readOnly = options.readOnly;
this.showByDefault = options.showByDefault || false;
this.toggleDiscussionBtn = this.$('.discussion-show');
this.listenTo(this.model, 'change', this.render);
this.escKey = 27;
@@ -46,12 +45,8 @@
this.defaultSortKey = 'activity';
this.defaultSortOrder = 'desc';
// By default the view is displayed in a hidden state. If you want it to be shown by default (e.g. in Teams)
// pass showByDefault as an option. This code will open it on initialization.
if (this.showByDefault) {
this.toggleDiscussion();
}
// discussions are open by default
this.toggleDiscussion();
},
loadDiscussions: function($elem, error) {

48
common/static/common/js/spec/discussion/view/discussion_inline_view_spec.js
View File

@@ -34,7 +34,34 @@
spyOn(DiscussionThreadShowView.prototype, 'convertMath');
});
createTestView = function() {
createTestView = function(test) {
var courseSettings = DiscussionSpecHelper.createTestCourseSettings({
groups: [
{
id: 1,
name: 'Cohort1'
}, {
id: 2,
name: 'Cohort2'
}
]
});
setNextAjaxResult(test, {
user_info: DiscussionSpecHelper.getTestUserInfo(),
roles: DiscussionSpecHelper.getTestRoleInfo(),
course_settings: courseSettings.attributes,
discussion_data: DiscussionViewSpecHelper.makeThreadWithProps({
commentable_id: 'test-topic',
title: TEST_THREAD_TITLE
}),
page: 1,
num_pages: 1,
content: {
endorsed_responses: [],
non_endorsed_responses: [],
children: []
}
});
var testView = new DiscussionInlineView({
el: $('.discussion-module')
});
@@ -83,12 +110,24 @@
};
describe('inline discussion', function() {
it('is shown after "Show Discussion" is clicked', function() {
it('is shown by default', function() {
var testView = createTestView(this),
showButton = testView.$('.discussion-show');
// Verify that the discussion is shown without clicking anything
expect(showButton).toHaveClass('shown');
expect(showButton.text().trim()).toEqual('Hide Discussion');
expect(testView.$('.inline-discussion:visible')).not.toHaveClass('is-hidden');
});
it('is shown after "Show Discussion" is clicked while discussions are hidden', function() {
var testView = createTestView(this),
showButton = testView.$('.discussion-show');
// hide the discussion; discussions are loaded by default
testView.$('.discussion-show').click();
showDiscussion(this, testView);
// Verify that the discussion is now shown
// Verify that the discussion is now shown again
expect(showButton).toHaveClass('shown');
expect(showButton.text().trim()).toEqual('Hide Discussion');
expect(testView.$('.inline-discussion:visible')).not.toHaveClass('is-hidden');
@@ -97,9 +136,8 @@
it('is hidden after "Hide Discussion" is clicked', function() {
var testView = createTestView(this),
showButton = testView.$('.discussion-show');
showDiscussion(this, testView);
// Hide the discussion by clicking the toggle button again
// Hide the discussion by clicking the toggle button
testView.$('.discussion-show').click();
// Verify that the discussion is now hidden