From a8a542097ce273aae2e9d2c456b85edb69facede Mon Sep 17 00:00:00 2001 From: Sergey Belozyorcev Date: Fri, 28 Sep 2018 02:25:15 +0300 Subject: [PATCH 1/3] Fix event listeners in modal_autoclosable --- .../modal/_autoclosable/modal_autoclosable.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/common.blocks/modal/_autoclosable/modal_autoclosable.js b/common.blocks/modal/_autoclosable/modal_autoclosable.js index c19240cbb..db489044a 100644 --- a/common.blocks/modal/_autoclosable/modal_autoclosable.js +++ b/common.blocks/modal/_autoclosable/modal_autoclosable.js @@ -14,15 +14,23 @@ modules.define( */ provide(Modal.declMod({ modName : 'autoclosable', modVal : true }, /** @lends modal.prototype */{ onSetMod : { + 'js' : { + inited : function() { + this.__base.apply(this, arguments); + this._events(this._popup) + .on({ modName : 'visible', modVal : '' }, this._onPopupHide, this); + } + }, 'visible' : { 'true' : function() { this.__base.apply(this, arguments); - this - ._nextTick(function() { - this._domEvents().on('pointerclick', this._onPointerClick); - }) - ._popup._events().on({ modName : 'visible', modVal : '' }, this._onPopupHide, this); + this._nextTick(function() { + this._domEvents().on('pointerclick', this._onPointerClick); + }); + }, + '' : function() { + this._domEvents().un('pointerclick', this._onPointerClick); } } }, From 9ed495fedc4c021eae7d69fd8dcd1afc81cd448f Mon Sep 17 00:00:00 2001 From: Sergey Belozyorcev Date: Fri, 28 Sep 2018 02:27:18 +0300 Subject: [PATCH 2/3] fixup --- common.blocks/modal/_autoclosable/modal_autoclosable.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common.blocks/modal/_autoclosable/modal_autoclosable.js b/common.blocks/modal/_autoclosable/modal_autoclosable.js index db489044a..fdcffbf17 100644 --- a/common.blocks/modal/_autoclosable/modal_autoclosable.js +++ b/common.blocks/modal/_autoclosable/modal_autoclosable.js @@ -30,6 +30,8 @@ provide(Modal.declMod({ modName : 'autoclosable', modVal : true }, /** @lends mo }); }, '' : function() { + this.__base.apply(this, arguments); + this._domEvents().un('pointerclick', this._onPointerClick); } } From e5a0b41bedce23ea4afd3e8d03dc9375780635f9 Mon Sep 17 00:00:00 2001 From: Sergey Belozyorcev Date: Fri, 28 Sep 2018 02:59:17 +0300 Subject: [PATCH 3/3] fixup --- common.blocks/modal/_autoclosable/modal_autoclosable.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/common.blocks/modal/_autoclosable/modal_autoclosable.js b/common.blocks/modal/_autoclosable/modal_autoclosable.js index fdcffbf17..9cf1496e4 100644 --- a/common.blocks/modal/_autoclosable/modal_autoclosable.js +++ b/common.blocks/modal/_autoclosable/modal_autoclosable.js @@ -24,14 +24,12 @@ provide(Modal.declMod({ modName : 'autoclosable', modVal : true }, /** @lends mo 'visible' : { 'true' : function() { this.__base.apply(this, arguments); - this._nextTick(function() { this._domEvents().on('pointerclick', this._onPointerClick); }); }, '' : function() { this.__base.apply(this, arguments); - this._domEvents().un('pointerclick', this._onPointerClick); } }