- Fixes Firefox bug where a selection outside the editor would be styled

moodle-an-hochschulen · Nov 26, 2022 · a7ed889 · a7ed889
1 parent 8d573d5
commit a7ed889
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
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
@@ -112,6 +112,9 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         var eID, element, p, pstyle, styles, host, i;
         if (style[0] === '<nostyle>') {
             element = window.getSelection().focusNode;
+            if (!this.editor.contains(element)) {
+                return;
+            }
             for (p = element; p; p = p.parentNode) {
                 if (p.nodeType !== 1) {
                     continue;
@@ -126,6 +129,9 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         } else if (style[0] === '<block>') {
             document.execCommand('formatBlock', false, '<div>');
             element = window.getSelection().focusNode;
+            if (!this.editor.contains(element)) {
+                return;
+            }
             for (p = element; p; p = p.parentNode) {
                 if (p.nodeType !== 1) {
                     continue;

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
@@ -112,6 +112,9 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         var eID, element, p, pstyle, styles, host, i;
         if (style[0] === '<nostyle>') {
             element = window.getSelection().focusNode;
+            if (!this.editor.contains(element)) {
+                return;
+            }
             for (p = element; p; p = p.parentNode) {
                 if (p.nodeType !== 1) {
                     continue;
@@ -126,6 +129,9 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         } else if (style[0] === '<block>') {
             document.execCommand('formatBlock', false, '<div>');
             element = window.getSelection().focusNode;
+            if (!this.editor.contains(element)) {
+                return;
+            }
             for (p = element; p; p = p.parentNode) {
                 if (p.nodeType !== 1) {
                     continue;

diff --git a/yui/src/button/js/button.js b/yui/src/button/js/button.js
@@ -110,6 +110,9 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         var eID, element, p, pstyle, styles, host, i;
         if (style[0] === '<nostyle>') {
             element = window.getSelection().focusNode;
+            if (!this.editor.contains(element)) {
+                return;
+            }
             for (p = element; p; p = p.parentNode) {
                 if (p.nodeType !== 1) {
                     continue;
@@ -124,6 +127,9 @@ Y.namespace('M.atto_styles').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         } else if (style[0] === '<block>') {
             document.execCommand('formatBlock', false, '<div>');
             element = window.getSelection().focusNode;
+            if (!this.editor.contains(element)) {
+                return;
+            }
             for (p = element; p; p = p.parentNode) {
                 if (p.nodeType !== 1) {
                     continue;