@instructure/canvas-rce 5.14.1 → 5.15.0

package/es/rce/transformContent.js

@@ -15,9 +15,11 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 import { relativeHttpUrlForHostname } from '../util/url-util';
 export const attributeNamesToUrlRelativize = ['href', 'cite', 'src', 'data'];
 export const attributeNamesToRemove = ['data-api-endpoint', 'data-api-returntype'];
+
 /**
  * Transforms a block of HTML for use within the Rich Content Editor, normalizing content to remove extraneous
  * things added by the server.
@@ -25,16 +27,13 @@ export const attributeNamesToRemove = ['data-api-endpoint', 'data-api-returntype
  * @param inputHtml
  * @param options
  */
-
 export function transformRceContentForEditing(inputHtml, options) {
   if (!inputHtml) {
     // It's important to return null/undefined here if that was passed in, otherwise tests fail because
     // the change-detection logic doesn't work correctly.
     return inputHtml;
   }
-
   const container = document.createElement('div');
-
   try {
     // Note we're doing this instead of using a DOMParser because the DOMParser semantics are different than how we
     // actually use user html, which is to insert it into the page.
@@ -42,30 +41,29 @@ export function transformRceContentForEditing(inputHtml, options) {
     container.innerHTML = inputHtml;
   } catch (e) {
     return inputHtml;
-  } // Relativize URLs in attribute
-
+  }
 
+  // Relativize URLs in attribute
   for (const attributeName of attributeNamesToUrlRelativize) {
     container.querySelectorAll(`[${attributeName}]`).forEach(element => {
       const attributeValue = element.getAttribute(attributeName);
-
       if (attributeValue) {
         element.setAttribute(attributeName, relativeHttpUrlForHostname(attributeValue, options.origin));
       }
     });
-  } // Remove extraneous attributes
-
+  }
 
+  // Remove extraneous attributes
   container.querySelectorAll(attributeNamesToRemove.map(it => `[${it}]`).join(',')).forEach(element => {
     for (const attributeName of attributeNamesToRemove) {
       element.removeAttribute(attributeName);
     }
-  }); // fixup LTI iframe launches to use the `in_rce` display type
+  });
 
