upgrade jquery 3.5

common/src/main/resources/static/jquery/jquery-migrate-3.2.0.js

@@ -1,7 +1,7 @@
-/*!
+/*!
- * jQuery Migrate - v3.1.0 - 2019-06-08
+ * jQuery Migrate - v3.2.0 - 2020-04-10
- * Copyright OpenJS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
- */
+ */
 ;( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
@@ -21,10 +21,10 @@
 	}
 } )( function( jQuery, window ) {
 "use strict";
+
 
-
+jQuery.migrateVersion = "3.2.0";
-jQuery.migrateVersion = "3.1.0";
+
-
 /* exported jQueryVersionSince, compareVersions */
 
 // Returns 0 if v1 == v2, -1 if v1 < v2, 1 if v1 > v2
@@ -47,7 +47,7 @@ function compareVersions( v1, v2 ) {
 function jQueryVersionSince( version ) {
 	return compareVersions( jQuery.fn.jquery, version ) >= 0;
 }
-
+
 /* exported migrateWarn, migrateWarnFunc, migrateWarnProp */
 
 ( function() {
@@ -67,15 +67,18 @@ function jQueryVersionSince( version ) {
 		window.console.log( "JQMIGRATE: Migrate plugin loaded multiple times" );
 	}
 
-	// Show a message on the console so devs know we're active
+//	// Show a message on the console so devs know we're active ThinkGem
-	//window.console.log( "JQMIGRATE: Migrate is installed" +
+//	window.console.log( "JQMIGRATE: Migrate is installed" +
-	//	( jQuery.migrateMute ? "" : " with logging active" ) +
+//		( jQuery.migrateMute ? "" : " with logging active" ) +
-	//	", version " + jQuery.migrateVersion );
+//		", version " + jQuery.migrateVersion );
 
 } )();
 
 var warnedAbout = {};
 
+// By default each warning is only reported once.
+jQuery.migrateDeduplicateWarnings = true;
+
 // List of warnings already given; public read only
 jQuery.migrateWarnings = [];
 
@@ -92,7 +95,7 @@ jQuery.migrateReset = function() {
 
 function migrateWarn( msg ) {
 	var console = window.console;
-	if ( !warnedAbout[ msg ] ) {
+	if ( !jQuery.migrateDeduplicateWarnings || !warnedAbout[ msg ] ) {
 		warnedAbout[ msg ] = true;
 		jQuery.migrateWarnings.push( msg );
 		if ( console && console.warn && !jQuery.migrateMute ) {
@@ -131,13 +134,16 @@ if ( window.document.compatMode === "BackCompat" ) {
 	// JQuery has never supported or tested Quirks Mode
 	migrateWarn( "jQuery is not compatible with Quirks Mode" );
 }
-
+
 
 var oldInit = jQuery.fn.init,
-	oldIsNumeric = jQuery.isNumeric,
 	oldFind = jQuery.find,
 	rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
-	rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g;
+	rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,
+
+	// Support: Android <=4.0 only
+	// Make sure we trim BOM and NBSP
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
 
 jQuery.fn.init = function( arg1 ) {
 	var args = Array.prototype.slice.call( arguments );
@@ -195,42 +201,15 @@ for ( findProp in oldFind ) {
 }
 
 // The number of elements contained in the matched element set
-jQuery.fn.size = function() {
+migrateWarnFunc( jQuery.fn, "size", function() {
-	migrateWarn( "jQuery.fn.size() is deprecated and removed; use the .length property" );
 	return this.length;
-};
+},
+"jQuery.fn.size() is deprecated and removed; use the .length property" );
 
-jQuery.parseJSON = function() {
+migrateWarnFunc( jQuery, "parseJSON", function() {
-	migrateWarn( "jQuery.parseJSON is deprecated; use JSON.parse" );
 	return JSON.parse.apply( null, arguments );
-};
+},
-
+"jQuery.parseJSON is deprecated; use JSON.parse" );
-jQuery.isNumeric = function( val ) {
-
-	// The jQuery 2.2.3 implementation of isNumeric
-	function isNumeric2( obj ) {
-		var realStringObj = obj && obj.toString();
-		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
-	}
-
-	var newValue = oldIsNumeric( val ),
-		oldValue = isNumeric2( val );
-
-	if ( newValue !== oldValue ) {
-		migrateWarn( "jQuery.isNumeric() should not be called on constructed objects" );
-	}
-
-	return oldValue;
-};
-
-if ( jQueryVersionSince( "3.3.0" ) ) {
-	migrateWarnFunc( jQuery, "isWindow",
-		function( obj ) {
-			return obj != null && obj === obj.window;
-		},
-		"jQuery.isWindow() is deprecated"
-	);
-}
 
 migrateWarnFunc( jQuery, "holdReady", jQuery.holdReady,
 	"jQuery.holdReady is deprecated" );
@@ -244,12 +223,80 @@ migrateWarnProp( jQuery.expr, "filters", jQuery.expr.pseudos,
 migrateWarnProp( jQuery.expr, ":", jQuery.expr.pseudos,
 	"jQuery.expr[':'] is deprecated; use jQuery.expr.pseudos" );
 
+// Prior to jQuery 3.1.1 there were internal refs so we don't warn there
+if ( jQueryVersionSince( "3.1.1" ) ) {
+	migrateWarnFunc( jQuery, "trim", function( text ) {
+		return text == null ?
+			"" :
+			( text + "" ).replace( rtrim, "" );
+	},
+	"jQuery.trim is deprecated; use String.prototype.trim" );
+}
+
 // Prior to jQuery 3.2 there were internal refs so we don't warn there
 if ( jQueryVersionSince( "3.2.0" ) ) {
-	migrateWarnFunc( jQuery, "nodeName", jQuery.nodeName,
+	migrateWarnFunc( jQuery, "nodeName", function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	},
 	"jQuery.nodeName is deprecated" );
 }
 
+if ( jQueryVersionSince( "3.3.0" ) ) {
+
+	migrateWarnFunc( jQuery, "isNumeric", function( obj ) {
+
+			// As of jQuery 3.0, isNumeric is limited to
+			// strings and numbers (primitives or objects)
+			// that can be coerced to finite numbers (gh-2662)
+			var type = typeof obj;
+			return ( type === "number" || type === "string" ) &&
+
+				// parseFloat NaNs numeric-cast false positives ("")
+				// ...but misinterprets leading-number strings, e.g. hex literals ("0x...")
+				// subtraction forces infinities to NaN
+				!isNaN( obj - parseFloat( obj ) );
+		},
+		"jQuery.isNumeric() is deprecated"
+	);
+
+	// Populate the class2type map
+	var class2type = {};
+	jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".
+		split( " " ),
+	function( _, name ) {
+		class2type[ "[object " + name + "]" ] = name.toLowerCase();
+	} );
+
+	migrateWarnFunc( jQuery, "type", function( obj ) {
+		if ( obj == null ) {
+			return obj + "";
+		}
+
+		// Support: Android <=2.3 only (functionish RegExp)
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ Object.prototype.toString.call( obj ) ] || "object" :
+			typeof obj;
+	},
+	"jQuery.type is deprecated" );
+
+	migrateWarnFunc( jQuery, "isFunction",
+		function( obj ) {
+			return typeof obj === "function";
+		},
+		"jQuery.isFunction() is deprecated" );
+
+	migrateWarnFunc( jQuery, "isWindow",
+		function( obj ) {
+			return obj != null && obj === obj.window;
+		},
+		"jQuery.isWindow() is deprecated"
+	);
+
+	migrateWarnFunc( jQuery, "isArray", Array.isArray,
+		"jQuery.isArray is deprecated; use Array.isArray"
+	);
+}
+
 
 var oldAjax = jQuery.ajax;
 
@@ -268,7 +315,7 @@ jQuery.ajax = function( ) {
 
 	return jQXHR;
 };
-
+
 
 var oldRemoveAttr = jQuery.fn.removeAttr,
 	oldToggleClass = jQuery.fn.toggleClass,
@@ -317,7 +364,7 @@ jQuery.fn.toggleClass = function( state ) {
 		}
 	} );
 };
-
+
 
 var internalSwapCall = false;
 
@@ -363,8 +410,24 @@ jQuery.swap = function( elem, options, callback, args ) {
 	return ret;
 };
 
+if ( jQueryVersionSince( "3.4.0" ) && typeof Proxy !== "undefined" ) {
+
+	jQuery.cssProps = new Proxy( jQuery.cssProps || {}, {
+		set: function() {
+			migrateWarn( "JQMIGRATE: jQuery.cssProps is deprecated" );
+			return Reflect.set.apply( this, arguments );
+		}
+	} );
+}
+
 var oldData = jQuery.data;
 
+var camelCase = function( string ) {
+	return string.replace( /-([a-z])/g, function( _, letter ) {
+		return letter.toUpperCase();
+	} );
+};
+
 jQuery.data = function( elem, name, value ) {
 	var curData;
 
@@ -373,7 +436,7 @@ jQuery.data = function( elem, name, value ) {
 		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
 		var sameKeys = {};
 		for ( var key in name ) {
-			if ( key !== jQuery.camelCase( key ) ) {
+			if ( key !== camelCase( key ) ) {
 				migrateWarn( "jQuery.data() always sets/gets camelCased names: " + key );
 				curData[ key ] = name[ key ];
 			} else {
@@ -387,7 +450,7 @@ jQuery.data = function( elem, name, value ) {
 	}
 
 	// If the name is transformed, look for the un-transformed name in the data object
-	if ( name && typeof name === "string" && name !== jQuery.camelCase( name ) ) {
+	if ( name && typeof name === "string" && name !== camelCase( name ) ) {
 		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
 		if ( curData && name in curData ) {
 			migrateWarn( "jQuery.data() always sets/gets camelCased names: " + name );
@@ -400,7 +463,7 @@ jQuery.data = function( elem, name, value ) {
 
 	return oldData.apply( this, arguments );
 };
-
+
 var oldTweenRun = jQuery.Tween.prototype.run;
 var linearEasing = function( pct ) {
 		return pct;
@@ -440,7 +503,7 @@ if ( window.requestAnimationFrame ) {
 		}
 	} );
 }
-
+
 var oldLoad = jQuery.fn.load,
 	oldEventAdd = jQuery.event.add,
 	originalFix = jQuery.event.fix;
@@ -570,29 +633,37 @@ jQuery.fn.extend( {
 		return this.on( "mouseenter", fnOver ).on( "mouseleave", fnOut || fnOver );
 	}
 } );
+
+var rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi;
 
+jQuery.UNSAFE_restoreLegacyHtmlPrefilter = function() {
+	jQuery.htmlPrefilter = function( html ) {
+		return html.replace( rxhtmlTag, "<$1></$2>" );
+	};
+};
+
 
 var oldOffset = jQuery.fn.offset;
 
 jQuery.fn.offset = function() {
 	var docElem,
 		elem = this[ 0 ],
-		origin = { top: 0, left: 0 };
+		bogus = { top: 0, left: 0 };
 
 	if ( !elem || !elem.nodeType ) {
 		migrateWarn( "jQuery.fn.offset() requires a valid DOM element" );
-		return origin;
+		return undefined;
 	}
 
 	docElem = ( elem.ownerDocument || window.document ).documentElement;
 	if ( !jQuery.contains( docElem, elem ) ) {
 		migrateWarn( "jQuery.fn.offset() requires an element connected to a document" );
-		return origin;
+		return bogus;
 	}
 
 	return oldOffset.apply( this, arguments );
 };
-
+
 
 var oldParam = jQuery.param;
 
@@ -607,14 +678,14 @@ jQuery.param = function( data, traditional ) {
 
 	return oldParam.call( this, data, traditional );
 };
-
+
 var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
 
 jQuery.fn.andSelf = function() {
 	migrateWarn( "jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()" );
 	return oldSelf.apply( this, arguments );
 };
-
+
 
 var oldDeferred = jQuery.Deferred,
 	tuples = [
@@ -639,14 +710,14 @@ jQuery.Deferred = function( func ) {
 
 		return jQuery.Deferred( function( newDefer ) {
 			jQuery.each( tuples, function( i, tuple ) {
-				var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+				var fn = typeof fns[ i ] === "function" && fns[ i ];
 
 				// Deferred.done(function() { bind to newDefer or newDefer.resolve })
 				// deferred.fail(function() { bind to newDefer or newDefer.reject })
 				// deferred.progress(function() { bind to newDefer or newDefer.notify })
 				deferred[ tuple[ 1 ] ]( function() {
 					var returned = fn && fn.apply( this, arguments );
-					if ( returned && jQuery.isFunction( returned.promise ) ) {
+					if ( returned && typeof returned.promise === "function" ) {
 						returned.promise()
 							.done( newDefer.resolve )
 							.fail( newDefer.reject )
@@ -673,6 +744,6 @@ jQuery.Deferred = function( func ) {
 
 // Preserve handler of uncaught exceptions in promise chains
 jQuery.Deferred.exceptionHook = oldDeferred.exceptionHook;
-
+
 return jQuery;
 } );

modules/core/src/main/resources/static/fullcalendar/2.6/index.html

@@ -79,8 +79,8 @@
 			</div>
 		</div>
 	</div>
-<script src="../../jquery/jquery-3.4.1.min.js"></script>
+<script src="../../jquery/jquery-3.5.0.min.js"></script>
-<script src="../../jquery/jquery-migrate-3.1.0.min.js"></script>
+<script src="../../jquery/jquery-migrate-3.2.0.min.js"></script>
 <script src="../../jquery/jquery-ui-draggable-1.12.1.min.js"></script>
 <script src="lib/moment.min.js"></script>
 <script src="fullcalendar.js"></script>

modules/core/src/main/resources/static/ueditor/1.4/dialogs/attachment/attachment.html

@@ -7,8 +7,8 @@
 
     <!-- jquery -->
 <!--     <script src="../../third-party/jquery-1.10.2.min.js"></script> -->
-    <script src="../../../../jquery/jquery-3.4.1.min.js"></script>
+    <script src="../../../../jquery/jquery-3.5.0.min.js"></script>
-    <script src="../../../../jquery/jquery-migrate-3.1.0.min.js"></script>
+    <script src="../../../../jquery/jquery-migrate-3.2.0.min.js"></script>
 
     <!-- webuploader -->
     <script src="../../third-party/webuploader/webuploader.min.js"></script>

modules/core/src/main/resources/static/ueditor/1.4/dialogs/charts/charts.html

@@ -82,8 +82,8 @@
             </div>
         </div>
 <!--         <script src="../../third-party/jquery-1.10.2.min.js"></script> -->
-	    <script src="../../../../jquery/jquery-3.4.1.min.js"></script>
+	    <script src="../../../../jquery/jquery-3.5.0.min.js"></script>
-	    <script src="../../../../jquery/jquery-migrate-3.1.0.min.js"></script>
+	    <script src="../../../../jquery/jquery-migrate-3.2.0.min.js"></script>
         <script src="../../third-party/highcharts/highcharts.js"></script>
         <script src="chart.config.js"></script>
         <script src="charts.js"></script>

modules/core/src/main/resources/static/ueditor/1.4/dialogs/image/image.html

@@ -7,8 +7,8 @@
 
     <!-- jquery -->
 <!--     <script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script> -->
-    <script type="text/javascript" src="../../../../jquery/jquery-3.4.1.min.js"></script>
+    <script type="text/javascript" src="../../../../jquery/jquery-3.5.0.min.js"></script>
-    <script type="text/javascript" src="../../../../jquery/jquery-migrate-3.1.0.min.js"></script>
+    <script type="text/javascript" src="../../../../jquery/jquery-migrate-3.2.0.min.js"></script>
 
     <!-- webuploader -->
     <script src="../../third-party/webuploader/webuploader.min.js"></script>

modules/core/src/main/resources/static/ueditor/1.4/dialogs/video/video.html

@@ -76,8 +76,8 @@
 
 <!-- jquery -->
 <!--     <script src="../../third-party/jquery-1.10.2.min.js"></script> -->
-    <script src="../../../../jquery/jquery-3.4.1.min.js"></script>
+    <script src="../../../../jquery/jquery-3.5.0.min.js"></script>
-    <script src="../../../../jquery/jquery-migrate-3.1.0.min.js"></script>
+    <script src="../../../../jquery/jquery-migrate-3.2.0.min.js"></script>
 
 <!-- webuploader -->
 <script type="text/javascript" src="../../third-party/webuploader/webuploader.min.js"></script>

modules/core/src/main/resources/views/include/head.html

@@ -6,8 +6,8 @@
 <title>${(isNotBlank(title!) ? title! + ' - ' : '') + @Global.getConfig('productName')}</title>
 <link rel="shortcut icon" href="${ctxStatic}/favicon.png" type="image/png">
 <script src="${ctxPath}/global.min.js?ctx=${ctx}"></script>
-<script src="${ctxStatic}/jquery/jquery-3.4.1.min.js"></script>
+<script src="${ctxStatic}/jquery/jquery-3.5.0.min.js"></script>
-<script src="${ctxStatic}/jquery/jquery-migrate-3.1.0.min.js"></script>
+<script src="${ctxStatic}/jquery/jquery-migrate-3.2.0.min.js"></script>
 <!--[if lt IE 9]><script src="${ctxStatic}/common/h5fix.min.js"></script><![endif]-->
 <% if(parameter.__layer! == 'true'){ %>
 <style>.main-content>.box-main>.box-header{display:none;}</style>