Skip to content

Commit bc7517f

Browse files
committed
Revert changes to vendor files.
1 parent 1815244 commit bc7517f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/js/_enqueues/vendor/tinymce/themes/inlite/theme.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5056,7 +5056,7 @@ var inlite = (function (domGlobals) {
50565056
}
50575057
icon = icon ? prefix + 'ico ' + prefix + 'i-' + icon : '';
50585058
ariaPressed = typeof settings.active === 'boolean' ? ' aria-pressed="' + settings.active + '"' : '';
5059-
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1"' + ariaPressed + '>' + '<button id="' + id + '-button" role="presentation" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>' : '') + textHtml + '</button>' + '</div>';
5059+
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1"' + ariaPressed + '>' + '<button id="' + id + '-button" role="presentation" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + '></i>' : '') + textHtml + '</button>' + '</div>';
50605060
},
50615061
bindStates: function () {
50625062
var self = this, $ = self.$, textCls = self.classPrefix + 'txt';
@@ -8560,7 +8560,7 @@ var inlite = (function (domGlobals) {
85608560
}
85618561
icon = self.settings.icon ? prefix + 'ico ' + prefix + 'i-' + icon : '';
85628562
self.aria('role', self.parent() instanceof MenuBar ? 'menuitem' : 'button');
8563-
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1" aria-labelledby="' + id + '">' + '<button id="' + id + '-open" role="presentation" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>' : '') + textHtml + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
8563+
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1" aria-labelledby="' + id + '">' + '<button id="' + id + '-open" role="presentation" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + '></i>' : '') + textHtml + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
85648564
},
85658565
postRender: function () {
85668566
var self = this;
@@ -9068,7 +9068,7 @@ var inlite = (function (domGlobals) {
90689068
shortcut = convertShortcut(shortcut);
90699069
}
90709070
icon = prefix + 'ico ' + prefix + 'i-' + (self.settings.icon || 'none');
9071-
iconHtml = text !== '-' ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>\xA0' : '';
9071+
iconHtml = text !== '-' ? '<i class="' + icon + '"' + image + '></i>\xA0' : '';
90729072
text = boldMatches(self.encode(markMatches(text)));
90739073
url = boldMatches(self.encode(markMatches(url)));
90749074
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1">' + iconHtml + (text !== '-' ? '<span id="' + id + '-text" class="' + prefix + 'text">' + text + '</span>' : '') + (shortcut ? '<div id="' + id + '-shortcut" class="' + prefix + 'menu-shortcut">' + shortcut + '</div>' : '') + (settings.menu ? '<div class="' + prefix + 'caret"></div>' : '') + (url ? '<div class="' + prefix + 'menu-item-link">' + url + '</div>' : '') + '</div>';
@@ -9436,7 +9436,7 @@ var inlite = (function (domGlobals) {
94369436
textHtml = '<span class="' + prefix + 'txt">' + self.encode(text) + '</span>';
94379437
}
94389438
ariaPressed = typeof settings.active === 'boolean' ? ' aria-pressed="' + settings.active + '"' : '';
9439-
return '<div id="' + id + '" class="' + self.classes + '" role="button"' + ariaPressed + ' tabindex="-1">' + '<button type="button" hidefocus="1" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>' : '') + textHtml + '</button>' + '<button type="button" class="' + prefix + 'open" hidefocus="1" tabindex="-1">' + (self._menuBtnText ? (icon ? '\xA0' : '') + self._menuBtnText : '') + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
9439+
return '<div id="' + id + '" class="' + self.classes + '" role="button"' + ariaPressed + ' tabindex="-1">' + '<button type="button" hidefocus="1" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + '></i>' : '') + textHtml + '</button>' + '<button type="button" class="' + prefix + 'open" hidefocus="1" tabindex="-1">' + (self._menuBtnText ? (icon ? '\xA0' : '') + self._menuBtnText : '') + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
94409440
},
94419441
postRender: function () {
94429442
var self = this, onClickHandler = self.settings.onclick;

src/js/_enqueues/vendor/tinymce/themes/modern/theme.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4881,7 +4881,7 @@ var modern = (function (domGlobals) {
48814881
}
48824882
icon = icon ? prefix + 'ico ' + prefix + 'i-' + icon : '';
48834883
ariaPressed = typeof settings.active === 'boolean' ? ' aria-pressed="' + settings.active + '"' : '';
4884-
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1"' + ariaPressed + '>' + '<button id="' + id + '-button" role="presentation" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>' : '') + textHtml + '</button>' + '</div>';
4884+
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1"' + ariaPressed + '>' + '<button id="' + id + '-button" role="presentation" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + '></i>' : '') + textHtml + '</button>' + '</div>';
48854885
},
48864886
bindStates: function () {
48874887
var self = this, $ = self.$, textCls = self.classPrefix + 'txt';
@@ -5541,7 +5541,7 @@ var modern = (function (domGlobals) {
55415541
self.classes.add('btn-has-text');
55425542
textHtml = '<span class="' + prefix + 'txt">' + self.encode(text) + '</span>';
55435543
}
5544-
return '<div id="' + id + '" class="' + self.classes + '" role="button" tabindex="-1" aria-haspopup="true">' + '<button role="presentation" hidefocus="1" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>' : '') + '<span id="' + id + '-preview" class="' + prefix + 'preview"></span>' + textHtml + '</button>' + '<button type="button" class="' + prefix + 'open" hidefocus="1" tabindex="-1">' + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
5544+
return '<div id="' + id + '" class="' + self.classes + '" role="button" tabindex="-1" aria-haspopup="true">' + '<button role="presentation" hidefocus="1" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + '></i>' : '') + '<span id="' + id + '-preview" class="' + prefix + 'preview"></span>' + textHtml + '</button>' + '<button type="button" class="' + prefix + 'open" hidefocus="1" tabindex="-1">' + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
55455545
},
55465546
postRender: function () {
55475547
var self = this, onClickHandler = self.settings.onclick;
@@ -8411,7 +8411,7 @@ var modern = (function (domGlobals) {
84118411
}
84128412
icon = self.settings.icon ? prefix + 'ico ' + prefix + 'i-' + icon : '';
84138413
self.aria('role', self.parent() instanceof MenuBar ? 'menuitem' : 'button');
8414-
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1" aria-labelledby="' + id + '">' + '<button id="' + id + '-open" role="presentation" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>' : '') + textHtml + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
8414+
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1" aria-labelledby="' + id + '">' + '<button id="' + id + '-open" role="presentation" type="button" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + '></i>' : '') + textHtml + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
84158415
},
84168416
postRender: function () {
84178417
var self = this;
@@ -8885,7 +8885,7 @@ var modern = (function (domGlobals) {
88858885
shortcut = convertShortcut(shortcut);
88868886
}
88878887
icon = prefix + 'ico ' + prefix + 'i-' + (self.settings.icon || 'none');
8888-
iconHtml = text !== '-' ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>\xA0' : '';
8888+
iconHtml = text !== '-' ? '<i class="' + icon + '"' + image + '></i>\xA0' : '';
88898889
text = boldMatches(self.encode(markMatches(text)));
88908890
url = boldMatches(self.encode(markMatches(url)));
88918891
return '<div id="' + id + '" class="' + self.classes + '" tabindex="-1">' + iconHtml + (text !== '-' ? '<span id="' + id + '-text" class="' + prefix + 'text">' + text + '</span>' : '') + (shortcut ? '<div id="' + id + '-shortcut" class="' + prefix + 'menu-shortcut">' + shortcut + '</div>' : '') + (settings.menu ? '<div class="' + prefix + 'caret"></div>' : '') + (url ? '<div class="' + prefix + 'menu-item-link">' + url + '</div>' : '') + '</div>';
@@ -9253,7 +9253,7 @@ var modern = (function (domGlobals) {
92539253
textHtml = '<span class="' + prefix + 'txt">' + self.encode(text) + '</span>';
92549254
}
92559255
ariaPressed = typeof settings.active === 'boolean' ? ' aria-pressed="' + settings.active + '"' : '';
9256-
return '<div id="' + id + '" class="' + self.classes + '" role="button"' + ariaPressed + ' tabindex="-1">' + '<button type="button" hidefocus="1" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + ' aria-hidden="true"></i>' : '') + textHtml + '</button>' + '<button type="button" class="' + prefix + 'open" hidefocus="1" tabindex="-1">' + (self._menuBtnText ? (icon ? '\xA0' : '') + self._menuBtnText : '') + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
9256+
return '<div id="' + id + '" class="' + self.classes + '" role="button"' + ariaPressed + ' tabindex="-1">' + '<button type="button" hidefocus="1" tabindex="-1">' + (icon ? '<i class="' + icon + '"' + image + '></i>' : '') + textHtml + '</button>' + '<button type="button" class="' + prefix + 'open" hidefocus="1" tabindex="-1">' + (self._menuBtnText ? (icon ? '\xA0' : '') + self._menuBtnText : '') + ' <i class="' + prefix + 'caret"></i>' + '</button>' + '</div>';
92579257
},
92589258
postRender: function () {
92599259
var self = this, onClickHandler = self.settings.onclick;

0 commit comments

Comments
 (0)