fixed conflict

1 files changed, 34 insertions, 0 deletions

diff --git a/node_modules/jquery/src/exports/global.js b/node_modules/jquery/src/exports/global.js
new file mode 100644
index 0000000..ebdb73b
--- /dev/null
+++ b/node_modules/jquery/src/exports/global.js
@@ -0,0 +1,34 @@
+/* ExcludeStart */
+
+// This file is included in a different way from all the others
+// so the "use strict" pragma is not needed.
+/* eslint strict: "off" */
+
+/* ExcludeEnd */
+
+var
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+	if ( window.$ === jQuery ) {
+		window.$ = _$;
+	}
+
+	if ( deep && window.jQuery === jQuery ) {
+		window.jQuery = _jQuery;
+	}
+
+	return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in AMD
+// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( !noGlobal ) {
+	window.jQuery = window.$ = jQuery;
+}