Merge pull request #188 from UCF/athena-update

Athena update

gulpfile.js

@@ -8,7 +8,7 @@ const eslint       = require('gulp-eslint');
 const isFixed      = require('gulp-eslint-if-fixed');
 const babel        = require('gulp-babel');
 const rename       = require('gulp-rename');
-const sass         = require('gulp-sass');
+const sass         = require('gulp-dart-sass');
 const sassLint     = require('gulp-sass-lint');
 const uglify       = require('gulp-uglify');
 const merge        = require('merge');

package.json

@@ -6,8 +6,8 @@
     "bootstrap-datepicker": "^1.9.0",
     "select2": "^4.0.13",
     "timepicker": "1.13.14",
-    "tinymce": "^5.7.1",
-    "ucf-athena-framework": "^1.0.8"
+    "tinymce": "^5.10.1",
+    "ucf-athena-framework": "^1.3.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.12.13",
@@ -22,12 +22,12 @@
     "gulp-babel": "^8.0.0",
     "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",
+    "gulp-dart-sass": "^1.1.0",
     "gulp-debug": "^4.0.0",
     "gulp-eslint": "^6.0.0",
     "gulp-eslint-if-fixed": "^1.0.0",
     "gulp-include": "^2.4.1",
     "gulp-rename": "^2.0.0",
-    "gulp-sass": "~4.1.0",
     "gulp-sass-lint": "^1.4.0",
     "gulp-uglify": "^3.0.2",
     "merge": "^2.1.0"

static_files/static/js/wysiwyg/plugins/autoresize/plugin.js

@@ -4,7 +4,7 @@
  * For LGPL see License.txt in the project root for license information.
  * For commercial licenses see https://www.tiny.cloud/
  *
- * Version: 5.7.1 (2021-03-17)
+ * Version: 5.10.9 (2023-11-15)
  */
 (function () {
     'use strict';
@@ -23,11 +23,16 @@
       };
     };
 
-    var global = tinymce.util.Tools.resolve('tinymce.PluginManager');
+    var hasOwnProperty = Object.hasOwnProperty;
+    var has = function (obj, key) {
+      return hasOwnProperty.call(obj, key);
+    };
+
+    var global$2 = tinymce.util.Tools.resolve('tinymce.PluginManager');
 
     var global$1 = tinymce.util.Tools.resolve('tinymce.Env');
 
-    var global$2 = tinymce.util.Tools.resolve('tinymce.util.Delay');
+    var global = tinymce.util.Tools.resolve('tinymce.util.Delay');
 
     var fireResizeEditor = function (editor) {
       return editor.fire('ResizeEditor');
@@ -53,7 +58,7 @@
       return editor.plugins.fullscreen && editor.plugins.fullscreen.isFullscreen();
     };
     var wait = function (editor, oldSize, times, interval, callback) {
-      global$2.setEditorTimeout(editor, function () {
+      global.setEditorTimeout(editor, function () {
         resize(editor, oldSize);
         if (times--) {
           wait(editor, oldSize, times, interval, callback);
@@ -75,7 +80,15 @@
       var value = parseInt(dom.getStyle(elm, name, computed), 10);
       return isNaN(value) ? 0 : value;
     };
-    var resize = function (editor, oldSize) {
+    var shouldScrollIntoView = function (trigger) {
+      if ((trigger === null || trigger === void 0 ? void 0 : trigger.type.toLowerCase()) === 'setcontent') {
+        var setContentEvent = trigger;
+        return setContentEvent.selection === true || setContentEvent.paste === true;
+      } else {
+        return false;
+      }
+    };
+    var resize = function (editor, oldSize, trigger) {
       var dom = editor.dom;
       var doc = editor.getDoc();
       if (!doc) {
@@ -116,11 +129,11 @@
           var win = editor.getWin();
           win.scrollTo(win.pageXOffset, win.pageYOffset);
         }
-        if (editor.hasFocus()) {
-          editor.selection.scrollIntoView(editor.selection.getNode());
+        if (editor.hasFocus() && shouldScrollIntoView(trigger)) {
+          editor.selection.scrollIntoView();
         }
         if (global$1.webkit && deltaSize < 0) {
-          resize(editor, oldSize);
+          resize(editor, oldSize, trigger);
         }
       }
     };
@@ -135,8 +148,8 @@
           'min-height': 0
         });
       });
-      editor.on('NodeChange SetContent keyup FullscreenStateChanged ResizeContent', function () {
-        resize(editor, oldSize);
+      editor.on('NodeChange SetContent keyup FullscreenStateChanged ResizeContent', function (e) {
+        resize(editor, oldSize, e);
       });
       if (shouldAutoResizeOnInit(editor)) {
         editor.on('init', function () {
@@ -154,8 +167,8 @@
     };
 
     function Plugin () {
-      global.add('autoresize', function (editor) {
-        if (!editor.settings.hasOwnProperty('resize')) {
+      global$2.add('autoresize', function (editor) {
+        if (!has(editor.settings, 'resize')) {
           editor.settings.resize = false;
         }
         if (!editor.inline) {