From 58a93c962157b57dd67f28ee328fa2a53190c54c Mon Sep 17 00:00:00 2001
From: Kobi Zaltzberg <kobi@pojo.me>
Date: Tue, 8 May 2018 11:12:22 +0300
Subject: [PATCH] Make an identifier for the select2 customization. Fixes #4325

---
 .../css/select2.css => e-select2/css/e-select2.css}  |  0
 .../css/e-select2.min.css}                           |  0
 .../js/e-select2.full.js}                            |  5 +++--
 .../js/e-select2.full.min.js}                        |  0
 includes/editor.php                                  | 12 ++++++------
 includes/preview.php                                 |  6 +++---
 tests/test-editor.php                                |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)
 rename assets/lib/{select2/css/select2.css => e-select2/css/e-select2.css} (100%)
 rename assets/lib/{select2/css/select2.min.css => e-select2/css/e-select2.min.css} (100%)
 rename assets/lib/{select2/js/select2.full.js => e-select2/js/e-select2.full.js} (99%)
 rename assets/lib/{select2/js/select2.full.min.js => e-select2/js/e-select2.full.min.js} (100%)

diff --git a/assets/lib/select2/css/select2.css b/assets/lib/e-select2/css/e-select2.css
similarity index 100%
rename from assets/lib/select2/css/select2.css
rename to assets/lib/e-select2/css/e-select2.css
diff --git a/assets/lib/select2/css/select2.min.css b/assets/lib/e-select2/css/e-select2.min.css
similarity index 100%
rename from assets/lib/select2/css/select2.min.css
rename to assets/lib/e-select2/css/e-select2.min.css
diff --git a/assets/lib/select2/js/select2.full.js b/assets/lib/e-select2/js/e-select2.full.js
similarity index 99%
rename from assets/lib/select2/js/select2.full.js
rename to assets/lib/e-select2/js/e-select2.full.js
index 0e897849c00..22221334943 100644
--- a/assets/lib/select2/js/select2.full.js
+++ b/assets/lib/e-select2/js/e-select2.full.js
@@ -2,6 +2,8 @@
  * Select2 4.0.6-rc.1
  * https://select2.github.io
  *
+ * With a fix by Elementor team at line 4329
+ *
  * Released under the MIT license
  * https://github.com/select2/select2/blob/master/LICENSE.md
  */
@@ -4324,8 +4326,7 @@ S2.define('select2/dropdown/attachBody',[
     });
 
     $watchers.on(scrollEvent, function (ev) {
-      var position = Utils.GetData(this, 'select2-scroll-position');
-      $(this).scrollTop(position.y);
+	    self._positionDropdown();
     });
 
     $(window).on(scrollEvent + ' ' + resizeEvent + ' ' + orientationEvent,
diff --git a/assets/lib/select2/js/select2.full.min.js b/assets/lib/e-select2/js/e-select2.full.min.js
similarity index 100%
rename from assets/lib/select2/js/select2.full.min.js
rename to assets/lib/e-select2/js/e-select2.full.min.js
diff --git a/includes/editor.php b/includes/editor.php
index 415e64807cf..6d33a4fabc3 100644
--- a/includes/editor.php
+++ b/includes/editor.php
@@ -385,8 +385,8 @@ public function enqueue_scripts() {
 		);
 
 		wp_register_script(
-			'jquery-select2',
-			ELEMENTOR_ASSETS_URL . 'lib/select2/js/select2.full' . $suffix . '.js',
+			'jquery-elementor-select2',
+			ELEMENTOR_ASSETS_URL . 'lib/e-select2/js/e-select2.full' . $suffix . '.js',
 			[
 				'jquery',
 			],
@@ -454,7 +454,7 @@ public function enqueue_scripts() {
 				'tipsy',
 				'imagesloaded',
 				'heartbeat',
-				'jquery-select2',
+				'jquery-elementor-select2',
 				'flatpickr',
 				'elementor-dialog',
 				'ace',
@@ -736,8 +736,8 @@ public function enqueue_styles() {
 		);
 
 		wp_register_style(
-			'select2',
-			ELEMENTOR_ASSETS_URL . 'lib/select2/css/select2' . $suffix . '.css',
+			'elementor-select2',
+			ELEMENTOR_ASSETS_URL . 'lib/e-select2/css/e-select2' . $suffix . '.css',
 			[],
 			'4.0.5'
 		);
@@ -768,7 +768,7 @@ public function enqueue_styles() {
 			ELEMENTOR_ASSETS_URL . 'css/editor' . $direction_suffix . $suffix . '.css',
 			[
 				'font-awesome',
-				'select2',
+				'elementor-select2',
 				'elementor-icons',
 				'wp-auth-check',
 				'google-font-roboto',
diff --git a/includes/preview.php b/includes/preview.php
index a98a346caff..e0a78260dbe 100644
--- a/includes/preview.php
+++ b/includes/preview.php
@@ -170,8 +170,8 @@ private function enqueue_styles() {
 		$direction_suffix = is_rtl() ? '-rtl' : '';
 
 		wp_register_style(
-			'select2',
-			ELEMENTOR_ASSETS_URL . 'lib/select2/css/select2' . $suffix . '.css',
+			'elementor-select2',
+			ELEMENTOR_ASSETS_URL . 'lib/e-select2/css/e-select2' . $suffix . '.css',
 			[],
 			'4.0.5'
 		);
@@ -180,7 +180,7 @@ private function enqueue_styles() {
 			'editor-preview',
 			ELEMENTOR_ASSETS_URL . 'css/editor-preview' . $direction_suffix . $suffix . '.css',
 			[
-				'select2',
+				'elementor-select2',
 			],
 			ELEMENTOR_VERSION
 		);
diff --git a/tests/test-editor.php b/tests/test-editor.php
index 625fa44865a..042f95bebdb 100644
--- a/tests/test-editor.php
+++ b/tests/test-editor.php
@@ -53,7 +53,7 @@ public function test_enqueueStyles() {
 
 		$styles = [
 			'font-awesome',
-			'select2',
+			'elementor-select2',
 			'elementor-icons',
 			'wp-auth-check',
 			'google-font-roboto',