ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more js improvements

Browse Source
This commit is contained in:
vangheem 2015-02-10 16:41:00 -06:00
parent ad3953f794
commit c49c9707ec
4 changed files with 122 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plone/app/discussion/browser/controlpanel.pt
View File

@ -6,22 +6,12 @@
metal:use-macro="here/prefs_main_template/macros/master" metal:use-macro="here/prefs_main_template/macros/master"
i18n:domain="plone"> i18n:domain="plone">
<metal:javascript_head_slot fill-slot="javascript_head_slot">
<script type="text/javascript"
tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js">
</script>
</metal:javascript_head_slot>
<body> <body>
<article id="content" <article id="content"
tal:attributes="class view/settings" tal:attributes="class view/settings"
metal:fill-slot="prefs_configlet_content"> metal:fill-slot="prefs_configlet_content">
<script type="text/javascript"
tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js">
</script>
<div class="portalMessage warning" <div class="portalMessage warning"
tal:condition="view/mailhost_warning"> tal:condition="view/mailhost_warning">
<strong i18n:translate=""> <strong i18n:translate="">
@ -99,6 +89,9 @@
</div> </div>
</div> </div>
<script type="text/javascript"
tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js">
</script>
</article> </article>
</body> </body>
</html> </html>

137
plone/app/discussion/browser/javascripts/comments.js
View File

