Skip to content

Commit 4e4b807

Browse files
committed
remove EditorConfig hack for account announcements
fixes CNVS-34186 test plan: - try various combinations of adding and editing account global announcements - try in various browsers - the tinymce editor should be configured with two rows of buttons, not three Change-Id: I09acee9a233f15707301ec5afa899cda4de78169 Reviewed-on: https://gerrit.instructure.com/99025 Tested-by: Jenkins Reviewed-by: Ryan Shaw <ryan@instructure.com> QA-Review: Jeremy Putnam <jeremyp@instructure.com> Product-Review: Simon Williams <simon@instructure.com>
1 parent d3e3cca commit 4e4b807

3 files changed

Lines changed: 4 additions & 17 deletions

File tree

app/stylesheets/pages/account_settings/_account_settings.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,7 @@
184184
.hidden_form {
185185
display: none;
186186
}
187+
188+
textarea#account_notification_message, .edit_notification_form textarea {
189+
width: 500px;
190+
}

public/javascripts/account_settings.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,6 @@ define([
1515
'jqueryui/tabs' // /\.tabs/
1616
], function(I18n, $, EditorConfig, globalAnnouncements) {
1717

18-
EditorConfig.prototype.balanceButtonsOverride = function(instructure_buttons) {
19-
var instBtnGroup = "table,instructure_links,unlink" + instructure_buttons;
20-
var top_row_buttons = "";
21-
var bottom_row_buttons = "";
22-
23-
top_row_buttons = this.formatBtnGroup + "," + this.positionBtnGroup;
24-
bottom_row_buttons = instBtnGroup + "," + this.fontBtnGroup;
25-
26-
return [top_row_buttons, bottom_row_buttons];
27-
};
28-
29-
EditorConfig.prototype.toolbar = function() {
30-
var instructure_buttons = this.buildInstructureButtons();
31-
return this.balanceButtonsOverride(instructure_buttons);
32-
}
33-
3418
$(document).ready(function() {
3519
checkFutureListingSetting = function() {
3620

public/javascripts/global_announcements.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ define([
8383
},
8484

8585
augmentView: function(){
86-
$("#add_notification_form textarea").width('100%');
8786
$("textarea.edit_notification_form, #add_notification_form textarea").each(function(i){
8887
RichContentEditor.loadNewEditor($(this));
8988
})

0 commit comments

Comments
 (0)