Merge remote-tracking branch 'origin/MC-4003' into cms-team-1-delivery

Author: cspruiell

app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js

@@ -4,35 +4,20 @@
  */
 
 var config = {
-    paths: {
-        'pagebuilder/async': 'Magento_PageBuilder/js/resource/requirejs/async',
-
-        /* Extra Resources Needed */
-        'pagebuilder/html2canvas': 'Magento_PageBuilder/js/resource/html2canvas',
-        'hyperscript': 'Magento_PageBuilder/js/resource/hyperscript/hyperscript',
-        'xyperscript': 'Magento_PageBuilder/js/resource/xyperscript/xyperscript',
-        'google-map': 'Magento_PageBuilder/js/utils/map',
-
-        /* Include our Knockout Sortable wrapper */
-        'pagebuilder/ko-dropzone': 'Magento_PageBuilder/js/resource/dropzone/knockout-dropzone',
-        'pagebuilder/ko-redactor': 'Magento_PageBuilder/js/resource/redactor/knockout-redactor',
-        'pagebuilder/ko-liveedit': 'Magento_PageBuilder/js/resource/live-edit/knockout-liveedit'
-    },
     map: {
         '*': {
-            /* Map the abstract widget to the input type widget */
-            'pagebuilder/widget/abstract': 'pagebuilder/field/abstract',
+            /* Include our Knockout Sortable wrapper */
+            'pagebuilder/ko-dropzone': 'Magento_PageBuilder/js/resource/dropzone/knockout-dropzone',
 
             /* Utilities */
-            'pagebuilder/utils': 'Magento_PageBuilder/js/utils',
-            'pagebuilder/config': 'Magento_PageBuilder/js/component/config'
+            'google-map': 'Magento_PageBuilder/js/utils/map'
         }
     },
     shim: {
         'pagebuilder/ko-sortable': {
-            deps: ['jquery', 'jquery/ui', 'Magento_PageBuilder/js/resource/jquery-ui/jquery.ui.touch-punch.min']
+            deps: ['jquery', 'jquery/ui', 'Magento_PageBuilder/js/resource/jquery-ui/jquery.ui.touch-punch']
         },
-        'Magento_PageBuilder/js/resource/jquery/ui/jquery.ui.touch-punch.min': {
+        'Magento_PageBuilder/js/resource/jquery/ui/jquery.ui.touch-punch': {
             deps: ['jquery/ui']
         }
     },

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/row/preview.js

@@ -8,7 +8,7 @@ define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/element/image-uploader',
-    'Magento_PageBuilder/js/resource/resize-observer/ResizeObserver.min',
+    'Magento_PageBuilder/js/resource/resize-observer/ResizeObserver',
     'Magento_PageBuilder/js/events',
     'mage/translate'
 ], function ($, _, uiRegistry, Uploader, ResizeObserver, events, $t) {

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slider/preview.js

@@ -0,0 +1,180 @@
+/*!
+ * jQuery UI Touch Punch 0.2.3
+ *
+ * Copyright 2011–2014, Dave Furfero
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Depends:
+ *  jquery.ui.widget.js
+ *  jquery.ui.mouse.js
+ */
+(function ($) {
+
+    // Detect touch support
+    $.support.touch = 'ontouchend' in document;
+
+    // Ignore browsers without touch support
+    if (!$.support.touch) {
+        return;
+    }
+
+    var mouseProto = $.ui.mouse.prototype,
+        _mouseInit = mouseProto._mouseInit,
+        _mouseDestroy = mouseProto._mouseDestroy,
+        touchHandled;
+
+    /**
+     * Simulate a mouse event based on a corresponding touch event
+     * @param {Object} event A touch event
+     * @param {String} simulatedType The corresponding mouse event
+     */
+    function simulateMouseEvent (event, simulatedType) {
+
+        // Ignore multi-touch events
+        if (event.originalEvent.touches.length > 1) {
+            return;
+        }
+
+        event.preventDefault();
+
+        var touch = event.originalEvent.changedTouches[0],
+            simulatedEvent = document.createEvent('MouseEvents');
+
+        // Initialize the simulated mouse event using the touch event's coordinates
+        simulatedEvent.initMouseEvent(
+            simulatedType,    // type
+            true,             // bubbles
+            true,             // cancelable
+            window,           // view
+            1,                // detail
+            touch.screenX,    // screenX
+            touch.screenY,    // screenY
+            touch.clientX,    // clientX
+            touch.clientY,    // clientY
+            false,            // ctrlKey
+            false,            // altKey
+            false,            // shiftKey
+            false,            // metaKey
+            0,                // button
+            null              // relatedTarget
+        );
+
+        // Dispatch the simulated event to the target element
+        event.target.dispatchEvent(simulatedEvent);
+    }
+
+    /**
+     * Handle the jQuery UI widget's touchstart events
+     * @param {Object} event The widget element's touchstart event
+     */
+    mouseProto._touchStart = function (event) {
+
+        var self = this;
+
+        // Ignore the event if another widget is already being handled
+        if (touchHandled || !self._mouseCapture(event.originalEvent.changedTouches[0])) {
+            return;
+        }
+
+        // Set the flag to prevent other widgets from inheriting the touch event
+        touchHandled = true;
+
+        // Track movement to determine if interaction was a click
+        self._touchMoved = false;
+
+        // Simulate the mouseover event
+        simulateMouseEvent(event, 'mouseover');
+
+        // Simulate the mousemove event
+        simulateMouseEvent(event, 'mousemove');
+
+        // Simulate the mousedown event
+        simulateMouseEvent(event, 'mousedown');
+    };
+
+    /**
+     * Handle the jQuery UI widget's touchmove events
+     * @param {Object} event The document's touchmove event
+     */
+    mouseProto._touchMove = function (event) {
+
+        // Ignore event if not handled
+        if (!touchHandled) {
+            return;
+        }
+
+        // Interaction was not a click
+        this._touchMoved = true;
+
+        // Simulate the mousemove event
+        simulateMouseEvent(event, 'mousemove');
+    };
+
+    /**
+     * Handle the jQuery UI widget's touchend events
+     * @param {Object} event The document's touchend event
+     */
+    mouseProto._touchEnd = function (event) {
+
+        // Ignore event if not handled
+        if (!touchHandled) {
+            return;
+        }
+
+        // Simulate the mouseup event
+        simulateMouseEvent(event, 'mouseup');
+
+        // Simulate the mouseout event
+        simulateMouseEvent(event, 'mouseout');
+
+        // If the touch interaction did not move, it should trigger a click
+        if (!this._touchMoved) {
+
+            // Simulate the click event
+            simulateMouseEvent(event, 'click');
+        }
+
+        // Unset the flag to allow other widgets to inherit the touch event
+        touchHandled = false;
+    };
+
+    /**
+     * A duck punch of the $.ui.mouse _mouseInit method to support touch events.
+     * This method extends the widget with bound touch event handlers that
+     * translate touch events to mouse events and pass them to the widget's
+     * original mouse event handling methods.
+     */
+    mouseProto._mouseInit = function () {
+
+        var self = this;
+
+        // Delegate the touch handlers to the widget's element
+        self.element.bind({
+            touchstart: $.proxy(self, '_touchStart'),
+            touchmove: $.proxy(self, '_touchMove'),
+            touchend: $.proxy(self, '_touchEnd')
+        });
+
+        // Call the original $.ui.mouse init method
+        _mouseInit.call(self);
+    };
+
+    /**
+     * Remove the touch event handlers
+     */
+    mouseProto._mouseDestroy = function () {
+
+        var self = this;
+
+        // Delegate the touch handlers to the widget's element
+        self.element.unbind({
+            touchstart: $.proxy(self, '_touchStart'),
+            touchmove: $.proxy(self, '_touchMove'),
+            touchend: $.proxy(self, '_touchEnd')
+        });
+
+        // Call the original $.ui.mouse destroy method
+        _mouseDestroy.call(self);
+    };
+
+})(jQuery);

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js

@@ -7,7 +7,7 @@ import "jarallax";
 import $ from "jquery";
 import ko from "knockout";
 import events from "Magento_PageBuilder/js/events";
-import ResizeObserver from "Magento_PageBuilder/js/resource/resize-observer/ResizeObserver.min";
+import ResizeObserver from "Magento_PageBuilder/js/resource/resize-observer/ResizeObserver";
 import _ from "underscore";
 import ContentTypeConfigInterface from "../../content-type-config.d";
 import ConditionalRemoveOption from "../../content-type-menu/conditional-remove-option";

app/code/Magento/PageBuilder/view/adminhtml/web/js/resource/jquery/ui/jquery.ui.touch-punch.js

@@ -7,7 +7,7 @@ import $ from "jquery";
 import ko from "knockout";
 import $t from "mage/translate";
 import events from "Magento_PageBuilder/js/events";
-import "Magento_PageBuilder/js/resource/slick/slick.min";
+import "slick";
 import _ from "underscore";
 import "../../binding/focus";
 import {PreviewSortableSortUpdateEventParams} from "../../binding/sortable-children";

app/code/Magento/PageBuilder/view/adminhtml/web/js/stage.js

@@ -6,7 +6,7 @@
 import ko from "knockout";
 import $t from "mage/translate";
 import events from "Magento_PageBuilder/js/events";
-import "Magento_PageBuilder/js/resource/jquery/ui/jquery.ui.touch-punch.min";
+import "Magento_PageBuilder/js/resource/jquery/ui/jquery.ui.touch-punch";
 import alertDialog from "Magento_Ui/js/modal/alert";
 import _ from "underscore";
 import "./binding/sortable";

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/preview.ts

@@ -32,6 +32,6 @@ declare var ResizeObserver: {
     new(callback: ResizeObserverCallback): ResizeObserver;
 };
 
-declare module "Magento_PageBuilder/js/resource/resize-observer/ResizeObserver.min" {
+declare module "Magento_PageBuilder/js/resource/resize-observer/ResizeObserver" {
     export = ResizeObserver;
 }