Commit d980b0e1 by Sam Padgett Committed by GitHub

Merge pull request #155 from spadgett/dont-remove-resize

Prevent modal popup from removing other resize handlers
parents 9d4dded6 687f1147
...@@ -922,7 +922,10 @@ angular.module("openshiftCommonUI").component("originModalPopup", { ...@@ -922,7 +922,10 @@ angular.module("openshiftCommonUI").component("originModalPopup", {
function onHide() { function onHide() {
hideModalBackdrop(); hideModalBackdrop();
angular.element($window).off('resize', debounceResize); if (debounceResize) {
angular.element($window).off('resize', debounceResize);
debounceResize = null;
}
} }
ctrl.$onChanges = function (changeObj) { ctrl.$onChanges = function (changeObj) {
......
...@@ -1093,7 +1093,10 @@ angular.module("openshiftCommonUI").component("originModalPopup", { ...@@ -1093,7 +1093,10 @@ angular.module("openshiftCommonUI").component("originModalPopup", {
function onHide() { function onHide() {
hideModalBackdrop(); hideModalBackdrop();
angular.element($window).off('resize', debounceResize); if (debounceResize) {
angular.element($window).off('resize', debounceResize);
debounceResize = null;
}
} }
ctrl.$onChanges = function (changeObj) { ctrl.$onChanges = function (changeObj) {
......
...@@ -340,7 +340,7 @@ maxWait:250 ...@@ -340,7 +340,7 @@ maxWait:250
}), angular.element($window).on("resize", debounceResize); }), angular.element($window).on("resize", debounceResize);
} }
function onHide() { function onHide() {
hideModalBackdrop(), angular.element($window).off("resize", debounceResize); hideModalBackdrop(), debounceResize && (angular.element($window).off("resize", debounceResize), debounceResize = null);
} }
var debounceResize, ctrl = this; var debounceResize, ctrl = this;
ctrl.$onChanges = function(changeObj) { ctrl.$onChanges = function(changeObj) {
......
...@@ -81,7 +81,10 @@ angular.module("openshiftCommonUI").component("originModalPopup", { ...@@ -81,7 +81,10 @@ angular.module("openshiftCommonUI").component("originModalPopup", {
function onHide() { function onHide() {
hideModalBackdrop(); hideModalBackdrop();
angular.element($window).off('resize', debounceResize); if (debounceResize) {
angular.element($window).off('resize', debounceResize);
debounceResize = null;
}
} }
ctrl.$onChanges = function (changeObj) { ctrl.$onChanges = function (changeObj) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment