From a9416a71730e52112ab025a83f129181e3ab0898 Mon Sep 17 00:00:00 2001
From: Claudio Sanches <contato@claudiosanches.com>
Date: Thu, 14 Mar 2019 12:26:54 -0300
Subject: [PATCH] Fixed multiple modals after click in "Release x.x.x
 information"

Closes woocommerce/woocommerce-beta-tester#47
---
 .../assets/js/version-information.js          |  5 ++++
 .../assets/js/version-information.min.js      |  2 +-
 .../assets/js/version-picker.min.js           |  2 +-
 .../woocommerce-beta-tester/package-lock.json | 26 ++++++-------------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/plugins/woocommerce-beta-tester/assets/js/version-information.js b/plugins/woocommerce-beta-tester/assets/js/version-information.js
index e434a12dac5..9528bf18a63 100644
--- a/plugins/woocommerce-beta-tester/assets/js/version-information.js
+++ b/plugins/woocommerce-beta-tester/assets/js/version-information.js
@@ -25,6 +25,11 @@ jQuery(function( $ ) {
 		showModal: function( event ) {
 			event.preventDefault();
 
+			// Prevent multiple modals.
+			if ( 0 < $( '.wc-backbone-modal-beta-tester-version-info' ).length ) {
+				return;
+			}
+
 			$( this ).WCBackboneModal({
 				template: 'wc-beta-tester-version-info',
 				variable: {
diff --git a/plugins/woocommerce-beta-tester/assets/js/version-information.min.js b/plugins/woocommerce-beta-tester/assets/js/version-information.min.js
index af749f269f4..ddfe3d41f10 100644
--- a/plugins/woocommerce-beta-tester/assets/js/version-information.min.js
+++ b/plugins/woocommerce-beta-tester/assets/js/version-information.min.js
@@ -1 +1 @@
-jQuery(function(e){({init:function(){e("#wp-admin-bar-show-version-info").on("click",this.showModal)},showModal:function(i){i.preventDefault(),e(this).WCBackboneModal({template:"wc-beta-tester-version-info",variable:{version:wc_beta_tester_version_info_params.version,description:wc_beta_tester_version_info_params.description}})}}).init()});
+jQuery(function(i){({init:function(){i("#wp-admin-bar-show-version-info").on("click",this.showModal)},showModal:function(e){e.preventDefault(),0<i(".wc-backbone-modal-beta-tester-version-info").length||i(this).WCBackboneModal({template:"wc-beta-tester-version-info",variable:{version:wc_beta_tester_version_info_params.version,description:wc_beta_tester_version_info_params.description}})}}).init()});
diff --git a/plugins/woocommerce-beta-tester/assets/js/version-picker.min.js b/plugins/woocommerce-beta-tester/assets/js/version-picker.min.js
index a6710d4146a..4c2a50307ee 100644
--- a/plugins/woocommerce-beta-tester/assets/js/version-picker.min.js
+++ b/plugins/woocommerce-beta-tester/assets/js/version-picker.min.js
@@ -1 +1 @@
-jQuery(function(n){({init:function(){instance=this,instance.new_version=void 0,n("#wcbt-modal-version-switch-confirm").on("click",this.showConfirmVersionSwitchModal),n("input[type=radio][name=wcbt_switch_to_version]").change(function(){instance.new_version=this.value})},showConfirmVersionSwitchModal:function(i){i.preventDefault(),instance.new_version?(n(this).WCBackboneModal({template:"wcbt-version-switch-confirm",variable:{new_version:instance.new_version}}),n("#wcbt-submit-version-switch").on("click",instance.submitSwitchVersionForm)):alert(wc_beta_tester_version_picker_params.i18n_pick_version)},submitSwitchVersionForm:function(i){i.preventDefault(),n("form[name=wcbt-select-version]").get(0).submit()}}).init()});
+jQuery(function(n){({init:function(){instance=this,instance.new_version=void 0,n("#wcbt-modal-version-switch-confirm").on("click",this.showConfirmVersionSwitchModal),n("input[type=radio][name=wcbt_switch_to_version]").change(function(){n(this).is(":checked")&&(instance.new_version=n(this).val())}).trigger("change")},showConfirmVersionSwitchModal:function(i){i.preventDefault(),instance.new_version?(n(this).WCBackboneModal({template:"wcbt-version-switch-confirm",variable:{new_version:instance.new_version}}),n("#wcbt-submit-version-switch").on("click",instance.submitSwitchVersionForm)):alert(wc_beta_tester_version_picker_params.i18n_pick_version)},submitSwitchVersionForm:function(i){i.preventDefault(),n("form[name=wcbt-select-version]").get(0).submit()}}).init()});
diff --git a/plugins/woocommerce-beta-tester/package-lock.json b/plugins/woocommerce-beta-tester/package-lock.json
index 8752da38655..1040f68a884 100644
--- a/plugins/woocommerce-beta-tester/package-lock.json
+++ b/plugins/woocommerce-beta-tester/package-lock.json
@@ -38,8 +38,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "asynckit": {
       "version": "0.4.0",
@@ -126,7 +125,6 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
       "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
       "dev": true,
-      "optional": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -164,8 +162,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "ecc-jsbn": {
       "version": "0.1.2",
@@ -199,8 +196,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "fast-deep-equal": {
       "version": "2.0.1",
@@ -343,8 +339,7 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "json-schema": {
       "version": "0.2.3",
@@ -408,15 +403,13 @@
       "version": "1.37.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
       "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "mime-types": {
       "version": "2.1.21",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
       "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "mime-db": "~1.37.0"
       }
@@ -547,15 +540,13 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "source-map": {
       "version": "0.6.1",
@@ -615,8 +606,7 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "uglify-js": {
       "version": "3.4.9",