+  // fixup LTI iframe launches to use the `in_rce` display type
   container.querySelectorAll('iframe[src]').forEach(element => {
     const src = element.getAttribute('src');
-
-    if (src !== null && src !== void 0 && src.includes('display=borderless')) {
+    if (src?.includes('display=borderless')) {
       element.setAttribute('src', src.replace('display=borderless', 'display=in_rce'));
     }
   });

package/es/rce/types.js

@@ -0,0 +1 @@
+export {};

package/es/rce/userOS.js

@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 export const determineUserOS = () => {
   const rawOS = navigator.userAgent;
   if (rawOS.indexOf('Mac') !== -1) return 'Mac';else if (rawOS.indexOf('Win') !== -1) return 'Windows';else return 'Other';
@@ -23,7 +24,6 @@ export const determineOSDependentKey = () => {
   switch (determineUserOS()) {
     case 'Mac':
       return 'OPTION';
-
     case 'Windows':
     default:
       return 'ALT';

package/es/rce/wrapInitCb.js

@@ -15,64 +15,71 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import $ from 'jquery'; // mirror attributes onto tinymce editor (if this can be done
-// via tiny api, it is preferable, but I dont see a way)
 
 export default function wrapInitCb(mirroredAttrs, editorOptions) {
+  // mirror attributes onto tinymce editor (if this can be done
+  // via tiny api, it is preferable, but I dont see a way)
   const oldInitInstCb = editorOptions.init_instance_callback;
-
   editorOptions.init_instance_callback = function (ed) {
     const attrs = mirroredAttrs || {};
     const el = ed.getElement();
-
     if (el) {
-      Object.keys(attrs).forEach(attr => {
+      // replaced forEach with for loop
+      const attrKeys = Object.keys(attrs);
+      for (let i = 0; i < attrKeys.length; i++) {
+        const attr = attrKeys[i];
         el.setAttribute(attr, attrs[attr]);
-      });
-    } // *** moved from setupAndFocusTinyMCEConfig ***
+      }
+    }
 
+    // @ts-expect-error
+    const $ = global.jQuery || global.$;
+    // *** moved from setupAndFocusTinyMCEConfig ***
+    if ($) {
+      const $editor = $(`#${ed.id}`);
+      // KeyboardShortcuts.js needs to listen to events
+      // fired from inside the editor, so we pass out
+      // keyup events to the document
+      ed.on('keyup', e => {
+        $(document).trigger('editorKeyUp', [e]);
+      });
+      ed.on('change', () => {
+        $editor.trigger('change');
+      });
 
-    const $editor = $('#' + ed.id); // KeyboardShortcuts.js needs to listen to events
-    // fired from inside the editor, so we pass out
-    // keyup events to the document
+      // *** I cannot find a place where last_bookmark is used ***
+      // *** or where enableBookmarkingOverride is not falsey  ***
+      // // no equivalent of "onEvent" in tinymce4
+      // ed.on('keyup keydown click mousedown', () => {
+      //   if (enableBookmarking && ed.selection) {
+      //     $editor.data('last_bookmark', ed.selection.getBookmark(1))
+      //   }
+      // })
 
-    ed.on('keyup', e => {
-      $(document).trigger('editorKeyUp', [e]);
-    });
-    ed.on('change', () => {
-      $editor.trigger('change');
-    }); // *** I cannot find a place where last_bookmark is used ***
-    // *** or where enableBookmarkingOverride is not falsey  ***
-    // // no equivalent of "onEvent" in tinymce4
-    // ed.on('keyup keydown click mousedown', () => {
-    //   if (enableBookmarking && ed.selection) {
-    //     $editor.data('last_bookmark', ed.selection.getBookmark(1))
-    //   }
-    // })
+      $(window).triggerHandler('resize');
 
-    $(window).triggerHandler('resize'); // tiny sets a focusout event handler, which only IE supports
-    // (Chrome/Safari/Opera support DOMFocusOut, FF supports neither)
-    // we attach a blur event that does the same thing (which in turn
-    // ensures the change callback fires)
-    // this fixes FF's broken behavior (http://www.tinymce.com/develop/bugtracker_view.php?id=4004 )
-    // as well as an issue in Safari where tiny didn't register some
-    // change events if the previously focused element was a numerical
-    // quiz input (something to do with changing its value in a change
-    // handler)
+      // tiny sets a focusout event handler, which only IE supports
+      // (Chrome/Safari/Opera support DOMFocusOut, FF supports neither)
+      // we attach a blur event that does the same thing (which in turn
+      // ensures the change callback fires)
+      // this fixes FF's broken behavior (http://www.tinymce.com/develop/bugtracker_view.php?id=4004 )
+      // as well as an issue in Safari where tiny didn't register some
+      // change events if the previously focused element was a numerical
+      // quiz input (something to do with changing its value in a change
+      // handler)
+      if (!('onfocusout' in ed.contentWindow)) {
+        $(ed.contentWindow).blur(() => {
+          if (!ed.removed && ed.undoManager.typing) {
+            ed.undoManager.typing = false;
+            ed.undoManager.add();
+          }
+        });
+      }
+      // *************
+    }
 
-    if (!('onfocusout' in ed.contentWindow)) {
-      $(ed.contentWindow).blur(_e => {
-        if (!ed.removed && ed.undoManager.typing) {
-          ed.undoManager.typing = false;
-          ed.undoManager.add();
-        }
-      });
-    } // *************
     // wrap old cb (dont overwrite)
-
-
     oldInitInstCb && oldInitInstCb(ed);
   };
-
   return editorOptions;
 }