Skip to content

Commit 222190b

Browse files
TheBryanOpen228TheBryanOpen228
committed
Revert "INT-18505: Line spacing not retained in advanced forum posts"
This reverts commit 6ece47ae0828aff2e603efbc20aacbf3bab57df9.
1 parent a50c508 commit 222190b

File tree

6 files changed

+22
-25
lines changed

6 files changed

+22
-25
lines changed

‎classes/controller/edit_controller.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ public function reply_action() {
114114
if (!empty($privatereply)) {
115115
$privatereply = $parent->userid;
116116
}
117-
// Convert text to HTML format.
118-
$message = format_text($message, FORMAT_MOODLE, ['filter' => false]);
119-
120117
$data = array(
121118
'privatereply' => $privatereply,
122119
'message' => $message,

‎yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article-debug.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -579,10 +579,10 @@ Y.extend(FORM, Y.Base,
579579

580580
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
581581
advNode.setAttribute('href', advNode.getAttribute('href').replace(/reply=\d+/, 'reply=' + parentNode.getData('postid')));
582-
var message = wrapperNode.one('div[id^=editor-target-container-] textarea');
582+
var message = wrapperNode.one('div[id^=editor-target-container-]');
583583
advNode.on("click", function (e) {
584584
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
585-
message.get('value'));
585+
message.get('textContent'));
586586
});
587587

588588
if (parentNode.hasAttribute('data-ispost')) {
@@ -754,12 +754,12 @@ Y.extend(FORM, Y.Base,
754754
},
755755

756756
sendInProgressData:function (e) {
757-
var message = Y.one('div[id^=editor-target-container-] textarea');
757+
var message = Y.one('div[id^=editor-target-container-]');
758758
var subject = Y.one('input[name=subject]');
759759
var link = e.target.getAttribute('href');
760760
if (!link.includes('post.php?edit')) {
761761
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
762-
message.get('value') + '&subcontent=' + subject.get('value'));
762+
message.get('textContent') + '&subcontent=' + subject.get('value'));
763763
}
764764
},
765765
/**
@@ -957,11 +957,11 @@ Y.extend(FORM, Y.Base,
957957
Y.log('Timed post disabled');
958958
}
959959
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
960-
var message = Y.one('div[id^=editor-target-container-] textarea');
960+
var message = Y.one('div[id^=editor-target-container-]');
961961
var subject = Y.one('input[name=subject]');
962962
advNode.on("click", function (e) {
963963
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
964-
message.get('value') + '&subcontent=' + subject.get('value'));
964+
message.get('textContent') + '&subcontent=' + subject.get('value'));
965965
});
966966

967967
},

‎yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article-min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,10 @@ Y.extend(FORM, Y.Base,
578578

579579
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
580580
advNode.setAttribute('href', advNode.getAttribute('href').replace(/reply=\d+/, 'reply=' + parentNode.getData('postid')));
581-
var message = wrapperNode.one('div[id^=editor-target-container-] textarea');
581+
var message = wrapperNode.one('div[id^=editor-target-container-]');
582582
advNode.on("click", function (e) {
583583
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
584-
message.get('value'));
584+
message.get('textContent'));
585585
});
586586

587587
if (parentNode.hasAttribute('data-ispost')) {
@@ -748,12 +748,12 @@ Y.extend(FORM, Y.Base,
748748
},
749749

750750
sendInProgressData:function (e) {
751-
var message = Y.one('div[id^=editor-target-container-] textarea');
751+
var message = Y.one('div[id^=editor-target-container-]');
752752
var subject = Y.one('input[name=subject]');
753753
var link = e.target.getAttribute('href');
754754
if (!link.includes('post.php?edit')) {
755755
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
756-
message.get('value') + '&subcontent=' + subject.get('value'));
756+
message.get('textContent') + '&subcontent=' + subject.get('value'));
757757
}
758758
},
759759
/**
@@ -948,11 +948,11 @@ Y.extend(FORM, Y.Base,
948948
catch(err) {
949949
}
950950
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
951-
var message = Y.one('div[id^=editor-target-container-] textarea');
951+
var message = Y.one('div[id^=editor-target-container-]');
952952
var subject = Y.one('input[name=subject]');
953953
advNode.on("click", function (e) {
954954
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
955-
message.get('value') + '&subcontent=' + subject.get('value'));
955+
message.get('textContent') + '&subcontent=' + subject.get('value'));
956956
});
957957

958958
},

‎yui/build/moodle-mod_hsuforum-livelog/moodle-mod_hsuforum-livelog-min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎yui/src/article/js/form.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ Y.extend(FORM, Y.Base,
7777

7878
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
7979
advNode.setAttribute('href', advNode.getAttribute('href').replace(/reply=\d+/, 'reply=' + parentNode.getData('postid')));
80-
var message = wrapperNode.one('div[id^=editor-target-container-] textarea');
80+
var message = wrapperNode.one('div[id^=editor-target-container-]');
8181
advNode.on("click", function (e) {
8282
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
83-
message.get('value'));
83+
message.get('textContent'));
8484
});
8585

8686
if (parentNode.hasAttribute('data-ispost')) {
@@ -252,12 +252,12 @@ Y.extend(FORM, Y.Base,
252252
},
253253

254254
sendInProgressData:function (e) {
255-
var message = Y.one('div[id^=editor-target-container-] textarea');
255+
var message = Y.one('div[id^=editor-target-container-]');
256256
var subject = Y.one('input[name=subject]');
257257
var link = e.target.getAttribute('href');
258258
if (!link.includes('post.php?edit')) {
259259
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
260-
message.get('value') + '&subcontent=' + subject.get('value'));
260+
message.get('textContent') + '&subcontent=' + subject.get('value'));
261261
}
262262
},
263263
/**
@@ -455,11 +455,11 @@ Y.extend(FORM, Y.Base,
455455
Y.log('Timed post disabled');
456456
}
457457
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
458-
var message = Y.one('div[id^=editor-target-container-] textarea');
458+
var message = Y.one('div[id^=editor-target-container-]');
459459
var subject = Y.one('input[name=subject]');
460460
advNode.on("click", function (e) {
461461
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
462-
message.get('value') + '&subcontent=' + subject.get('value'));
462+
message.get('textContent') + '&subcontent=' + subject.get('value'));
463463
});
464464

465465
},

0 commit comments

Comments
 (0)