Skip to content

Commit 9ee12b1

Browse files
jgg9026jgg9026
committed
Merge remote-tracking branch 'origin/release/3.11+5' into release/4.0
* origin/release/3.11+5: INT-18505: fix hsuforum ordering behat tests INT-18505: Fix renderer of Open forum placeholders Revert "INT-18505: Line spacing not retained in advanced forum posts"
2 parents 4414893 + 0366a4d commit 9ee12b1

File tree

9 files changed

+33
-37
lines changed

9 files changed

+33
-37
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,

‎renderer.php‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,17 +1738,13 @@ protected function simple_edit_template($t) {
17381738
</div>
17391739
<div class="hsuforum-post-body">
17401740
<input type="hidden" id="hsuforum-post-type" value="$postype">
1741-
<div class="floating-label using-placeholder-shown">
1742-
<input type="text" placeholder=" " name="subject" class="form-control" $subjectrequired spellcheck="true" value="$subject" maxlength="255" />
1743-
<label for="subject">$t->subjectplaceholder</label>
1744-
</div>
1741+
<label>
1742+
<span class="accesshide">$t->subjectlabel</span>
1743+
<input type="text" placeholder="$t->subjectplaceholder" name="subject" class="form-control" $subjectrequired spellcheck="true" value="$subject" maxlength="255" />
1744+
</label>
17451745
<div id="editor-info"></div>
17461746
<textarea name="message" class="hidden"></textarea>
1747-
<div class="floating-label using-placeholder-shown" id="editor-target-container-$timestamp" aria-label="$messagelabel" contenteditable="false">
1748-
<textarea class="hsuforum-textarea" type="text" placeholder=" " name="message" contenteditable="true" required="required" spellcheck="true" role="textbox" aria-multiline="true">$t->message</textarea>
1749-
<label for="message">$t->messageplaceholder</label>
1750-
</div>
1751-
1747+
<div id="editor-target-container-$timestamp" data-placeholder="$t->messageplaceholder" aria-label="$messagelabel" contenteditable="true" required="required" spellcheck="true" role="textbox" aria-multiline="true" class="hsuforum-textarea">$t->message</div>
17521748
17531749
17541750
$files

‎tests/behat/posts_ordering_blog.feature‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ Feature: In Open Forums, blog posts are always displayed in reverse chronologica
5151
#
5252
And I follow "Blog post 2"
5353
And I click on "Edit" "link" in the "//article[contains(concat(' ', normalize-space(@class), ' '), ' hsuforum-thread ')][contains(., 'Blog post 2')]" "xpath_element"
54-
And I set the field with xpath "//*[@id='region-main']/div/div[1]/article/div[1]/form/fieldset/div[3]/div[1]/input" to "Edited blog post 2"
54+
And I set the following fields to these values:
55+
| Subject | Edited blog post 2 |
5556
And I press "Submit"
5657
And I wait to be redirected
5758
And I log out

‎tests/behat/posts_ordering_general.feature‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ Feature: New Open discussions and discussions with recently added replies are di
5151
#
5252
And I follow "Forum post 2"
5353
And I click on "Edit" "link" in the "//article[contains(concat(' ', normalize-space(@class), ' '), ' hsuforum-thread ')][contains(., 'Forum post 2')]" "xpath_element"
54-
And I set the field with xpath "//*[@id='region-main']/div/div[1]/article/div[1]/form/fieldset/div[3]/div[1]/input" to "Edited forum post 2"
54+
And I set the following fields to these values:
55+
| Subject | Edited forum post 2 |
5556
And I press "Submit"
5657
And I wait to be redirected
5758
And I log out
@@ -63,7 +64,8 @@ Feature: New Open discussions and discussions with recently added replies are di
6364
And I am on the "Course general forum" "hsuforum activity" page
6465
And I follow "Forum post 1"
6566
And I follow "Use advanced editor and additional options"
66-
And I set the field with xpath "//*[@id='id_message']" to "Reply to the first post"
67+
And I set the following fields to these values:
68+
| Message | Reply to the first post |
6769
And I press "Post to forum"
6870
And I wait to be redirected
6971
And I am on "Course 1" course homepage

‎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
@@ -580,10 +580,10 @@ Y.extend(FORM, Y.Base,
580580
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
581581
advNode.setAttribute('href', advNode.getAttribute('href')
582582
.replace(/reply=\d+/, 'reply=' + parentNode.getData('postid')));
583-
var message = wrapperNode.one('div[id^=editor-target-container-] textarea');
583+
var message = wrapperNode.one('div[id^=editor-target-container-]');
584584
advNode.on("click", function (e) {
585585
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
586-
message.get('value'));
586+
message.get('textContent'));
587587
});
588588

