From 7ef1c569a3569310fd258f366bf01af29a240858 Mon Sep 17 00:00:00 2001 From: Dima Voytenko Date: Thu, 15 Mar 2018 08:47:47 -0700 Subject: [PATCH] Upgarde SwG to 0.1.21-55a6698 (#14014) --- third_party/subscriptions-project/swg.js | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/third_party/subscriptions-project/swg.js b/third_party/subscriptions-project/swg.js index 969b9139e2f9..7a8ac847c1e1 100644 --- a/third_party/subscriptions-project/swg.js +++ b/third_party/subscriptions-project/swg.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** Version: 0.1.21-52536000 */ + /** Version: 0.1.21-55a6698 */ 'use strict'; import { ActivityPorts } from 'web-activities/activity-ports'; @@ -1438,12 +1438,25 @@ class DialogManager { // Give a small amount of time for another view to take over the dialog. setTimeout(() => { if (this.dialog_ && this.dialog_.getCurrentView() == view) { - this.dialog_.close(); - this.dialog_ = null; - this.openPromise_ = null; + this.close_(); } }, 100); } + + /** + */ + completeAll() { + if (this.dialog_) { + this.close_(); + } + } + + /** @private */ + close_() { + this.dialog_.close(); + this.dialog_ = null; + this.openPromise_ = null; + } } @@ -2071,7 +2084,7 @@ function feUrl(url, prefix = '') { */ function feArgs(args) { return Object.assign(args, { - '_client': 'SwG 0.1.21-52536000', + '_client': 'SwG 0.1.21-55a6698', }); } @@ -3924,6 +3937,7 @@ class ConfiguredRuntime { /** @override */ reset() { this.entitlementsManager_.reset(); + this.dialogManager_.completeAll(); } /** @override */