swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes Wrong TinyMCE stylesheet order

Browse Source 
Work Items: 30184, 30183
This commit is contained in:
starfighter83
2011-04-18 10:10:13 -02:00
parent 734f029679
commit c2eea73b98
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
umbraco/presentation/umbraco_client/tinymce3/tiny_mce_src.js
Vendored
+10 -6
View File
@@ -10713,13 +10713,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
// Firefox 2 doesn't load stylesheets correctly this way
if (!isGecko || !/Firefox\/2/.test(navigator.userAgent)) {
for (i = 0; i < t.contentCSS.length; i++)
t.iframeHTML += '<link type="text/css" rel="stylesheet" href="' + t.contentCSS[i] + '" />';
//tg commenting this out, otherwise the content_css isn't last issue #30184
t.contentCSS = [];
}
// // Firefox 2 doesn't load stylesheets correctly this way
// if (!isGecko || !/Firefox\/2/.test(navigator.userAgent)) {
// for (i = 0; i < t.contentCSS.length; i++)
// t.iframeHTML += '<link type="text/css" rel="stylesheet" href="' + t.contentCSS[i] + '" />';
// t.contentCSS = [];
// }
bi = s.body_id || 'tinymce';
if (bi.indexOf('=') != -1) {
@@ -11179,6 +11181,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
t.dom.loadCSS(u);
});
// Handle auto focus
if (s.auto_focus) {
setTimeout(function () {