Skip to content

Issues-498: fixed threaded/flat mode for anonymous; Issues-491: fixed quote functionality #504

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
jmgasper merged 2 commits into from
Mar 28, 2021
Merged

Issues-498: fixed threaded/flat mode for anonymous; Issues-491: fixed quote functionality #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56058c6
Issues-498: fixed threaded/flat mode for anonymous
atelomycterus Mar 28, 2021
1f1c812
Issues-491: Fix quote functionality
atelomycterus Mar 28, 2021
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
30 changes: 30 additions & 0 deletions config/vanilla/bootstrap.before.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,4 +875,34 @@ function writeInlineCommentOptions($comment) {
echo '</div>';

}
}

if (!function_exists('discussionUrl')) {
/**
* Return a URL for a discussion. This function is in here and not functions.general so that plugins can override.
*
* @param object|array $discussion
* @param int|string $page
* @param bool $withDomain
* @return string
*/
function discussionUrl($discussion, $page = '', $withDomain = true) {
$discussion = (object)$discussion;
$name = Gdn_Format::url($discussion->Name);

// Disallow an empty name slug in discussion URLs.
if (empty($name)) {
$name = 'x';
}

$result = '/discussion/'.$discussion->DiscussionID.'/'.$name;

if ($page) {
//if ($page > 1 || Gdn::session()->UserID) {
$result .= '/p'.$page;
// }
}

return url($result, $withDomain);
}
}
3 changes: 2 additions & 1 deletion vanilla/plugins/Quotes/class.quotes.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public function profileController_afterAddSideMenu_handler($sender) {
*
* @param profileController $sender
*/
/*
public function profileController_quotes_create($sender) {
$sender->permission('Garden.SignIn.Allow');
$sender->title(t("Quote Settings"));
Expand Down Expand Up @@ -140,7 +141,7 @@ public function profileController_quotes_create($sender) {
$sender->render('quotes', '', 'plugins/Quotes');
}

*/
/**
* Set user's quote folding preference in the page for Javascript access.
*
Expand Down
20 changes: 2 additions & 18 deletions vanilla/plugins/Quotes/js/quotes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Gdn_Quotes.prototype.GetEditor = function () {
var editor = $(this.currentEditor);
if (!document.body.contains(this.currentEditor) || !editor.length) {
// FIX: https://github.com/topcoder-platform/forums/issues/83
editor = $('.richEditor-textWrap').first();
editor = $('.bodybox-wrap').first();
}

return editor;
Expand Down Expand Up @@ -165,23 +165,7 @@ Gdn_Quotes.prototype.QuoteResponse = function(Data, Status, XHR) {

// Insert the quote text into the editor.
Gdn_Quotes.prototype.ApplyQuoteText = function(QuoteText) {
var Editor = this.GetEditor();

// First try and throw an event.
Editor.trigger('appendHtml', QuoteText + '<br />');

QuoteText = QuoteText + '\n';
Editor.val(Editor.val() + QuoteText);

// DEPRECATED: cleditor support
if ($('div.cleditorMain').length) {
Editor.val(Editor.val() + '<br/>');
Editor.get(0).editor.updateFrame();
}

Editor
.focus()
.trigger('autosize.resize');
$(document).trigger('ApplyQuoteText', [QuoteText]);
};

(function(window) {
Expand Down