Fix Ask popup bug (#231)

dev/Knoin/Knoin.js

@@ -198,6 +198,15 @@ Knoin.prototype.showScreenPopup = function (ViewModelClassToShow, aParameters)
 	}
 };
 
+/**
+ * @param {Function} ViewModelClassToShow
+ * @return {boolean}
+ */
+Knoin.prototype.isPopupVisible = function (ViewModelClassToShow)
+{
+	return ViewModelClassToShow && ViewModelClassToShow.__vm ? ViewModelClassToShow.__vm.modalVisibility() : false;
+};
+
 /**
  * @param {string} sScreenName
  * @param {string} sSubPart

dev/ViewModels/PopupsAskViewModel.js

@@ -103,5 +103,10 @@ PopupsAskViewModel.prototype.onBuild = function ()
 		}
 		return false;
 	}, this));
+
+	key('esc', Enums.KeyState.PopupAsk, _.bind(function () {
+		this.noClick();
+		return false;
+	}, this));
 };
 

dev/ViewModels/PopupsComposeViewModel.js

@@ -359,6 +359,8 @@ function PopupsComposeViewModel()
 	this.bDisabeCloseOnEsc = true;
 	this.sDefaultKeyScope = Enums.KeyState.Compose;
 
+	this.tryToClosePopup = _.debounce(_.bind(this.tryToClosePopup, this), 200);
+
 	Knoin.constructorEnd(this);
 }
 
@@ -912,12 +914,15 @@ PopupsComposeViewModel.prototype.editorResize = function ()
 PopupsComposeViewModel.prototype.tryToClosePopup = function ()
 {
 	var self = this;
+	if (!kn.isPopupVisible(PopupsAskViewModel))
+	{
 		kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'), function () {
 			if (self.modalVisibility())
 			{
 				Utils.delegateRun(self, 'closeCommand');
 			}
 		}]);
+	}
 };
 
 PopupsComposeViewModel.prototype.onBuild = function ()
@@ -945,7 +950,10 @@ PopupsComposeViewModel.prototype.onBuild = function ()
 	});
 
 	key('esc', Enums.KeyState.Compose, function () {
+		if (self.modalVisibility())
+		{
 			self.tryToClosePopup();
+		}
 		return false;
 	});
 

dev/ViewModels/PopupsPluginViewModel.js

@@ -62,6 +62,8 @@ function PopupsPluginViewModel()
 	this.bDisabeCloseOnEsc = true;
 	this.sDefaultKeyScope = Enums.KeyState.All;
 
+	this.tryToClosePopup = _.debounce(_.bind(this.tryToClosePopup, this), 200);
+
 	Knoin.constructorEnd(this);
 }
 
@@ -118,12 +120,15 @@ PopupsPluginViewModel.prototype.onShow = function (oPlugin)
 PopupsPluginViewModel.prototype.tryToClosePopup = function ()
 {
 	var self = this;
+	if (!kn.isPopupVisible(PopupsAskViewModel))
+	{
 		kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'), function () {
 			if (self.modalVisibility())
 			{
 				Utils.delegateRun(self, 'cancelCommand');
 			}
 		}]);
+	}
 };
 
 PopupsPluginViewModel.prototype.onBuild = function ()
@@ -132,7 +137,7 @@ PopupsPluginViewModel.prototype.onBuild = function ()
 		if (this.modalVisibility())
 		{
 			this.tryToClosePopup();
-			return false;
 		}
+		return false;
 	}, this));
 };

rainloop/v/0.0.0/static/js/admin.js

@@ -4551,6 +4551,15 @@ Knoin.prototype.showScreenPopup = function (ViewModelClassToShow, aParameters)
 	}
 };
 
+/**
+ * @param {Function} ViewModelClassToShow
+ * @return {boolean}
+ */
+Knoin.prototype.isPopupVisible = function (ViewModelClassToShow)
+{
+	return ViewModelClassToShow && ViewModelClassToShow.__vm ? ViewModelClassToShow.__vm.modalVisibility() : false;
+};
+
 /**
  * @param {string} sScreenName
  * @param {string} sSubPart
@@ -5531,6 +5540,8 @@ function PopupsPluginViewModel()
 	this.bDisabeCloseOnEsc = true;
 	this.sDefaultKeyScope = Enums.KeyState.All;
 
+	this.tryToClosePopup = _.debounce(_.bind(this.tryToClosePopup, this), 200);
+
 	Knoin.constructorEnd(this);
 }
 
@@ -5587,12 +5598,15 @@ PopupsPluginViewModel.prototype.onShow = function (oPlugin)
 PopupsPluginViewModel.prototype.tryToClosePopup = function ()
 {
 	var self = this;
+	if (!kn.isPopupVisible(PopupsAskViewModel))
+	{
 		kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'), function () {
 			if (self.modalVisibility())
 			{
 				Utils.delegateRun(self, 'cancelCommand');
 			}
 		}]);
+	}
 };
 
 PopupsPluginViewModel.prototype.onBuild = function ()
@@ -5601,8 +5615,8 @@ PopupsPluginViewModel.prototype.onBuild = function ()
 		if (this.modalVisibility())
 		{
 			this.tryToClosePopup();
-			return false;
 		}
+		return false;
 	}, this));
 };
 
@@ -5891,6 +5905,11 @@ PopupsAskViewModel.prototype.onBuild = function ()
 		}
 		return false;
 	}, this));
+
+	key('esc', Enums.KeyState.PopupAsk, _.bind(function () {
+		this.noClick();
+		return false;
+	}, this));
 };
 
 

rainloop/v/0.0.0/static/js/app.js

@@ -5504,6 +5504,15 @@ Knoin.prototype.showScreenPopup = function (ViewModelClassToShow, aParameters)
 	}
 };
 
+/**
+ * @param {Function} ViewModelClassToShow
+ * @return {boolean}
+ */
+Knoin.prototype.isPopupVisible = function (ViewModelClassToShow)
+{
+	return ViewModelClassToShow && ViewModelClassToShow.__vm ? ViewModelClassToShow.__vm.modalVisibility() : false;
+};
+
 /**
  * @param {string} sScreenName
  * @param {string} sSubPart
@@ -9065,6 +9074,8 @@ function PopupsComposeViewModel()
 	this.bDisabeCloseOnEsc = true;
 	this.sDefaultKeyScope = Enums.KeyState.Compose;
 
+	this.tryToClosePopup = _.debounce(_.bind(this.tryToClosePopup, this), 200);
+
 	Knoin.constructorEnd(this);
 }
 
@@ -9618,12 +9629,15 @@ PopupsComposeViewModel.prototype.editorResize = function ()
 PopupsComposeViewModel.prototype.tryToClosePopup = function ()
 {
 	var self = this;
+	if (!kn.isPopupVisible(PopupsAskViewModel))
+	{
 		kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'), function () {
 			if (self.modalVisibility())
 			{
 				Utils.delegateRun(self, 'closeCommand');
 			}
 		}]);
+	}
 };
 
 PopupsComposeViewModel.prototype.onBuild = function ()
@@ -9651,7 +9665,10 @@ PopupsComposeViewModel.prototype.onBuild = function ()
 	});
 
 	key('esc', Enums.KeyState.Compose, function () {
+		if (self.modalVisibility())
+		{
 			self.tryToClosePopup();
+		}
 		return false;
 	});
 
@@ -12013,6 +12030,11 @@ PopupsAskViewModel.prototype.onBuild = function ()
 		}
 		return false;
 	}, this));
+
+	key('esc', Enums.KeyState.PopupAsk, _.bind(function () {
+		this.noClick();
+		return false;
+	}, this));
 };