@ -3,17 +3,20 @@
* jQuery functions for the plone.app.discussion comment viewlet and form. * jQuery functions for the plone.app.discussion comment viewlet and form.
* *
******************************************************************************/ ******************************************************************************/
/* global require */
if(require === undefined){ if(require === undefined){
require = function(reqs, torun){ require = function(reqs, torun){ // jshint ignore:line
'use strict'; 'use strict';
return torun(window.jQuery); return torun(window.jQuery);
} };
} }
require([ require([ // jshint ignore:line
'jquery' 'jquery'
], function ($) { ], function ($) {
'use strict';
// This unnamed function allows us to use $ inside of a block of code // This unnamed function allows us to use $ inside of a block of code
// without permanently overwriting $. // without permanently overwriting $.
// http://docs.jquery.com/Using_jQuery_with_Other_Libraries // http://docs.jquery.com/Using_jQuery_with_Other_Libraries
@ -24,39 +27,39 @@ require([
**************************************************************************/ **************************************************************************/
$.createReplyForm = function (comment_div) { $.createReplyForm = function (comment_div) {
var comment_id = comment_div.attr("id"); var comment_id = comment_div.attr('id');
var reply_button = comment_div.find(".reply-to-comment-button"); var reply_button = comment_div.find('.reply-to-comment-button');
/* Clone the reply div at the end of the page template that contains /* Clone the reply div at the end of the page template that contains
* the regular comment form. * the regular comment form.
*/ */
var reply_div = $("#commenting").clone(true); var reply_div = $('#commenting').clone(true);
/* Remove the ReCaptcha JS code before appending the form. If not /* Remove the ReCaptcha JS code before appending the form. If not
* removed, this causes problems * removed, this causes problems
*/ */
reply_div.find("#formfield-form-widgets-captcha") reply_div.find('#formfield-form-widgets-captcha')
.find("script") .find('script')
.remove(); .remove();
/* Insert the cloned comment form right after the reply button of the /* Insert the cloned comment form right after the reply button of the
* current comment. * current comment.
*/ */
reply_div.appendTo(comment_div).css("display", "none"); reply_div.appendTo(comment_div).css('display', 'none');
/* Remove id="commenting" attribute, since we use it to uniquely define /* Remove id='commenting' attribute, since we use it to uniquely define
the main reply form. */ the main reply form. */
// Still belongs to class="reply" // Still belongs to class='reply'
reply_div.removeAttr("id"); reply_div.removeAttr('id');
/* Hide the reply button (only hide, because we may want to show it /* Hide the reply button (only hide, because we may want to show it
* again if the user hits the cancel button). * again if the user hits the cancel button).
*/ */
$(reply_button).css("display", "none"); $(reply_button).css('display', 'none');
/* Fetch the reply form inside the reply div */ /* Fetch the reply form inside the reply div */
var reply_form = reply_div.find("form"); var reply_form = reply_div.find('form');
/* Change the id of the textarea of the reply form /* Change the id of the textarea of the reply form
* To avoid conflict later between textareas with same id 'form-widgets-comment-text' while implementing a seperate instance of TinyMCE * To avoid conflict later between textareas with same id 'form-widgets-comment-text' while implementing a seperate instance of TinyMCE
@ -67,23 +70,23 @@ require([
/* Populate the hidden 'in_reply_to' field with the correct comment /* Populate the hidden 'in_reply_to' field with the correct comment
id */ id */
reply_form.find("input[name='form.widgets.in_reply_to']") reply_form.find('input[name="form.widgets.in_reply_to"]')
.val(comment_id); .val(comment_id);
/* Add a remove-reply-to-comment Javascript function to remove the /* Add a remove-reply-to-comment Javascript function to remove the
form */ form */
var cancel_reply_button = reply_div.find(".cancelreplytocomment"); var cancel_reply_button = reply_div.find('.cancelreplytocomment');
cancel_reply_button.attr("id", comment_id); cancel_reply_button.attr('id', comment_id);
/* Show the cancel buttons. */ /* Show the cancel buttons. */
reply_form.find("input[name='form.buttons.cancel']") reply_form.find('input[name="form.buttons.cancel"]')
.css("display", "inline"); .css('display', 'inline');
/* Show the reply layer with a slide down effect */ /* Show the reply layer with a slide down effect */
reply_div.slideDown("slow"); reply_div.slideDown('slow');
/* Show the cancel button in the reply-to-comment form */ /* Show the cancel button in the reply-to-comment form */
cancel_reply_button.css("display", "inline"); cancel_reply_button.css('display', 'inline');
}; };
@ -92,10 +95,10 @@ require([
* to the function. * to the function.
**************************************************************************/ **************************************************************************/
$.clearForm = function (form_div) { $.clearForm = function (form_div) {
form_div.find(".error").removeClass("error"); form_div.find('.error').removeClass('error');
form_div.find(".fieldErrorBox").remove(); form_div.find('.fieldErrorBox').remove();
form_div.find("input[type='text']").attr("value", ""); form_div.find('input[type="text"]').attr('value', '');
form_div.find("textarea").attr("value", ""); form_div.find('textarea').attr('value', '');
/* XXX: Clean all additional form extender fields. */ /* XXX: Clean all additional form extender fields. */
}; };
@ -110,50 +113,50 @@ require([
/********************************************************************** /**********************************************************************
* If the user has hit the reply button of a reply-to-comment form * If the user has hit the reply button of a reply-to-comment form
* (form was submitted with a value for the "in_reply_to" field in the * (form was submitted with a value for the 'in_reply_to' field in the
* request), create a reply-to-comment form right under this comment. * request), create a reply-to-comment form right under this comment.
**********************************************************************/ **********************************************************************/
var post_comment_div = $("#commenting"); var post_comment_div = $('#commenting');
var in_reply_to_field = var in_reply_to_field =
post_comment_div.find("input[name='form.widgets.in_reply_to']"); post_comment_div.find('input[name="form.widgets.in_reply_to"]');
if (in_reply_to_field.length !== 0 && in_reply_to_field.val() !== "") { if (in_reply_to_field.length !== 0 && in_reply_to_field.val() !== '') {
var current_reply_id = "#" + in_reply_to_field.val(); var current_reply_id = '#' + in_reply_to_field.val();
var current_reply_to_div = $(".discussion").find(current_reply_id); var current_reply_to_div = $('.discussion').find(current_reply_id);
$.createReplyForm(current_reply_to_div); $.createReplyForm(current_reply_to_div);
$.clearForm(post_comment_div); $.clearForm(post_comment_div);
} }
/********************************************************************** /**********************************************************************
* If the user hits the "reply" button of an existing comment, create a * If the user hits the 'reply' button of an existing comment, create a
* reply form right beneath this comment. * reply form right beneath this comment.
**********************************************************************/ **********************************************************************/
$(".reply-to-comment-button").bind("click", function (e) { $('.reply-to-comment-button').bind('click', function (e) { // jshint ignore:line
var comment_div = $(this).parents().filter(".comment"); var comment_div = $(this).parents().filter('.comment');
$.createReplyForm(comment_div); $.createReplyForm(comment_div);
$.clearForm(comment_div); $.clearForm(comment_div);
}); });
/********************************************************************** /**********************************************************************
* If the user hits the "clear" button of an open reply-to-comment form, * If the user hits the 'clear' button of an open reply-to-comment form,
* remove the form and show the "reply" button again. * remove the form and show the 'reply' button again.
**********************************************************************/ **********************************************************************/
$("#commenting #form-buttons-cancel").bind("click", function (e) { $('#commenting #form-buttons-cancel').bind('click', function (e) {
e.preventDefault(); e.preventDefault();
var reply_to_comment_button = $(this). var reply_to_comment_button = $(this).
parents(). parents().
filter(".comment"). filter('.comment').
find(".reply-to-comment-button"); find('.reply-to-comment-button');
/* Find the reply-to-comment form and hide and remove it again. */ /* Find the reply-to-comment form and hide and remove it again. */
$.reply_to_comment_form = $(this).parents().filter(".reply"); $.reply_to_comment_form = $(this).parents().filter('.reply');
$.reply_to_comment_form.slideUp("slow", function () { $.reply_to_comment_form.slideUp('slow', function () {
$(this).remove(); $(this).remove();
}); });
/* Show the reply-to-comment button again. */ /* Show the reply-to-comment button again. */
reply_to_comment_button.css("display", "inline"); reply_to_comment_button.css('display', 'inline');
}); });
@ -161,22 +164,22 @@ require([
/********************************************************************** /**********************************************************************
* Publish a single comment. * Publish a single comment.
**********************************************************************/ **********************************************************************/
$("input[name='form.button.PublishComment']").on('click', function () { $('input[name="form.button.PublishComment"]').on('click', function () {
var trigger = this; var trigger = this;
var form = $(this).parents("form"); var form = $(this).parents('form');
var data = $(form).serialize(); var data = $(form).serialize();
var form_url = $(form).attr("action"); var form_url = $(form).attr('action');
$.ajax({ $.ajax({
type: "GET", type: 'GET',
url: form_url, url: form_url,
data: data, data: data,
context: trigger, context: trigger,
success: function (msg) { success: function (msg) { // jshint ignore:line
// remove button (trigger object can't be directly removed) // remove button (trigger object can't be directly removed)
form.find("input[name='form.button.PublishComment']").remove(); form.find('input[name="form.button.PublishComment"]').remove();
form.parents(".state-pending").toggleClass('state-pending').toggleClass('state-published'); form.parents('.state-pending').toggleClass('state-pending').toggleClass('state-published');
}, },
error: function (msg) { error: function (msg) { // jshint ignore:line
return true; return true;
} }
}); });
@ -186,35 +189,35 @@ require([
/********************************************************************** /**********************************************************************
* Edit a comment * Edit a comment
**********************************************************************/ **********************************************************************/
$("form[name='edit']").prepOverlay({ $('form[name="edit"]').prepOverlay({
cssclass: 'overlay-edit-comment', cssclass: 'overlay-edit-comment',
width: '60%', width: '60%',
subtype: 'ajax', subtype: 'ajax',
filter: '#content>*' filter: '#content>*'
}) });
/********************************************************************** /**********************************************************************
* Delete a comment and its answers. * Delete a comment and its answers.
**********************************************************************/ **********************************************************************/
$("input[name='form.button.DeleteComment']").on('click', function () { $('input[name="form.button.DeleteComment"]').on('click', function () {
var trigger = this; var trigger = this;
var form = $(this).parents("form"); var form = $(this).parents('form');
var data = $(form).serialize(); var data = $(form).serialize();
var form_url = $(form).attr("action"); var form_url = $(form).attr('action');
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: form_url, url: form_url,
data: data, data: data,
context: $(trigger).parents(".comment"), context: $(trigger).parents('.comment'),
success: function (data) { success: function (data) { // jshint ignore:line
var comment = $(this); var comment = $(this);
var clss = comment.attr('class'); var clss = comment.attr('class');
// remove replies // remove replies
var treelevel = parseInt(clss[clss.indexOf('replyTreeLevel') + 'replyTreeLevel'.length], 10); var treelevel = parseInt(clss[clss.indexOf('replyTreeLevel') + 'replyTreeLevel'.length], 10);
// selector for all the following elements of lower level // selector for all the following elements of lower level
var selector = ".replyTreeLevel" + treelevel; var selector = '.replyTreeLevel' + treelevel;
for (var i = 0; i < treelevel; i++) { for (var i = 0; i < treelevel; i++) {
selector += ", .replyTreeLevel" + i; selector += ', .replyTreeLevel' + i;
} }
comment.nextUntil(selector).each(function () { comment.nextUntil(selector).each(function () {
$(this).fadeOut('fast', function () { $(this).fadeOut('fast', function () {
@ -229,7 +232,7 @@ require([
$(this).remove(); $(this).remove();
}); });
}, },
error: function (req, error) { error: function (req, error) { // jshint ignore:line
return true; return true;
} }
}); });
@ -241,10 +244,10 @@ require([
* By default, hide the reply and the cancel button for the regular add * By default, hide the reply and the cancel button for the regular add
* comment form. * comment form.
**********************************************************************/ **********************************************************************/
$(".reply").find("input[name='form.buttons.reply']") $('.reply').find('input[name="form.buttons.reply"]')
.css("display", "none"); .css('display', 'none');
$(".reply").find("input[name='form.buttons.cancel']") $('.reply').find('input[name="form.buttons.cancel"]')
.css("display", "none"); .css('display', 'none');
/********************************************************************** /**********************************************************************
@ -252,7 +255,7 @@ require([
* Otherwise hide it, since the reply functions only work with JS * Otherwise hide it, since the reply functions only work with JS
* enabled. * enabled.
**********************************************************************/ **********************************************************************/
$(".reply-to-comment-button").css("display" , "inline"); $('.reply-to-comment-button').css('display' , 'inline');
}); });

49
plone/app/discussion/browser/javascripts/controlpanel.js
View File

@ -3,7 +3,19 @@
* jQuery functions for the plone.app.discussion comment viewlet and form. * jQuery functions for the plone.app.discussion comment viewlet and form.
* *
******************************************************************************/ ******************************************************************************/
(function ($) { /* global require */
if(require === undefined){
require = function(reqs, torun){ // jshint ignore:line
'use strict';
return torun(window.jQuery);
};
}
require([ // jshint ignore:line
'jquery'
], function ($) {
'use strict';
// This unnamed function allows us to use $ inside of a block of code // This unnamed function allows us to use $ inside of a block of code
// without permanently overwriting $. // without permanently overwriting $.
// http://docs.jquery.com/Using_jQuery_with_Other_Libraries // http://docs.jquery.com/Using_jQuery_with_Other_Libraries
@ -12,7 +24,7 @@
$.disableSettings = function (settings) { $.disableSettings = function (settings) {
$.each(settings, function (intIndex, setting) { $.each(settings, function (intIndex, setting) {
setting.addClass('unclickable'); setting.addClass('unclickable');
var setting_field = $(setting).find("input,select"); var setting_field = $(setting).find('input,select');
setting_field.attr('disabled', 'disabled'); setting_field.attr('disabled', 'disabled');
}); });
}; };
@ -21,7 +33,7 @@
$.enableSettings = function (settings) { $.enableSettings = function (settings) {
$.each(settings, function (intIndex, setting) { $.each(settings, function (intIndex, setting) {
setting.removeClass('unclickable'); setting.removeClass('unclickable');
var setting_field = $(setting).find("input,select"); var setting_field = $(setting).find('input,select');
setting_field.removeAttr('disabled'); setting_field.removeAttr('disabled');
}); });
}; };
@ -29,11 +41,9 @@
/* Update settings */ /* Update settings */
$.updateSettings = function () { $.updateSettings = function () {
var globally_enabled = $("#content").hasClass("globally_enabled"); var globally_enabled = $('#content').hasClass('globally_enabled');
var anonymous_comments = $("#content").hasClass("anonymous_comments"); var moderation_custom = $('#content').hasClass('moderation_custom');
var moderation_enabled = $("#content").hasClass("moderation_enabled"); var invalid_mail_setup = $('#content').hasClass('invalid_mail_setup');
var moderation_custom = $("#content").hasClass("moderation_custom");
var invalid_mail_setup = $("#content").hasClass("invalid_mail_setup");
/* If commenting is globally disabled, disable all settings. */ /* If commenting is globally disabled, disable all settings. */
if (globally_enabled === true) { if (globally_enabled === true) {
@ -104,17 +114,14 @@
$.updateSettings(); $.updateSettings();
// Set #content class and update settings afterwards // Set #content class and update settings afterwards
$("input,select").on("change", function (e) { $('#form-widgets-globally_enabled-0').on('change', function(){
var id = $(this).attr("id"); if (this.checked) {
if (id === "form-widgets-globally_enabled-0") { $('#content').addClass('globally_enabled');
if ($(this).attr("checked")) {
$("#content").addClass("globally_enabled");
}
else {
$("#content").removeClass("globally_enabled");
}
$.updateSettings();
} }
else {
$('#content').removeClass('globally_enabled');
}
$.updateSettings();
}); });
/********************************************************************** /**********************************************************************
@ -122,12 +129,12 @@
* submitting the form. Otherwise the z3c.form will raise errors on * submitting the form. Otherwise the z3c.form will raise errors on
* the required attributes. * the required attributes.
**********************************************************************/ **********************************************************************/
$("form#DiscussionSettingsEditForm").bind("submit", function (e) { $('form#DiscussionSettingsEditForm').bind('submit', function () {
$(this).find("input,select").removeAttr('disabled'); $(this).find('input,select').removeAttr('disabled');
}); });
}); });
//#JSCOVERAGE_ENDIF //#JSCOVERAGE_ENDIF
}(jQuery)); });

33
plone/app/discussion/browser/javascripts/moderation.js
View File

@ -3,8 +3,20 @@
* jQuery functions for the plone.app.discussion bulk moderation. * jQuery functions for the plone.app.discussion bulk moderation.
* *
******************************************************************************/ ******************************************************************************/
/* global require, alert */
/* jshint quotmark: false */
(function ($) { if(require === undefined){
require = function(reqs, torun){ // jshint ignore:line
'use strict';
return torun(window.jQuery);
};
}
require([ // jshint ignore:line
'jquery'
], function ($) {
'use strict';
// This unnamed function allows us to use $ inside of a block of code // This unnamed function allows us to use $ inside of a block of code
// without permanently overwriting $. // without permanently overwriting $.
// http://docs.jquery.com/Using_jQuery_with_Other_Libraries // http://docs.jquery.com/Using_jQuery_with_Other_Libraries
@ -22,16 +34,13 @@
**********************************************************************/ **********************************************************************/
$("input[name='form.button.Delete']").click(function (e) { $("input[name='form.button.Delete']").click(function (e) {
e.preventDefault(); e.preventDefault();
var button = $(this);
var row = $(this).parent().parent(); var row = $(this).parent().parent();
var form = $(row).parents("form");
var path = $(row).find("[name='selected_obj_paths:list']").attr("value"); var path = $(row).find("[name='selected_obj_paths:list']").attr("value");
var target = path + "/@@moderate-delete-comment"; var target = path + "/@@moderate-delete-comment";
var comment_id = $(this).attr("id");
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: target, url: target,
success: function (msg) { success: function (msg) { // jshint ignore:line
// fade out row // fade out row
$(row).fadeOut("normal", function () { $(row).fadeOut("normal", function () {
$(this).remove(); $(this).remove();
@ -42,7 +51,7 @@
location.reload(); location.reload();
} }
}, },
error: function (msg) { error: function (msg) { // jshint ignore:line
alert("Error sending AJAX request:" + target); alert("Error sending AJAX request:" + target);
} }
}); });
@ -54,15 +63,13 @@
**********************************************************************/ **********************************************************************/
$("input[name='form.button.Publish']").click(function (e) { $("input[name='form.button.Publish']").click(function (e) {
e.preventDefault(); e.preventDefault();
var button = $(this);
var row = $(this).parent().parent(); var row = $(this).parent().parent();
var form = $(row).parents("form");
var path = $(row).find("[name='selected_obj_paths:list']").attr("value"); var path = $(row).find("[name='selected_obj_paths:list']").attr("value");
var target = path + "/@@moderate-publish-comment"; var target = path + "/@@moderate-publish-comment";
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: target, url: target,
success: function (msg) { success: function (msg) { // jshint ignore:line
// fade out row // fade out row
$(row).fadeOut("normal", function () { $(row).fadeOut("normal", function () {
$(this).remove(); $(this).remove();
@ -73,7 +80,7 @@
location.reload(); location.reload();
} }
}, },
error: function (msg) { error: function (msg) { // jshint ignore:line
alert("Error sending AJAX request:" + target); alert("Error sending AJAX request:" + target);
} }
}); });
@ -98,7 +105,7 @@
alert("You haven't selected any comment for this bulk action." + alert("You haven't selected any comment for this bulk action." +
"Please select at least one comment."); "Please select at least one comment.");
} else { } else {
$.post(target, params, function (data) { $.post(target, params, function (data) { // jshint ignore:line
valArray.each(function () { valArray.each(function () {
/* Remove all selected lines. */ /* Remove all selected lines. */
var row = $(this).parent().parent(); var row = $(this).parent().parent();
@ -151,7 +158,7 @@
// show full text // show full text
td.replaceWith("<td>" + data + "</td>"); td.replaceWith("<td>" + data + "</td>");
}, },
error: function (msg) { error: function (msg) { // jshint ignore:line
alert("Error getting full comment text:" + target); alert("Error getting full comment text:" + target);
} }
}); });
@ -161,4 +168,4 @@
//#JSCOVERAGE_ENDIF //#JSCOVERAGE_ENDIF
}(jQuery)); });