Merge branch 'refs/heads/release/v8.3.0' into feat/mobile-draw

# Conflicts:
#	vendor/framework7-react/npm-shrinkwrap.json

vendor/ace/component/AceEditor.js

@@ -5,8 +5,6 @@
     *   events: {
     *       onChangeValue // text in editor is changed
     *       onEditorReady // editor is ready for use
-    *       onMouseUp
-    *       onMouseMove
     *       onLoad // frame with editor is loaded
     *   }
     * }
@@ -81,16 +79,6 @@
                         handler = events['onEditorReady'];
                         data = cmd.data;
                         break;
-                    case 'mouseUp':
-                    case 'mouseMove':
-                        handler = events[cmd.command==='mouseUp' ? 'onMouseUp' : 'onMouseMove'];
-                        var rect = parentEl.getBoundingClientRect(),
-                            offset = {
-                                top: rect.top + window.pageYOffset,
-                                left: rect.left + window.pageXOffset
-                            };
-                        data = [cmd.data.x + offset.left, cmd.data.y + offset.top]
-                        break;
                 }
                 if (handler && typeof handler == "function") {
                     res = handler.call(_self, {target: _self, data: data});

vendor/ace/component/AceEditorCode.js

@@ -264,36 +264,9 @@ var _postMessage = function(msg) {
     };
 
     var fn = function(e) { _onMessage(e); };
-
-    var onMouseUp = function(e) {
-        _postMessage({
-            command: 'mouseUp',
-            data: {
-                x: (undefined === e.clientX) ? e.pageX : e.clientX,
-                y: (undefined === e.clientY) ? e.pageY : e.clientY
-            },
-            referer: 'ace-editor'
-        });
-    };
-
-    var onMouseMove = function(e) {
-        _postMessage({
-            command: 'mouseMove',
-            data: {
-                x: (undefined === e.clientX) ? e.pageX : e.clientX,
-                y: (undefined === e.clientY) ? e.pageY : e.clientY
-            },
-            referer: 'ace-editor'
-        });
-    };
-
     if (window.attachEvent) {
         window.attachEvent('onmessage', fn);
-        window.attachEvent("onmouseup", onMouseUp);
-        window.attachEvent("onmousemove", onMouseMove);
     } else {
         window.addEventListener('message', fn, false);
-        window.addEventListener("mouseup", onMouseUp, false);
-        window.addEventListener("mousemove", onMouseMove, false);
     }
 })(window, undefined);

vendor/ace/component/example.html

@@ -65,14 +65,6 @@
                              );
     };
 
-    var onMouseUp = function (event) {
-        console.log("onMouseUp");
-    };
-
-    var onMouseMove = function (event) {
-        console.log("onMouseMove");
-    };
-
     var onLoad = function (event) {
         console.log("onLoad");
     };
@@ -82,8 +74,6 @@
         events: {
             onChangeValue: onChangeValue,
             onEditorReady: onEditorReady,
-            onMouseUp: onMouseUp,
-            onMouseMove: onMouseMove,
             onLoad: onLoad
         }
     };

vendor/framework7-react/package.json

@@ -75,6 +75,7 @@
     "less-loader": "^11.1.4",
     "mini-css-extract-plugin": "^2.8.1",
     "ora": "^6.3.1",
+    "svg-sprite-loader": "^6.0.11",
     "postcss-loader": "^7.3.4",
     "postcss-preset-env": "^9.4.0",
     "style-loader": "^3.3.3",