compiled version 4.9.2-mysw-10

mysidewalk · Jan 23, 2019 · 07481b8 · 07481b8
1 parent 44859ae
commit 07481b8
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 12 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+Version 4.9.2-mysw-10 (2019-01-23)
+    Wrapped media embed in some helpful classes
+    Disabled media embed textarea
+
 Version 4.9.2-mysw-9 (2019-01-04)
     Merged core 4.9.2 with mysw changes
 

diff --git a/js/tinymce/plugins/media/plugin.js b/js/tinymce/plugins/media/plugin.js
@@ -773,7 +773,8 @@ var media = (function () {
         value: getSource(editor),
         multiline: true,
         rows: 5,
-        label: 'Source'
+        label: 'Source',
+        disabled: true
       };
       var updateValueOnChange = function () {
         data = global$2.extend({}, HtmlToData.htmlToData(Settings.getScripts(editor), this.value()));
@@ -816,6 +817,7 @@ var media = (function () {
         data: data,
         bodyType: 'tabpanel',
         body: body,
+        classes: 'mysw-video-dialog-wrapper',
         onSubmit: function () {
           SizeManager.updateSize(win);
           submitForm(win, editor);

diff --git a/js/tinymce/plugins/media/plugin.min.js b/js/tinymce/plugins/media/plugin.min.js
diff --git a/js/tinymce/themes/inlite/theme.js b/js/tinymce/themes/inlite/theme.js
@@ -4559,8 +4559,7 @@ var inlite = (function () {
     };
     var Buttons = { addToEditor: addToEditor };
 
-    var getUiContainerDelta$1 = function () {
-      var uiContainer = global$6.container;
+    var getUiContainerDelta$1 = function (uiContainer) {
       if (uiContainer && global$1.DOM.getStyle(uiContainer, 'position', true) !== 'static') {
         var containerPos = global$1.DOM.getPos(uiContainer);
         var dx = containerPos.x - uiContainer.scrollLeft;
@@ -4849,7 +4848,7 @@ var inlite = (function () {
           result = Layout.calc(targetRect, contentAreaRect, panelRect);
         }
         if (result) {
-          var delta = UiContainer$1.getUiContainerDelta().getOr({
+          var delta = UiContainer$1.getUiContainerDelta(editor.settings.ui_container).getOr({
             x: 0,
             y: 0
           });

diff --git a/js/tinymce/themes/inlite/theme.min.js b/js/tinymce/themes/inlite/theme.min.js
diff --git a/js/tinymce/tinymce.full.min.js b/js/tinymce/tinymce.full.min.js
diff --git a/js/tinymce/tinymce.js b/js/tinymce/tinymce.js
@@ -1,4 +1,4 @@
-// 4.9.2-mysw-9 (2019-01-04)
+// 4.9.2-mysw-10 (2019-01-23)
 (function () {
 (function () {
     'use strict';
@@ -25530,8 +25530,8 @@
       defaultSettings: {},
       $: DomQuery,
       majorVersion: '4',
-      minorVersion: '9.2-mysw-9',
-      releaseDate: '2019-01-04',
+      minorVersion: '9.2-mysw-10',
+      releaseDate: '2019-01-23',
       editors: legacyEditors,
       i18n: I18n,
       activeEditor: null,

diff --git a/js/tinymce/tinymce.min.js b/js/tinymce/tinymce.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinymce",
-  "version": "4.9.2-mysw-9",
+  "version": "4.9.2-mysw-10",
   "repository": {
     "type": "git",
     "url": "https://github.com/tinymce/tinymce.git"