Skip to content

Issues-483, Issues-484, Issues-535: Added validation of comment lengt… #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2021
Merged

Issues-483, Issues-484, Issues-535: Added validation of comment lengt… #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion TopcoderEditorPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ private function beforeRender($sender){
$sender->addJsFile('topcodereditor.mathjax.js', 'plugins/TopcoderEditor', ['defer'=>'defer']);
$c = Gdn::controller();

$sender->Form->addHidden('MaxCommentLength', c('Vanilla.Comment.MaxLength', 10000));

// Set formats
$c->addDefinition('defaultInputFormat', c('Garden.InputFormatter'));
$c->addDefinition('defaultMobileInputFormat', c('Garden.MobileInputFormatter'));
Expand Down Expand Up @@ -115,11 +117,13 @@ private function beforeRender($sender){
// Get max file uploads, to be used for max drops at once.
$c->addDefinition('maxFileUploads', ini_get('max_file_uploads'));

// Max Comment Length
$c->addDefinition('maxCommentLength', c('Vanilla.Comment.MaxLength', 10000));

// Set editor definitions
$c->addDefinition('editorVersion', $this->pluginInfo['Version']);
$c->addDefinition('editorInputFormat', ucfirst(self::FORMAT_NAME));
$c->addDefinition('editorPluginAssets', $this->AssetPath);

$additionalDefinitions = [];
$this->EventArguments['definitions'] = &$additionalDefinitions;
$this->fireEvent('GetJSDefinitions');
Expand Down
15 changes: 8 additions & 7 deletions js/easymde.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19359,26 +19359,27 @@ EasyMDE.prototype.createStatusbar = function (status) {

// Ensure the defaultValue is a function
if (typeof item.defaultValue === 'function') {
item.defaultValue(el);
item.defaultValue(el, this.codemirror);
}


// Ensure the onUpdate is a function
if (typeof item.onUpdate === 'function') {
// Create a closure around the span of the current action, then execute the onUpdate handler
this.codemirror.on('update', (function (el, item) {
// FIX: issues with status bar if there are several editors on a page
this.codemirror.on('update', (function (el, item, cm) {
return function () {
item.onUpdate(el);
item.onUpdate(el,cm);
};
}(el, item)));
}(el, item, this.codemirror)));
}
if (typeof item.onActivity === 'function') {
// Create a closure around the span of the current action, then execute the onActivity handler
this.codemirror.on('cursorActivity', (function (el, item) {
this.codemirror.on('cursorActivity', (function (el, item, cm) {
return function () {
item.onActivity(el);
item.onActivity(el, cm);
};
}(el, item)));
}(el, item, this.codemirror)));
}


Expand Down
54 changes: 53 additions & 1 deletion js/topcodereditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/**
* Determine editor settings
*/
var maxCommentLength = (gdn.definition('maxCommentLength'));
var canUpload = (gdn.definition('canUpload', false)) ? 1 : 0;
var maxUploadSize = gdn.definition('maxUploadSize');
var allowedImageExtensions = gdn.definition('allowedImageExtensions');
Expand Down Expand Up @@ -525,7 +526,40 @@
fileTooLarge: 'Uploading #image_name# was failed. The file is too big (#image_size#).\n' +
'Maximum file size is #image_max_size#.',
importError: 'Uploading #image_name# was failed. Something went wrong when uploading the file.',
}
},
status: [{
className: 'message',
defaultValue: function(el) {
el.innerHTML = '';
},
onUpdate: function(el) {
},
}
, 'upload-image', {
className: 'countOfRemainingChars',
defaultValue: function(el, cm) {
var countOfRemainingChars = maxCommentLength;
var text = cm.getValue();
if(text != null && text.length > 0) {
countOfRemainingChars = maxCommentLength - text.length;
if(countOfRemainingChars < 0) {
countOfRemainingChars = 0;
}
}
el.innerHTML = countOfRemainingChars +" character remaining";
},
onUpdate: function(el, cm) {
var countOfRemainingChars = maxCommentLength;
var text = cm.getValue();
if(text != null && text.length > 0) {
countOfRemainingChars = maxCommentLength - text.length;
if(countOfRemainingChars < 0) {
countOfRemainingChars = 0;
}
}
el.innerHTML = countOfRemainingChars +" character remaining";
},
}],
});

// forceSync = true, need to clear form after async requests
Expand All @@ -534,6 +568,24 @@
});

editor.codemirror.on('change', function (cm, event) {
var frm = $(cm.getInputField()).closest('form').first();
var editorContainer = $(frm).find('.EasyMDEContainer');
var messageContainer = $(frm).find('.editor-statusbar .message');

var text = cm.getValue();
if(text.length > 0 && text.length <= maxCommentLength) {
$(editorContainer).removeClass('error');
$(messageContainer).text('');
$(frm).find(':submit').removeAttr("disabled");
$(frm).find('.Buttons a.Button').removeClass('Disabled');
} else if(text.length > maxCommentLength) {
$(editorContainer).addClass('error');
var count = text.length - maxCommentLength;
$(messageContainer).text('Comment is '+ count + ' characters too long');
$(frm).find(':submit').attr('disabled', 'disabled');
$(frm).find('.Buttons a.Button:not(.Cancel)').addClass('Disabled');
}

// Key events don't work properly on Android Chrome
if (!cm.state.completionActive /*Enables keyboard navigation in autocomplete list*/) {
if (event.origin == '+input' && event.text && event.text.length > 0 && event.text[0] === '@') {
Expand Down
Loading