Merge branch 'develop' into feature/macros-settings

apps/spreadsheeteditor/main/app/view/CellSettings.js

@@ -847,7 +847,7 @@ define([
                                 var HexColor0 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]).get_color().get_hex(),
                                     HexColor1 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1]).get_color().get_hex();
                                 if (HexColor0 === 'ffffff' && HexColor1 === 'ffffff') {
-                                    this.GradColors.colors[0] = {color: '4f81bd', effectId: 24};    // color accent1
+                                    this.GradColor.colors[0] = {color: '4f81bd', effectId: 24};    // color accent1
                                 }
                             }
                             var arrGradStop = [];

vendor/jquery/jquery.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v3.4.0
+ * jQuery JavaScript Library v3.4.1
  * https://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2019-04-10T19:48Z
+ * Date: 2019-05-01T21:04Z
  */
 ( function( global, factory ) {
 
@@ -142,7 +142,7 @@
 
 
     var
-        version = "3.4.0",
+        version = "3.4.1",
 
         // Define a local copy of jQuery
         jQuery = function( selector, context ) {
@@ -4498,8 +4498,12 @@
         },
         composed = { composed: true };
 
+    // Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only
     // Check attachment across shadow DOM boundaries when possible (gh-3504)
-    if ( documentElement.attachShadow ) {
+    // Support: iOS 10.0-10.2 only
+    // Early iOS 10 versions support `attachShadow` but not `getRootNode`,
+    // leading to errors. We need to check for `getRootNode`.
+    if ( documentElement.getRootNode ) {
         isAttached = function( elem ) {
             return jQuery.contains( elem.ownerDocument, elem ) ||
                 elem.getRootNode( composed ) === elem.ownerDocument;
@@ -5359,8 +5363,7 @@
 
                     // Claim the first handler
                     if ( rcheckableType.test( el.type ) &&
-                        el.click && nodeName( el, "input" ) &&
+                        el.click && nodeName( el, "input" ) ) {
-                        dataPriv.get( el, "click" ) === undefined ) {
 
                         // dataPriv.set( el, "click", ... )
                         leverageNative( el, "click", returnTrue );
@@ -5377,8 +5380,7 @@
 
                     // Force setup before triggering a click
                     if ( rcheckableType.test( el.type ) &&
-                        el.click && nodeName( el, "input" ) &&
+                        el.click && nodeName( el, "input" ) ) {
-                        dataPriv.get( el, "click" ) === undefined ) {
 
                         leverageNative( el, "click" );
                     }
@@ -5419,7 +5421,9 @@
 
         // Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add
         if ( !expectSync ) {
+            if ( dataPriv.get( el, type ) === undefined ) {
                 jQuery.event.add( el, type, returnTrue );
+            }
             return;
         }
 
@@ -5434,9 +5438,13 @@
                 if ( ( event.isTrigger & 1 ) && this[ type ] ) {
 
                     // Interrupt processing of the outer synthetic .trigger()ed event
-                    if ( !saved ) {
+                    // Saved data should be false in such cases, but might be a leftover capture object
+                    // from an async native handler (gh-4350)
+                    if ( !saved.length ) {
 
                         // Store arguments for use when handling the inner native event
+                        // There will always be at least one argument (an event object), so this array
+                        // will not be confused with a leftover capture object.
                         saved = slice.call( arguments );
                         dataPriv.set( this, type, saved );
 
@@ -5449,14 +5457,14 @@
                         if ( saved !== result || notAsync ) {
                             dataPriv.set( this, type, false );
                         } else {
-                            result = undefined;
+                            result = {};
                         }
                         if ( saved !== result ) {
 
                             // Cancel the outer synthetic event
                             event.stopImmediatePropagation();
                             event.preventDefault();
-                            return result;
+                            return result.value;
                         }
 
                         // If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5471,17 +5479,19 @@
 
                     // If this is a native event triggered above, everything is now in order
                     // Fire an inner synthetic event with the original arguments
-                } else if ( saved ) {
+                } else if ( saved.length ) {
 
                     // ...and capture the result
-                    dataPriv.set( this, type, jQuery.event.trigger(
+                    dataPriv.set( this, type, {
+                        value: jQuery.event.trigger(
 
                             // Support: IE <=9 - 11+
                             // Extend with the prototype to reset the above stopImmediatePropagation()
-                        jQuery.extend( saved.shift(), jQuery.Event.prototype ),
+                            jQuery.extend( saved[ 0 ], jQuery.Event.prototype ),
-                        saved,
+                            saved.slice( 1 ),
                             this
-                    ) );
+                        )
+                    } );
 
                     // Abort handling of the native event
                     event.stopImmediatePropagation();

vendor/jquery/package.json

@@ -1,7 +1,7 @@
 {
     "name": "jquery",
     "description": "JavaScript library for DOM operations",
-    "version": "3.4.0",
+    "version": "3.4.1",
     "homepage": "http://jquery.com",
     "author": {
         "name": "jQuery Foundation and other contributors",