Update quick modify to support Ctrl+Enter

Author: live627

Sources/Actions/Display.php

@@ -225,7 +225,6 @@ public function prepareDisplayContext(): array|bool
 				'label' => Lang::getTxt('quick_edit', file: 'General'),
 				'class' => 'quick_edit',
 				'id' => 'modify_button_' . $output['id'],
-				'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty(Config::$modSettings['toggle_subject']) . '\')"',
 				'icon' => 'quick_edit_button',
 				'show' => $output['can_modify'],
 			],

Themes/default/Display.template.php

@@ -209,7 +209,7 @@ function template_main()
 	// Show the topic information - icon, subject, etc.
 	echo '
 		<div id="forumposts">
-			<form action="', Config::$scripturl, '?action=quickmod2;topic=', Utils::$context['current_topic'], '.', Utils::$context['start'], '" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm" onsubmit="return oQuickModify.bInEditMode ? oQuickModify.modifySave(\'' . Utils::$context['session_id'] . '\', \'' . Utils::$context['session_var'] . '\') : false">';
+			<form action="', Config::$scripturl, '?action=quickmod2;topic=', Utils::$context['current_topic'], '.', Utils::$context['start'], '" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm">';
 
 	Utils::$context['ignoredMsgs'] = array();
 	Utils::$context['removableMessageIDs'] = array();
@@ -327,30 +327,16 @@ function template_main()
 	}
 
 	echo '
-				var oQuickModify = new QuickModify({
+				new QuickModify({
 					sScriptUrl: smf_scripturl,
+					sFormName: \'quickModForm\',
 					sClassName: \'quick_edit\',
 					bShowModify: ', Config::$modSettings['show_modify'] ? 'true' : 'false', ',
 					iTopicId: ', Utils::$context['current_topic'], ',
-					sTemplateBodyEdit: ', Utils::escapeJavaScript('
-						<div id="quick_edit_body_container">
-							<div id="error_box" class="error"></div>
-							<textarea class="editor" name="message" rows="12">%body%</textarea><br>
-							<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
-							<input type="hidden" name="topic" value="' . Utils::$context['current_topic'] . '">
-							<input type="hidden" name="msg" value="%msg_id%">
-							<div class="righttext quickModifyMargin">
-								<input type="submit" name="post" value="' . Lang::$txt['save'] . '" onclick="return oQuickModify.modifySave(\'' . Utils::$context['session_id'] . '\', \'' . Utils::$context['session_var'] . '\');" class="button">' . (Utils::$context['show_spellchecking'] ? ' <input type="button" value="' . Lang::$txt['spell_check'] . '" onclick="spellCheck(\'quickModForm\', \'message\');" class="button">' : '') . ' <input type="submit" name="cancel" value="' . Lang::$txt['modify_cancel'] . '" onclick="return oQuickModify.modifyCancel();" class="button">
-							</div>
-						</div>'), ',
-					sTemplateSubjectEdit: ', Utils::escapeJavaScript('<input type="text" name="subject" value="%subject%" size="80" maxlength="80">'), ',
-					sTemplateBodyNormal: ', Utils::escapeJavaScript('%body%'), ',
-					sTemplateSubjectNormal: ', Utils::escapeJavaScript('<a href="' . Config::$scripturl . '?topic=' . Utils::$context['current_topic'] . '.msg%msg_id%#msg%msg_id%" rel="nofollow">%subject%</a>'), ',
-					sTemplateTopSubject: ', Utils::escapeJavaScript('%subject%'), ',
-					sTemplateReasonEdit: ', Utils::escapeJavaScript(Lang::$txt['reason_for_edit'] . ': <input type="text" name="modify_reason" value="%modify_reason%" size="80" maxlength="80" class="quickModifyMargin">'), ',
-					sTemplateReasonNormal: ', Utils::escapeJavaScript('%modify_text'), ',
-					sErrorBorderStyle: ', Utils::escapeJavaScript('1px solid red'), (Utils::$context['can_reply']) ? ',
-					sFormRemoveAccessKeys: \'postmodify\'' : '', '
+					sSaveButtonText: ', Utils::escapeJavaScript(Lang::getTxt('save', file: 'General')), ',
+					sCancelButtonText: ', Utils::escapeJavaScript(Lang::getTxt('modify_cancel', file: 'General')), ',
+					sEditReasonText: ', Utils::escapeJavaScript(Lang::getTxt('reason_for_edit', file: 'General')) . ',
+					sErrorBorderStyle: ', Utils::escapeJavaScript('1px solid red'), '
 				});
 
 				new JumpTo({

Themes/default/scripts/script.js

@@ -551,6 +551,15 @@ function submitThisOnce(oControl)
 
 	return !smf_formSubmitted;
 }
+function reActivateThis(oControl)
+{
+	// oControl might also be a form.
+	var oForm = 'form' in oControl ? oControl.form : oControl;
+
+	var aTextareas = oForm.getElementsByTagName('textarea');
+	for (var i = 0, n = aTextareas.length; i < n; i++)
+		aTextareas[i].readOnly = false;
+}
 
 // Deprecated, as innerHTML is supported everywhere.
 function setInnerHTML(oElement, sToValue)