Skip to content

E
edx-platform
Commit 9f3b8ddf by Eugeny Kolpakov Committed by GitHub
Options

Merge pull request #12914 from open-craft/ekolpakov/discussion_fixes_from_solutions 

Discussion fixes from solutions
parents e1dbfe3a e0c7228d
Showing with 287 additions and 154 deletions
common/static/common/js/discussion/discussion_router.js
/* globals DiscussionThreadListView, DiscussionThreadView, DiscussionUtil, NewPostView */ /* globals DiscussionThreadListView, DiscussionThreadView, DiscussionUtil, NewPostView, Thread */
(function() { (function() {
'use strict'; 'use strict';
var __hasProp = {}.hasOwnProperty, var __hasProp = {}.hasOwnProperty,
...@@ -18,9 +18,20 @@ ...@@ -18,9 +18,20 @@
return child; return child;
}; };
function getSingleThreadRoute(commentable_id, thread_id) {
return commentable_id + "/threads/" + thread_id;
}
if (typeof Backbone !== "undefined" && Backbone !== null) { if (typeof Backbone !== "undefined" && Backbone !== null) {
this.DiscussionRouter = (function(_super) { this.DiscussionRouter = (function(_super) {
var allThreadsRoute = "",
singleThreadRoute = getSingleThreadRoute(":forum_name", ":thread_id"), // :forum_name/threads/:thread_id
routes = {};
routes[allThreadsRoute] = "allThreads";
routes[singleThreadRoute] = "showThread";
__extends(DiscussionRouter, _super); __extends(DiscussionRouter, _super);
function DiscussionRouter() { function DiscussionRouter() {
...@@ -40,16 +51,16 @@ ...@@ -40,16 +51,16 @@
this.showMain = function() { this.showMain = function() {
return DiscussionRouter.prototype.showMain.apply(self, arguments); return DiscussionRouter.prototype.showMain.apply(self, arguments);
}; };
this.renderThreadView = function() {
return DiscussionRouter.prototype.renderThreadView.apply(self, arguments);
};
this.setActiveThread = function() { this.setActiveThread = function() {
return DiscussionRouter.prototype.setActiveThread.apply(self, arguments); return DiscussionRouter.prototype.setActiveThread.apply(self, arguments);
}; };
return DiscussionRouter.__super__.constructor.apply(this, arguments); return DiscussionRouter.__super__.constructor.apply(this, arguments);
} }
DiscussionRouter.prototype.routes = { DiscussionRouter.prototype.routes = routes;
"": "allThreads",
":forum_name/threads/:thread_id": "showThread"
};
DiscussionRouter.prototype.initialize = function(options) { DiscussionRouter.prototype.initialize = function(options) {
var self = this; var self = this;
...@@ -82,23 +93,50 @@ ...@@ -82,23 +93,50 @@
DiscussionRouter.prototype.allThreads = function() { DiscussionRouter.prototype.allThreads = function() {
this.nav.updateSidebar(); this.nav.updateSidebar();
return this.nav.goHome(); this.nav.goHome();
}; };
DiscussionRouter.prototype.setActiveThread = function() { DiscussionRouter.prototype.setActiveThread = function() {
if (this.thread) { if (this.thread) {
return this.nav.setActiveThread(this.thread.get("id")); this.nav.setActiveThread(this.thread.get("id"));
} else {
return this.nav.goHome;
} }
}; };
DiscussionRouter.prototype.showThread = function(forum_name, thread_id) { DiscussionRouter.prototype.showThread = function(forum_name, thread_id) {
var self = this;
this.thread = this.discussion.get(thread_id); this.thread = this.discussion.get(thread_id);
if (this.thread) {
this.renderThreadView();
return;
}
// if thread is not loaded yet for some reason - try loading it
DiscussionUtil.safeAjax({
url: DiscussionUtil.urlFor('retrieve_single_thread', forum_name, thread_id)
}).done(function(data) {
// if succeded - proceed normally
self.thread = new Thread(data.content);
self.discussion.add(self.thread);
self.renderThreadView();
}).fail(function(xhr) {
// otherwise display error message and navigate to all threads view
var errorMsg;
if (xhr.status === 404) {
errorMsg = gettext("The thread you selected has been deleted. Please select another thread.");
} else {
errorMsg = gettext("We had some trouble loading more responses. Please try again.");
}
DiscussionUtil.discussionAlert(gettext("Sorry"), errorMsg);
this.allThreads();
});
};
DiscussionRouter.prototype.renderThreadView = function() {
this.thread.set("unread_comments_count", 0); this.thread.set("unread_comments_count", 0);
this.thread.set("read", true); this.thread.set("read", true);
this.setActiveThread(); this.setActiveThread();
return this.showMain(); this.showMain();
}; };
DiscussionRouter.prototype.showMain = function() { DiscussionRouter.prototype.showMain = function() {
...@@ -123,26 +161,23 @@ ...@@ -123,26 +161,23 @@
this.main.on("thread:responses:rendered", function() { this.main.on("thread:responses:rendered", function() {
return self.nav.updateSidebar(); return self.nav.updateSidebar();
}); });
return this.thread.on("thread:thread_type_updated", this.showMain); this.thread.on("thread:thread_type_updated", this.showMain);
}; };
DiscussionRouter.prototype.navigateToThread = function(thread_id) { DiscussionRouter.prototype.navigateToThread = function(thread_id) {
var thread; var thread, targetThreadRoute;
thread = this.discussion.get(thread_id); thread = this.discussion.get(thread_id);
return this.navigate("" + (thread.get("commentable_id")) + "/threads/" + thread_id, { targetThreadRoute = getSingleThreadRoute(thread.get("commentable_id"), thread_id);
trigger: true this.navigate(targetThreadRoute, {trigger: true});
});
}; };
DiscussionRouter.prototype.navigateToAllThreads = function() { DiscussionRouter.prototype.navigateToAllThreads = function() {
return this.navigate("", { this.navigate(allThreadsRoute, {trigger: true});
trigger: true
});
}; };
DiscussionRouter.prototype.showNewPost = function() { DiscussionRouter.prototype.showNewPost = function() {
var self = this; var self = this;
return $('.forum-content').fadeOut({ $('.forum-content').fadeOut({
duration: 200, duration: 200,
complete: function() { complete: function() {
return self.newPost.fadeIn(200).focus(); return self.newPost.fadeIn(200).focus();
...@@ -151,7 +186,7 @@ ...@@ -151,7 +186,7 @@
}; };
DiscussionRouter.prototype.hideNewPost = function() { DiscussionRouter.prototype.hideNewPost = function() {
return this.newPost.fadeOut({ this.newPost.fadeOut({
duration: 200, duration: 200,
complete: function() { complete: function() {
return $('.forum-content').fadeIn(200).find('.thread-wrapper').focus(); return $('.forum-content').fadeIn(200).find('.thread-wrapper').focus();
......
common/static/common/js/discussion/main.js
...@@ -34,10 +34,11 @@ ...@@ -34,10 +34,11 @@
course_settings: course_settings course_settings: course_settings
}); });
/* jshint +W031*/ /* jshint +W031*/
return Backbone.history.start({ if (!Backbone.History.started) {
pushState: true, Backbone.history.start({pushState: true, root: "/courses/" + $$course_id + "/discussion/forum/"});
root: "/courses/" + $$course_id + "/discussion/forum/" } else {
}); Backbone.history.loadUrl(window.location.pathname);
}
} }
}; };
DiscussionProfileApp = { DiscussionProfileApp = {
......
common/static/common/js/discussion/views/discussion_content_view.js
...@@ -271,20 +271,22 @@ ...@@ -271,20 +271,22 @@
return $button.toggleClass("is-checked", endorsed); return $button.toggleClass("is-checked", endorsed);
}, },
votes: function(votes) { votes: function(votes) {
var button, numVotes, selector, votesHtml, votesCountMsg; var button, numVotes, selector, votesText, votesCountMsg;
selector = ".action-vote"; selector = ".action-vote";
this.updateButtonState(selector, window.user.voted(this.model)); this.updateButtonState(selector, window.user.voted(this.model));
button = this.$el.find(selector); button = this.$el.find(selector);
numVotes = votes.up_count; numVotes = votes.up_count;
votesCountMsg = ngettext( votesCountMsg = ngettext(
"there is currently %(numVotes)s vote", "there are currently %(numVotes)s votes", numVotes "there is currently {numVotes} vote", "there are currently {numVotes} votes", numVotes
); );
button.find(".js-sr-vote-count").html(interpolate(votesCountMsg, {numVotes: numVotes }, true)); button.find(".js-sr-vote-count").empty().text(
votesHtml = interpolate(ngettext("%(numVotes)s Vote", "%(numVotes)s Votes", numVotes), { edx.StringUtils.interpolate(votesCountMsg, {numVotes: numVotes })
numVotes: numVotes );
}, true); votesText = edx.StringUtils.interpolate(
button.find(".vote-count").html(votesHtml); ngettext("{numVotes} Vote", "{numVotes} Votes", numVotes),
return this.$el.find('.display-vote .vote-count').html(votesHtml); { numVotes: numVotes });
button.find(".vote-count").empty().text(votesText);
this.$el.find('.display-vote .vote-count').empty().text(votesText);
}, },
pinned: function(pinned) { pinned: function(pinned) {
this.updateButtonState(".action-pin", pinned); this.updateButtonState(".action-pin", pinned);
...@@ -389,18 +391,18 @@ ...@@ -389,18 +391,18 @@
msg = gettext("We had some trouble removing this endorsement. Please try again."); msg = gettext("We had some trouble removing this endorsement. Please try again.");
} }
} }
beforeFunc = function() { return DiscussionUtil.updateWithUndo(
return self.trigger("comment:endorse"); this.model,
}; updates,
return DiscussionUtil.updateWithUndo(this.model, updates, { {
url: url, url: url,
type: "POST", type: "POST",
data: { data: { endorsed: is_endorsing },
endorsed: is_endorsing $elem: $(event.currentTarget)
}, },
beforeSend: beforeFunc, msg,
$elem: $(event.currentTarget) function() { return self.trigger("comment:endorse"); }
}, msg).always(this.trigger("comment:endorse")); ).always(this.trigger("comment:endorse"));
}; };
DiscussionContentShowView.prototype.toggleVote = function(event) { DiscussionContentShowView.prototype.toggleVote = function(event) {
......
common/static/common/js/discussion/views/discussion_thread_edit_view.js
...@@ -25,13 +25,14 @@ ...@@ -25,13 +25,14 @@
}, },
render: function() { render: function() {
var threadTypeTemplate, var formId = _.uniqueId("form-"),
formId = _.uniqueId("form-"); threadTypeTemplate = edx.HtmlUtils.template($("#thread-type-template").html()),
this.template = _.template($('#thread-edit-template').html()); $threadTypeSelector = $(threadTypeTemplate({form_id: formId}).toString()),
this.$el.html(this.template(this.model.toJSON())).appendTo(this.container); mainTemplate = edx.HtmlUtils.template($('#thread-edit-template').html());
this.submitBtn = this.$('.post-update'); edx.HtmlUtils.setHtml(this.$el, mainTemplate(this.model.toJSON()));
threadTypeTemplate = _.template($("#thread-type-template").html()); this.container.append(this.$el);
this.addField(threadTypeTemplate({form_id: formId})); this.$submitBtn = this.$('.post-update');
this.addField($threadTypeSelector);
this.$("#" + formId + "-post-type-" + this.threadType).attr('checked', true); this.$("#" + formId + "-post-type-" + this.threadType).attr('checked', true);
// Only allow the topic field for course threads, as standalone threads // Only allow the topic field for course threads, as standalone threads
// cannot be moved. // cannot be moved.
...@@ -46,8 +47,8 @@ ...@@ -46,8 +47,8 @@
return this; return this;
}, },
addField: function(fieldView) { addField: function($fieldView) {
this.$('.forum-edit-post-form-wrapper').append(fieldView); this.$('.forum-edit-post-form-wrapper').append($fieldView);
return this; return this;
}, },
...@@ -69,8 +70,8 @@ ...@@ -69,8 +70,8 @@
} }
return DiscussionUtil.safeAjax({ return DiscussionUtil.safeAjax({
$elem: this.submitBtn, $elem: this.$submitBtn,
$loading: this.submitBtn, $loading: this.$submitBtn,
url: DiscussionUtil.urlFor('update_thread', this.model.id), url: DiscussionUtil.urlFor('update_thread', this.model.id),
type: 'POST', type: 'POST',
dataType: 'json', dataType: 'json',
......
common/static/common/js/discussion/views/discussion_thread_profile_view.js
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
} }
DiscussionThreadProfileView.prototype.render = function() { DiscussionThreadProfileView.prototype.render = function() {
var element, params; var params;
this.convertMath(); this.convertMath();
this.abbreviateBody(); this.abbreviateBody();
params = $.extend(this.model.toJSON(), { params = $.extend(this.model.toJSON(), {
...@@ -42,26 +42,24 @@ ...@@ -42,26 +42,24 @@
} }
}); });
} }
this.$el.html(_.template($("#profile-thread-template").html())(params)); edx.HtmlUtils.setHtml(
this.$el,
edx.HtmlUtils.template($("#profile-thread-template").html())(params)
);
this.$("span.timeago").timeago(); this.$("span.timeago").timeago();
element = this.$(".post-body"); DiscussionUtil.typesetMathJax(this.$(".post-body"));
if (typeof MathJax !== "undefined" && MathJax !== null) {
MathJax.Hub.Queue(["Typeset", MathJax.Hub, element[0]]);
}
return this; return this;
}; };
DiscussionThreadProfileView.prototype.convertMath = function() { DiscussionThreadProfileView.prototype.convertMath = function() {
return this.model.set( var htmlSnippet = DiscussionUtil.markdownWithHighlight(this.model.get('body'));
'markdownBody', this.model.set('markdownBody', htmlSnippet);
DiscussionUtil.postMathJaxProcessor(DiscussionUtil.markdownWithHighlight(this.model.get('body')))
);
}; };
DiscussionThreadProfileView.prototype.abbreviateBody = function() { DiscussionThreadProfileView.prototype.abbreviateBody = function() {
var abbreviated; var abbreviated;
abbreviated = DiscussionUtil.abbreviateHTML(this.model.get('markdownBody'), 140); abbreviated = DiscussionUtil.abbreviateHTML(this.model.get('markdownBody'), 140);
return this.model.set('abbreviatedBody', abbreviated); this.model.set('abbreviatedBody', abbreviated);
}; };
return DiscussionThreadProfileView; return DiscussionThreadProfileView;
......
common/static/common/js/discussion/views/discussion_thread_show_view.js
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
DiscussionThreadShowView.prototype.renderTemplate = function() { DiscussionThreadShowView.prototype.renderTemplate = function() {
var context; var context;
this.template = _.template($("#thread-show-template").html());
context = $.extend({ context = $.extend({
mode: this.mode, mode: this.mode,
flagged: this.model.isFlagged(), flagged: this.model.isFlagged(),
...@@ -46,27 +45,25 @@ ...@@ -46,27 +45,25 @@
cid: this.model.cid, cid: this.model.cid,
readOnly: $('.discussion-module').data('read-only') readOnly: $('.discussion-module').data('read-only')
}, this.model.attributes); }, this.model.attributes);
return this.template(context); return edx.HtmlUtils.template($("#thread-show-template").html())(context);
}; };
DiscussionThreadShowView.prototype.render = function() { DiscussionThreadShowView.prototype.render = function() {
this.$el.html(this.renderTemplate()); edx.HtmlUtils.setHtml(
this.$el,
this.renderTemplate()
);
this.delegateEvents(); this.delegateEvents();
this.renderAttrs(); this.renderAttrs();
this.$("span.timeago").timeago(); this.$("span.timeago").timeago();
this.convertMath(); this.convertMath();
this.highlight(this.$(".post-body")); this.$(".post-body");
this.highlight(this.$("h1,h3")); this.$("h1,h3");
return this; return this;
}; };
DiscussionThreadShowView.prototype.convertMath = function() { DiscussionThreadShowView.prototype.convertMath = function() {
var element; DiscussionUtil.convertMath(this.$(".post-body"));
element = this.$(".post-body");
element.html(DiscussionUtil.postMathJaxProcessor(DiscussionUtil.markdownWithHighlight(element.text())));
if (typeof MathJax !== "undefined" && MathJax !== null) {
return MathJax.Hub.Queue(["Typeset", MathJax.Hub, element[0]]);
}
}; };
DiscussionThreadShowView.prototype.edit = function(event) { DiscussionThreadShowView.prototype.edit = function(event) {
...@@ -77,12 +74,6 @@ ...@@ -77,12 +74,6 @@
return this.trigger("thread:_delete", event); return this.trigger("thread:_delete", event);
}; };
DiscussionThreadShowView.prototype.highlight = function(el) {
if (el.html()) {
return el.html(el.html().replace(/&lt;mark&gt;/g, "<mark>").replace(/&lt;\/mark&gt;/g, "</mark>"));
}
};
return DiscussionThreadShowView; return DiscussionThreadShowView;
})(DiscussionContentShowView); })(DiscussionContentShowView);
......
common/static/common/js/discussion/views/discussion_thread_view.js
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
id = self.model.get("id"); id = self.model.get("id");
if (collection.get(id)) { if (collection.get(id)) {
self.model = collection.get(id); self.model = collection.get(id);
self.rerender();
} }
}); });
this.createShowView(); this.createShowView();
...@@ -133,7 +134,9 @@ ...@@ -133,7 +134,9 @@
DiscussionThreadView.prototype.render = function() { DiscussionThreadView.prototype.render = function() {
var self = this; var self = this;
this.$el.html(this.renderTemplate()); var $element = $(this.renderTemplate());
this.$el.empty();
this.$el.append($element);
this.delegateEvents(); this.delegateEvents();
this.renderShowView(); this.renderShowView();
this.renderAttrs(); this.renderAttrs();
...@@ -215,7 +218,7 @@ ...@@ -215,7 +218,7 @@
} }
}; };
DiscussionThreadView.prototype.loadResponses = function(responseLimit, elem, firstLoad) { DiscussionThreadView.prototype.loadResponses = function(responseLimit, $elem, firstLoad) {
var takeFocus, var takeFocus,
self = this; self = this;
takeFocus = this.mode === "tab" ? false : true; takeFocus = this.mode === "tab" ? false : true;
...@@ -227,8 +230,8 @@ ...@@ -227,8 +230,8 @@
resp_skip: this.responses.size(), resp_skip: this.responses.size(),
resp_limit: responseLimit ? responseLimit : void 0 resp_limit: responseLimit ? responseLimit : void 0
}, },
$elem: elem, $elem: $elem,
$loading: elem, $loading: $elem,
takeFocus: takeFocus, takeFocus: takeFocus,
complete: function() { complete: function() {
self.responsesRequest = null; self.responsesRequest = null;
...@@ -279,20 +282,20 @@ ...@@ -279,20 +282,20 @@
}; };
DiscussionThreadView.prototype.renderResponseCountAndPagination = function(responseTotal) { DiscussionThreadView.prototype.renderResponseCountAndPagination = function(responseTotal) {
var buttonText, loadMoreButton, responseCountFormat, responseLimit, responsePagination, var buttonText, $loadMoreButton, responseCountFormat, responseLimit, responsePagination,
responsesRemaining, showingResponsesText, self = this; responsesRemaining, showingResponsesText, self = this;
if (this.isQuestion() && this.markedAnswers.length !== 0) { if (this.isQuestion() && this.markedAnswers.length !== 0) {
responseCountFormat = ngettext( responseCountFormat = ngettext(
"%(numResponses)s other response", "%(numResponses)s other responses", responseTotal "{numResponses} other response", "{numResponses} other responses", responseTotal
); );
} else { } else {
responseCountFormat = ngettext( responseCountFormat = ngettext(
"%(numResponses)s response", "%(numResponses)s responses", responseTotal "{numResponses} response", "{numResponses} responses", responseTotal
); );
} }
this.$el.find(".response-count").html(interpolate(responseCountFormat, { this.$el.find(".response-count").text(
numResponses: responseTotal edx.StringUtils.interpolate(responseCountFormat, {numResponses: responseTotal}, true)
}, true)); );
responsePagination = this.$el.find(".response-pagination"); responsePagination = this.$el.find(".response-pagination");
responsePagination.empty(); responsePagination.empty();
if (responseTotal > 0) { if (responseTotal > 0) {
...@@ -301,9 +304,9 @@ ...@@ -301,9 +304,9 @@
showingResponsesText = gettext("Showing all responses"); showingResponsesText = gettext("Showing all responses");
} }
else { else {
showingResponsesText = interpolate( showingResponsesText = edx.StringUtils.interpolate(
ngettext( ngettext(
"Showing first response", "Showing first %(numResponses)s responses", "Showing first response", "Showing first {numResponses} responses",
this.responses.size() this.responses.size()
), ),
{ numResponses: this.responses.size() }, { numResponses: this.responses.size() },
...@@ -312,22 +315,22 @@ ...@@ -312,22 +315,22 @@
} }
responsePagination.append($("<span>") responsePagination.append($("<span>")
.addClass("response-display-count").html(_.escape(showingResponsesText))); .addClass("response-display-count").text(showingResponsesText));
if (responsesRemaining > 0) { if (responsesRemaining > 0) {
if (responsesRemaining < SUBSEQUENT_RESPONSE_PAGE_SIZE) { if (responsesRemaining < SUBSEQUENT_RESPONSE_PAGE_SIZE) {
responseLimit = null; responseLimit = null;
buttonText = gettext("Load all responses"); buttonText = gettext("Load all responses");
} else { } else {
responseLimit = SUBSEQUENT_RESPONSE_PAGE_SIZE; responseLimit = SUBSEQUENT_RESPONSE_PAGE_SIZE;
buttonText = interpolate(gettext("Load next %(numResponses)s responses"), { buttonText = edx.StringUtils.interpolate(gettext("Load next {numResponses} responses"), {
numResponses: responseLimit numResponses: responseLimit
}, true); }, true);
} }
loadMoreButton = $("<button>").addClass("load-response-button").html(_.escape(buttonText)); $loadMoreButton = $("<button>").addClass("load-response-button").text(buttonText);
loadMoreButton.click(function() { $loadMoreButton.click(function() {
return self.loadResponses(responseLimit, loadMoreButton); return self.loadResponses(responseLimit, $loadMoreButton);
}); });
return responsePagination.append(loadMoreButton); return responsePagination.append($loadMoreButton);
} }
} }
}; };
......
common/static/common/js/discussion/views/response_comment_show_view.js
...@@ -37,12 +37,14 @@ ...@@ -37,12 +37,14 @@
ResponseCommentShowView.prototype.tagName = "li"; ResponseCommentShowView.prototype.tagName = "li";
ResponseCommentShowView.prototype.render = function() { ResponseCommentShowView.prototype.render = function() {
this.template = _.template($("#response-comment-show-template").html()); var template = edx.HtmlUtils.template($("#response-comment-show-template").html());
this.$el.html(this.template(_.extend({ var context = _.extend({
cid: this.model.cid, cid: this.model.cid,
author_display: this.getAuthorDisplay(), author_display: this.getAuthorDisplay(),
readOnly: $('.discussion-module').data('read-only') readOnly: $('.discussion-module').data('read-only')
}, this.model.attributes))); }, this.model.attributes);
edx.HtmlUtils.setHtml(this.$el, template(context));
this.delegateEvents(); this.delegateEvents();
this.renderAttrs(); this.renderAttrs();
this.$el.find(".timeago").timeago(); this.$el.find(".timeago").timeago();
...@@ -52,22 +54,25 @@ ...@@ -52,22 +54,25 @@
}; };
ResponseCommentShowView.prototype.addReplyLink = function() { ResponseCommentShowView.prototype.addReplyLink = function() {
var html, name, p, _ref; var html, name;
if (this.model.hasOwnProperty('parent')) { if (this.model.hasOwnProperty('parent')) {
name = (_ref = this.model.parent.get('username')) !== null ? _ref : gettext("anonymous"); name = this.model.parent.get('username') || gettext("anonymous");
html = "<a href='#comment_" + this.model.parent.id + "'>@" + name + "</a>: "; html = edx.HtmlUtils.interpolateHtml(
p = this.$('.response-body p:first'); edx.HtmlUtils.HTML("<a href='#comment_{parent_id}'>@{name}</a>: "),
return p.prepend(html); {
parent_id: this.model.parent.id,
name: name
}
);
return edx.HtmlUtils.prepend(
this.$('.response-body p:first'),
html
);
} }
}; };
ResponseCommentShowView.prototype.convertMath = function() { ResponseCommentShowView.prototype.convertMath = function() {
var body; DiscussionUtil.convertMath(this.$el.find(".response-body"));
body = this.$el.find(".response-body");
body.html(DiscussionUtil.postMathJaxProcessor(DiscussionUtil.markdownWithHighlight(body.text())));
if (typeof MathJax !== "undefined" && MathJax !== null) {
return MathJax.Hub.Queue(["Typeset", MathJax.Hub, body[0]]);
}
}; };
ResponseCommentShowView.prototype._delete = function(event) { ResponseCommentShowView.prototype._delete = function(event) {
......
common/static/common/js/discussion/views/thread_response_show_view.js
...@@ -33,19 +33,18 @@ ...@@ -33,19 +33,18 @@
}; };
ThreadResponseShowView.prototype.renderTemplate = function() { ThreadResponseShowView.prototype.renderTemplate = function() {
var context; var template = edx.HtmlUtils.template($("#thread-response-show-template").html()),
this.template = _.template($("#thread-response-show-template").html()); context = _.extend({
context = _.extend({ cid: this.model.cid,
cid: this.model.cid, author_display: this.getAuthorDisplay(),
author_display: this.getAuthorDisplay(), endorser_display: this.getEndorserDisplay(),
endorser_display: this.getEndorserDisplay(), readOnly: $('.discussion-module').data('read-only')
readOnly: $('.discussion-module').data('read-only') }, this.model.attributes);
}, this.model.attributes); return template(context);
return this.template(context);
}; };
ThreadResponseShowView.prototype.render = function() { ThreadResponseShowView.prototype.render = function() {
this.$el.html(this.renderTemplate()); edx.HtmlUtils.setHtml(this.$el, this.renderTemplate());
this.delegateEvents(); this.delegateEvents();
this.renderAttrs(); this.renderAttrs();
this.$el.find(".posted-details .timeago").timeago(); this.$el.find(".posted-details .timeago").timeago();
...@@ -54,12 +53,7 @@ ...@@ -54,12 +53,7 @@
}; };
ThreadResponseShowView.prototype.convertMath = function() { ThreadResponseShowView.prototype.convertMath = function() {
var element; DiscussionUtil.convertMath(this.$(".response-body"));
element = this.$(".response-body");
element.html(DiscussionUtil.postMathJaxProcessor(DiscussionUtil.markdownWithHighlight(element.text())));
if (typeof MathJax !== "undefined" && MathJax !== null) {
return MathJax.Hub.Queue(["Typeset", MathJax.Hub, element[0]]);
}
}; };
ThreadResponseShowView.prototype.edit = function(event) { ThreadResponseShowView.prototype.edit = function(event) {
......
common/static/common/js/spec/discussion/utils_spec.js
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
'use strict'; 'use strict';
describe('DiscussionUtil', function() { describe('DiscussionUtil', function() {
beforeEach(function() { beforeEach(function() {
return DiscussionSpecHelper.setUpGlobals(); DiscussionSpecHelper.setUpGlobals();
}); });
return describe("updateWithUndo", function() {
describe("updateWithUndo", function() {
it("calls through to safeAjax with correct params, and reverts the model in case of failure", function() { it("calls through to safeAjax with correct params, and reverts the model in case of failure", function() {
var deferred, model, res, updates; var deferred, model, res, updates;
deferred = $.Deferred(); deferred = $.Deferred();
...@@ -45,13 +46,13 @@ ...@@ -45,13 +46,13 @@
updates = { updates = {
hello: "world" hello: "world"
}; };
$elem = jasmine.createSpyObj('$elem', ['attr']); $elem = jasmine.createSpyObj('$elem', ['prop']);
$elem.attr.and.returnValue(true); $elem.prop.and.returnValue(true);
res = DiscussionUtil.updateWithUndo(model, updates, { res = DiscussionUtil.updateWithUndo(model, updates, {
foo: "bar", foo: "bar",
$elem: $elem $elem: $elem
}, "error message"); }, "error message");
expect($elem.attr).toHaveBeenCalledWith("disabled"); expect($elem.prop).toHaveBeenCalledWith("disabled");
expect(DiscussionUtil.safeAjax).toHaveBeenCalled(); expect(DiscussionUtil.safeAjax).toHaveBeenCalled();
expect(model.attributes).toEqual({ expect(model.attributes).toEqual({
hello: false, hello: false,
...@@ -64,6 +65,30 @@ ...@@ -64,6 +65,30 @@
return expect(failed).toBe(true); return expect(failed).toBe(true);
}); });
}); });
describe('safeAjax', function() {
function dismissAlert() {
$(".modal#discussion-alert").remove();
}
it('respects global beforeSend', function() {
var beforeSendSpy = jasmine.createSpy();
$.ajaxSetup({beforeSend: beforeSendSpy});
var $elem = jasmine.createSpyObj('$elem', ['prop']);
DiscussionUtil.safeAjax({
$elem: $elem,
url: "/",
type: "GET",
dataType: "json"
}).always(function() {
dismissAlert();
});
expect($elem.prop).toHaveBeenCalledWith("disabled", true);
expect(beforeSendSpy).toHaveBeenCalled();
});
});
}); });
}).call(this); }).call(this);
common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
}); });
}); });
describe("search alerts", function() { describe("search alerts", function() {
var testAlertMessages; var testAlertMessages, getAlertMessagesAndClasses;
testAlertMessages = function(expectedMessages) { testAlertMessages = function(expectedMessages) {
return expect($(".search-alert .message").map(function() { return expect($(".search-alert .message").map(function() {
...@@ -269,6 +269,15 @@ ...@@ -269,6 +269,15 @@
}).get()).toEqual(expectedMessages); }).get()).toEqual(expectedMessages);
}; };
getAlertMessagesAndClasses = function() {
return $(".search-alert").map(function() {
return {
text: $('.message', this).html(),
css_class: $(this).attr('class')
};
}).get();
};
it("renders and removes search alerts", function() { it("renders and removes search alerts", function() {
var bar, foo; var bar, foo;
testAlertMessages([]); testAlertMessages([]);
...@@ -282,6 +291,27 @@ ...@@ -282,6 +291,27 @@
return testAlertMessages([]); return testAlertMessages([]);
}); });
it("renders search alert with custom class", function() {
var foo, messages;
testAlertMessages([]);
this.view.addSearchAlert("foo", "custom-class");
messages = getAlertMessagesAndClasses();
expect(messages.length).toEqual(1);
expect(messages[0].text).toEqual("foo");
expect(messages[0].css_class).toEqual("search-alert custom-class");
foo = this.view.addSearchAlert("bar", "other-class");
messages = getAlertMessagesAndClasses();
expect(messages.length).toEqual(2);
expect(messages[0].text).toEqual("foo");
expect(messages[0].css_class).toEqual("search-alert custom-class");
expect(messages[1].text).toEqual("bar");
expect(messages[1].css_class).toEqual("search-alert other-class");
});
it("clears all search alerts", function() { it("clears all search alerts", function() {
this.view.addSearchAlert("foo"); this.view.addSearchAlert("foo");
this.view.addSearchAlert("bar"); this.view.addSearchAlert("bar");
......
common/static/common/js/spec/discussion/view/new_post_view_spec.js
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
this.view.render(); this.view.render();
expectedGroupId = null; expectedGroupId = null;
DiscussionSpecHelper.makeAjaxSpy(function(params) { DiscussionSpecHelper.makeAjaxSpy(function(params) {
return expect(params.data.group_id).toEqual(expectedGroupId); expect(params.data.group_id).toEqual(expectedGroupId);
}); });
return _.each(["1", "2", ""], function(groupIdStr) { return _.each(["1", "2", ""], function(groupIdStr) {
expectedGroupId = groupIdStr; expectedGroupId = groupIdStr;
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
self.view.$(".js-post-body textarea").val("dummy body"); self.view.$(".js-post-body textarea").val("dummy body");
self.view.$(".forum-new-post-form").submit(); self.view.$(".forum-new-post-form").submit();
expect($.ajax).toHaveBeenCalled(); expect($.ajax).toHaveBeenCalled();
self.view.$(".forum-new-post-form").prop("disabled", false);
return $.ajax.calls.reset(); return $.ajax.calls.reset();
}); });
}); });
......
common/static/common/js/spec/discussion/view/response_comment_view_spec.js
...@@ -33,8 +33,10 @@ ...@@ -33,8 +33,10 @@
} }
}); });
this.event = DiscussionSpecHelper.makeEventSpy(); this.event = DiscussionSpecHelper.makeEventSpy();
this.event.target = $("body");
spyOn(this.comment, "remove"); spyOn(this.comment, "remove");
return spyOn(this.view.$el, "remove"); spyOn(this.view.$el, "remove");
$(this.event.target).prop("disabled", false);
}); });
setAjaxResult = function(isSuccess) { setAjaxResult = function(isSuccess) {
return spyOn($, "ajax").and.callFake(function(params) { return spyOn($, "ajax").and.callFake(function(params) {
...@@ -151,7 +153,7 @@ ...@@ -151,7 +153,7 @@
this.view.$el.find(".edit-comment-body").html($("<textarea></textarea>")); this.view.$el.find(".edit-comment-body").html($("<textarea></textarea>"));
this.view.$el.find(".edit-comment-body textarea").val(this.updatedBody); this.view.$el.find(".edit-comment-body textarea").val(this.updatedBody);
spyOn(this.view, 'cancelEdit'); spyOn(this.view, 'cancelEdit');
return spyOn($, "ajax").and.callFake(function(params) { spyOn($, "ajax").and.callFake(function(params) {
if (self.ajaxSucceed) { if (self.ajaxSucceed) {
params.success(); params.success();
} else { } else {
...@@ -164,10 +166,17 @@ ...@@ -164,10 +166,17 @@
} }
}; };
}); });
this.event = DiscussionSpecHelper.makeEventSpy();
// All the way down in discussion/utils.js there's this line
// element.after(...);
// element is event.target in this case. This causes a JS exception, so we override the target
this.event.target = $("body");
$(this.event.target).prop("disabled", false);
}); });
it('calls the update endpoint correctly and displays the show view on success', function() { it('calls the update endpoint correctly and displays the show view on success', function() {
this.ajaxSucceed = true; this.ajaxSucceed = true;
this.view.update(DiscussionSpecHelper.makeEventSpy()); this.view.update(this.event);
expect($.ajax).toHaveBeenCalled(); expect($.ajax).toHaveBeenCalled();
expect($.ajax.calls.mostRecent().args[0].url._parts.path) expect($.ajax.calls.mostRecent().args[0].url._parts.path)
.toEqual('/courses/edX/999/test/discussion/comments/01234567/update'); .toEqual('/courses/edX/999/test/discussion/comments/01234567/update');
...@@ -179,7 +188,7 @@ ...@@ -179,7 +188,7 @@
var originalBody; var originalBody;
originalBody = this.comment.get("body"); originalBody = this.comment.get("body");
this.ajaxSucceed = false; this.ajaxSucceed = false;
this.view.update(DiscussionSpecHelper.makeEventSpy()); this.view.update(this.event);
expect($.ajax).toHaveBeenCalled(); expect($.ajax).toHaveBeenCalled();
expect($.ajax.calls.mostRecent().args[0].url._parts.path) expect($.ajax.calls.mostRecent().args[0].url._parts.path)
.toEqual('/courses/edX/999/test/discussion/comments/01234567/update'); .toEqual('/courses/edX/999/test/discussion/comments/01234567/update');
......
common/static/common/js/spec_helpers/discussion_spec_helper.js
...@@ -72,12 +72,12 @@ ...@@ -72,12 +72,12 @@
'thread-response-edit', 'response-comment-show', 'response-comment-edit', 'thread-list-item', 'thread-response-edit', 'response-comment-show', 'response-comment-edit', 'thread-list-item',
'discussion-home', 'search-alert', 'new-post', 'thread-type', 'new-post-menu-entry', 'discussion-home', 'search-alert', 'new-post', 'thread-type', 'new-post-menu-entry',
'new-post-menu-category', 'topic', 'post-user-display', 'inline-discussion', 'pagination', 'new-post-menu-category', 'topic', 'post-user-display', 'inline-discussion', 'pagination',
'user-profile', 'profile-thread' 'user-profile', 'profile-thread', 'customwmd-prompt', 'nav-loading'
]; ];
templateNamesNoTrailingTemplate = [ templateNamesNoTrailingTemplate = [
'forum-action-endorse', 'forum-action-answer', 'forum-action-follow', 'forum-action-vote', 'forum-action-endorse', 'forum-action-answer', 'forum-action-follow', 'forum-action-vote',
'forum-action-report', 'forum-action-pin', 'forum-action-close', 'forum-action-edit', 'forum-action-report', 'forum-action-pin', 'forum-action-close', 'forum-action-edit',
'forum-action-delete', 'forum-actions' 'forum-action-delete', 'forum-actions', 'alert-popup', 'nav-load-more-link'
]; ];
for (_i = 0, _len = templateNames.length; _i < _len; _i++) { for (_i = 0, _len = templateNames.length; _i < _len; _i++) {
templateName = templateNames[_i]; templateName = templateNames[_i];
......
common/static/common/templates/discussion/alert-popup.underscore 0 → 100644
<div class='modal' role='alertdialog' id='discussion-alert' aria-describedby='discussion-alert-message'>
<div class='inner-wrapper discussion-alert-wrapper'>
<button class='close-modal dismiss' title='<%- gettext("Close") %>''>
<span class='icon fa fa-times' aria-hidden='true'></span>
</button>
<header>
<h2/></h2>
<hr/>
</header>
<p id='discussion-alert-message'></p>
<hr/>
<button class='dismiss'><%- gettext("OK") %></button>
</div>
</div>
common/static/common/templates/discussion/nav-load-more-link.underscore 0 → 100644
<li class='forum-nav-load-more'>
<a href='#' class='forum-nav-load-more-link'>
<%- gettext("Load more") %>
</a>
</li>
common/static/common/templates/discussion/nav-loading.underscore 0 → 100644
<div class="forum-nav-loading" tabindex="0">
<span class="icon fa fa-spinner fa-spin"/>
<span class="sr" role="alert"><%- srText %></span>
</div>
common/static/common/templates/discussion/search-alert.underscore
<div class="search-alert" id="search-alert-<%- cid %>"> <div class="search-alert <%- css_class %>" id="search-alert-<%- cid %>">
<div class="search-alert-content"> <div class="search-alert-content">
<p class="message"><%= message %></p> <p class="message"><%= HtmlUtils.ensureHtml(messageHtml) %></p>
</div> </div>
<div class="search-alert-controls"> <div class="search-alert-controls">
......
common/static/karma_common.conf.js
...@@ -35,6 +35,8 @@ var options = { ...@@ -35,6 +35,8 @@ var options = {
{pattern: 'common/js/vendor/backbone.js', included: true}, {pattern: 'common/js/vendor/backbone.js', included: true},
{pattern: 'edx-ui-toolkit/js/utils/global-loader.js', included: true}, {pattern: 'edx-ui-toolkit/js/utils/global-loader.js', included: true},
{pattern: 'edx-ui-toolkit/js/utils/string-utils.js', included: true},
{pattern: 'edx-ui-toolkit/js/utils/html-utils.js', included: true},
{pattern: 'js/vendor/jasmine-imagediff.js', included: true}, {pattern: 'js/vendor/jasmine-imagediff.js', included: true},
{pattern: 'common/js/spec_helpers/jasmine-extensions.js', included: true}, {pattern: 'common/js/spec_helpers/jasmine-extensions.js', included: true},
......
lms/templates/discussion/_underscore_templates.html
<%page expression_filter="h"/>
<%namespace name='static' file='../static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<%! import json %> <%! from openedx.core.djangolib.js_utils import js_escaped_string %>
<script type="text/javascript"> <script type="text/javascript">
window.PLATFORM_NAME = ${json.dumps(settings.PLATFORM_NAME)}; window.PLATFORM_NAME = "${settings.PLATFORM_NAME | n, js_escaped_string}";
window.ENABLE_DISCUSSION_HOME_PANEL = ${json.dumps(settings.FEATURES.get('ENABLE_DISCUSSION_HOME_PANEL', False))}; % if settings.FEATURES.get('ENABLE_DISCUSSION_HOME_PANEL', False):
window.ENABLE_DISCUSSION_HOME_PANEL = true;
% else:
window.ENABLE_DISCUSSION_HOME_PANEL = false;
% endif
</script> </script>
<% <%
...@@ -11,7 +16,14 @@ template_names = [ ...@@ -11,7 +16,14 @@ template_names = [
'thread', 'thread-show', 'thread-edit', 'thread-response', 'thread-response-show', 'thread-response-edit', 'thread', 'thread-show', 'thread-edit', 'thread-response', 'thread-response-show', 'thread-response-edit',
'response-comment-show', 'response-comment-edit', 'thread-list-item', 'discussion-home', 'search-alert', 'response-comment-show', 'response-comment-edit', 'thread-list-item', 'discussion-home', 'search-alert',
'new-post', 'thread-type', 'new-post-menu-entry', 'new-post-menu-category', 'topic', 'post-user-display', 'new-post', 'thread-type', 'new-post-menu-entry', 'new-post-menu-category', 'topic', 'post-user-display',
'inline-discussion', 'pagination', 'user-profile', 'profile-thread', 'customwmd-prompt' 'inline-discussion', 'pagination', 'user-profile', 'profile-thread', 'customwmd-prompt', 'nav-loading'
]
## same, but without trailing "-template" in script ID - these templates does not contain any free variables
template_names_no_suffix = [
'forum-action-endorse', 'forum-action-answer', 'forum-action-follow', 'forum-action-vote', 'forum-action-report',
'forum-action-pin', 'forum-action-close', 'forum-action-edit', 'forum-action-delete', 'forum-actions',
'alert-popup', 'nav-load-more-link'
] ]
%> %>
...@@ -21,8 +33,8 @@ template_names = [ ...@@ -21,8 +33,8 @@ template_names = [
</script> </script>
% endfor % endfor
## same, but without trailing "-template" in script ID
% for template_name in ['forum-action-endorse', 'forum-action-answer', 'forum-action-follow', 'forum-action-vote', 'forum-action-report', 'forum-action-pin', 'forum-action-close', 'forum-action-edit', 'forum-action-delete', 'forum-actions']: % for template_name in template_names_no_suffix:
<script aria-hidden="true" type="text/template" id="${template_name}"> <script aria-hidden="true" type="text/template" id="${template_name}">
<%static:include path="common/templates/discussion/${template_name}.underscore" /> <%static:include path="common/templates/discussion/${template_name}.underscore" />
</script> </script>
......
lms/templates/discussion/user_profile.html
<%inherit file="../main.html" /> <%inherit file="../main.html" />
<%page expression_filter="h"/>
<%namespace name='static' file='../static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<%! <%!
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
...@@ -6,7 +7,7 @@ from django.template.defaultfilters import escapejs ...@@ -6,7 +7,7 @@ from django.template.defaultfilters import escapejs
%> %>
<%block name="bodyclass">discussion</%block> <%block name="bodyclass">discussion</%block>
<%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</%block> <%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default)}</%block>
<%block name="headextra"> <%block name="headextra">
<%static:css group='style-course-vendor'/> <%static:css group='style-course-vendor'/>
...@@ -33,7 +34,7 @@ from django.template.defaultfilters import escapejs ...@@ -33,7 +34,7 @@ from django.template.defaultfilters import escapejs
</nav> </nav>
</section> </section>
<section class="course-content container discussion-user-threads" data-course-id="${course.id | h}" data-course-name="${course.display_name_with_default_escaped | h}" data-threads="${threads | h}" data-user-info="${user_info | h}" data-page="${page | h}" data-num-pages="${num_pages | h}"/> <section class="course-content container discussion-user-threads" data-course-id="${course.id}" data-course-name="${course.display_name_with_default}" data-threads="${threads}" data-user-info="${user_info}" data-page="${page}" data-num-pages="${num_pages}"/>
</div> </div>
</section> </section>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment