atto_styles: Try parent node if no class attribute when removing styles

moodle-an-hochschulen · Aug 1, 2022 · 0c23d88 · 0c23d88
1 parent a06721c
commit 0c23d88
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/yui/build/moodle-atto_styles-button/moodle-atto_styles-button-debug.js b/yui/build/moodle-atto_styles-button/moodle-atto_styles-button-debug.js
@@ -113,9 +113,12 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         if (style[0] === '<nostyle>') {
             element = window.getSelection().focusNode;
             for (p = element; p; p = p.parentNode) {
-                if (p.nodeType !== 1) {
+                if (p.nodeType !== 1 || !p.getAttribute('class')) {
                     continue;
                 }
+                if (p.getAttribute('class').search('editor_atto_content') != -1) {
+                    break;
+                }
                 pstyle = window.getComputedStyle(p, null);
                 if (pstyle) {
                     p.removeAttribute('class');

diff --git a/yui/build/moodle-atto_styles-button/moodle-atto_styles-button-min.js b/yui/build/moodle-atto_styles-button/moodle-atto_styles-button-min.js
diff --git a/yui/build/moodle-atto_styles-button/moodle-atto_styles-button.js b/yui/build/moodle-atto_styles-button/moodle-atto_styles-button.js
@@ -113,9 +113,12 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         if (style[0] === '<nostyle>') {
             element = window.getSelection().focusNode;
             for (p = element; p; p = p.parentNode) {
-                if (p.nodeType !== 1) {
+                if (p.nodeType !== 1 || !p.getAttribute('class')) {
                     continue;
                 }
+                if (p.getAttribute('class').search('editor_atto_content') != -1) {
+                    break;
+                }
                 pstyle = window.getComputedStyle(p, null);
                 if (pstyle) {
                     p.removeAttribute('class');

diff --git a/yui/src/button/js/button.js b/yui/src/button/js/button.js
@@ -111,9 +111,12 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         if (style[0] === '<nostyle>') {
             element = window.getSelection().focusNode;
             for (p = element; p; p = p.parentNode) {
-                if (p.nodeType !== 1) {
+                if (p.nodeType !== 1 || !p.getAttribute('class')) {
                     continue;
                 }
+                if (p.getAttribute('class').search('editor_atto_content') != -1) {
+                    break;
+                }
                 pstyle = window.getComputedStyle(p, null);
                 if (pstyle) {
                     p.removeAttribute('class');