589589
if (parentNode.hasAttribute('data-ispost')) {
@@ -758,12 +758,12 @@ Y.extend(FORM, Y.Base,
758758
},
759759

760760
sendInProgressData:function (e) {
761-
var message = Y.one('div[id^=editor-target-container-] textarea');
761+
var message = Y.one('div[id^=editor-target-container-]');
762762
var subject = Y.one('input[name=subject]');
763763
var link = e.target.getAttribute('href');
764764
if (!link.includes('post.php?edit')) {
765765
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
766-
message.get('value') + '&subcontent=' + subject.get('value'));
766+
message.get('textContent') + '&subcontent=' + subject.get('value'));
767767
}
768768
},
769769
/**
@@ -961,11 +961,11 @@ Y.extend(FORM, Y.Base,
961961
Y.log('Timed post disabled');
962962
}
963963
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
964-
var message = Y.one('div[id^=editor-target-container-] textarea');
964+
var message = Y.one('div[id^=editor-target-container-]');
965965
var subject = Y.one('input[name=subject]');
966966
advNode.on("click", function (e) {
967967
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
968-
message.get('value') + '&subcontent=' + subject.get('value'));
968+
message.get('textContent') + '&subcontent=' + subject.get('value'));
969969
});
970970

971971
},

‎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
@@ -579,10 +579,10 @@ Y.extend(FORM, Y.Base,
579579
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
580580
advNode.setAttribute('href', advNode.getAttribute('href')
581581
.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')) {
@@ -752,12 +752,12 @@ Y.extend(FORM, Y.Base,
752752
},
753753

754754
sendInProgressData:function (e) {
755-
var message = Y.one('div[id^=editor-target-container-] textarea');
755+
var message = Y.one('div[id^=editor-target-container-]');
756756
var subject = Y.one('input[name=subject]');
757757
var link = e.target.getAttribute('href');
758758
if (!link.includes('post.php?edit')) {
759759
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
760-
message.get('value') + '&subcontent=' + subject.get('value'));
760+
message.get('textContent') + '&subcontent=' + subject.get('value'));
761761
}
762762
},
763763
/**
@@ -952,11 +952,11 @@ Y.extend(FORM, Y.Base,
952952
catch(err) {
953953
}
954954
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
955-
var message = Y.one('div[id^=editor-target-container-] textarea');
955+
var message = Y.one('div[id^=editor-target-container-]');
956956
var subject = Y.one('input[name=subject]');
957957
advNode.on("click", function (e) {
958958
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
959-
message.get('value') + '&subcontent=' + subject.get('value'));
959+
message.get('textContent') + '&subcontent=' + subject.get('value'));
960960
});
961961

962962
},

‎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
@@ -78,10 +78,10 @@ Y.extend(FORM, Y.Base,
7878
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
7979
advNode.setAttribute('href', advNode.getAttribute('href')
8080
.replace(/reply=\d+/, 'reply=' + parentNode.getData('postid')));
81-
var message = wrapperNode.one('div[id^=editor-target-container-] textarea');
81+
var message = wrapperNode.one('div[id^=editor-target-container-]');
8282
advNode.on("click", function (e) {
8383
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
84-
message.get('value'));
84+
message.get('textContent'));
8585
});
8686

8787
if (parentNode.hasAttribute('data-ispost')) {
@@ -256,12 +256,12 @@ Y.extend(FORM, Y.Base,
256256
},
257257

258258
sendInProgressData:function (e) {
259-
var message = Y.one('div[id^=editor-target-container-] textarea');
259+
var message = Y.one('div[id^=editor-target-container-]');
260260
var subject = Y.one('input[name=subject]');
261261
var link = e.target.getAttribute('href');
262262
if (!link.includes('post.php?edit')) {
263263
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
264-
message.get('value') + '&subcontent=' + subject.get('value'));
264+
message.get('textContent') + '&subcontent=' + subject.get('value'));
265265
}
266266
},
267267
/**
@@ -459,11 +459,11 @@ Y.extend(FORM, Y.Base,
459459
Y.log('Timed post disabled');
460460
}
461461
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
462-
var message = Y.one('div[id^=editor-target-container-] textarea');
462+
var message = Y.one('div[id^=editor-target-container-]');
463463
var subject = Y.one('input[name=subject]');
464464
advNode.on("click", function (e) {
465465
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
466-
message.get('value') + '&subcontent=' + subject.get('value'));
466+
message.get('textContent') + '&subcontent=' + subject.get('value'));
467467
});
468468

469469
},

0 commit comments

Comments
 (0)