Commit 2a20af65 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic
Browse files

Bug 1891939: remove references to mce-tinymce class 

when upgrading to TinyMCE 5, on commit ada3e2cd
the theme/raw/sass/lib/_tinymce.scss

the mce-tinymce class from the editor is changed to tox-tinymce

we should remove the references from the code to that class
in the jQuery selector and styles since they won't return any object.

behatnotneeded

Change-Id: Ia981e2c2599b4fb1ca6ade48bd376cca0cebbc85
parent 9aacb350

htdocs/js/adminsitepages.js

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ function updateWYSIWYGText() { 


function updateSiteDefault(changed) {

    changedCheckbox = (changed) ? true : false;

    var editor = jQuery('#editsitepage_pagetext_container .mce-tinymce');

    var editor = jQuery('#editsitepage_pagetext_container');

    if (jQuery('#editsitepage_pageusedefault')[0] && jQuery('#editsitepage_pageusedefault').prop('checked') === true) {

        tinyMCE.activeEditor.getBody().setAttribute('contenteditable', false);

        jQuery('#changecheckboxdiv').css({

htdocs/theme/raw/sass/components/_modal.scss

+2 −8
Original line number Diff line number Diff line
@@ -128,10 +128,6 @@ $width-sm: 90%; 
    right: 0;

    bottom: 0;



    .mce-tinymce {

        display:none;

    }



    &.active,

    &.in {

        @include transition(visibility 0s 0.01s);
@@ -140,9 +136,7 @@ $width-sm: 90%; 
            @include transition(right 0.3s ease-in-out);

            right: 0;

        }

        .mce-tinymce {

            display: block;

        }



        .collapse.in {

            backface-visibility: hidden;

        }
@@ -233,7 +227,7 @@ $width-sm: 90%; 


#configureauthinstance-modal {

    .modal-body textarea.under-label,

    .modal-body .under-label-help.wysiwyg .mce-tinymce {

    .modal-body .under-label-help.wysiwyg .tox-tinymce {

        width: calc(100% - 30px) !important;

    }

    .modal-body .form-group.text {

htdocs/theme/raw/sass/form/_form-group.scss

+0 −12
Original line number Diff line number Diff line
@@ -438,18 +438,6 @@ 
            }

        }

    }

    .mce-tinymce {

        @include media-breakpoint-up(md) {

            width: 420px;

            max-width: 100%;

            .columns3 & {

                max-width: 100%;

            }

        }

        @include media-breakpoint-up(xl) {

            width: 500px;

        }

    }



    &.radio {

        .pseudolabel,

htdocs/theme/raw/sass/form/_form.scss

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ label, 
    label {

        display: block;

        vertical-align: top;

        + .mce-tinymce {

        + .tox-tinymce {

            width:100%;

        }

    }
@@ -134,7 +134,7 @@ label, 
        width: 70%;

    }

    &.under-label-help {

        label + .mce-tinymce {

        label + .tox-tinymce {

            width:70%;

        }

    }