codeview event bug fix

minjk-bl · minjk-bl · commit 34d8a45c1e45 · 2021-10-08T23:17:18.000+09:00
diff --git a/src/common/vpFrameEditor.js b/src/common/vpFrameEditor.js
@@ -1674,6 +1674,7 @@ define([
                 $(that.wrapSelector('.' + VP_FE_DETAIL_BOX)).hide();
             }
             if (!$(evt.target).hasClass(VP_FE_BUTTON_PREVIEW)
+                && !$(evt.target).hasClass(VP_FE_PREVIEW_BOX)
                 && $(that.wrapSelector('.' + VP_FE_PREVIEW_BOX)).has(evt.target).length === 0) {
                 that.closePreview();
             }
diff --git a/src/common/vpMerge.js b/src/common/vpMerge.js
@@ -126,7 +126,7 @@ define([
                     ...state
                 };
             }
-            
+
             this.bindEvent();
             this.render();
             vpCommon.loadCssForDiv(this._wrapSelector(), Jupyter.notebook.base_url + vpConst.BASE_PATH + vpConst.STYLE_PATH + 'common/popupPage.css');
@@ -246,10 +246,11 @@ define([
 
         // click other
         $(document).on('click.' + this.uuid, function(evt) {
-            if (!$(evt.target).hasClass('.' + APP_BUTTON_DETAIL)) {
+            if (!$(evt.target).hasClass(APP_BUTTON_DETAIL)) {
                 $(that._wrapSelector('.' + APP_DETAIL_BOX)).hide();
             }
-            if (!$(evt.target).hasClass('.' + APP_BUTTON_PREVIEW)
+            if (!$(evt.target).hasClass(APP_BUTTON_PREVIEW)
+                && !$(evt.target).hasClass(APP_PREVIEW_BOX) 
                 && $(that._wrapSelector('.' + APP_PREVIEW_BOX)).has(evt.target).length === 0) {
                 that.closePreview();
             }
diff --git a/src/common/vpPopupPage.js b/src/common/vpPopupPage.js
@@ -252,10 +252,11 @@ define([
 
         // click other
         $(document).on('click.' + this.uuid, function(evt) {
-            if (!$(evt.target).hasClass('.' + VP_PP_BUTTON_DETAIL)) {
+            if (!$(evt.target).hasClass(VP_PP_BUTTON_DETAIL)) {
                 $(that.wrapSelector('.' + VP_PP_DETAIL_BOX)).hide();
             }
-            if (!$(evt.target).hasClass('.' + VP_PP_BUTTON_PREVIEW)
+            if (!$(evt.target).hasClass(VP_PP_BUTTON_PREVIEW)
+                && !$(evt.target).hasClass(VP_PP_PREVIEW_BOX)
                 && $(that.wrapSelector('.' + VP_PP_PREVIEW_BOX)).has(evt.target).length === 0) {
                 that.closePreview();
             }
diff --git a/src/common/vpReshape.js b/src/common/vpReshape.js
@@ -239,7 +239,8 @@ define([
             if (!$(evt.target).hasClass('.' + APP_BUTTON_DETAIL)) {
                 $(that._wrapSelector('.' + APP_DETAIL_BOX)).hide();
             }
-            if (!$(evt.target).hasClass('.' + APP_BUTTON_PREVIEW)
+            if (!$(evt.target).hasClass(APP_BUTTON_PREVIEW)
+                && !$(evt.target).hasClass(APP_PREVIEW_BOX)
                 && $(that._wrapSelector('.' + APP_PREVIEW_BOX)).has(evt.target).length === 0) {
                 that.closePreview();
             }

Original file line number	Diff line number	Diff line change
`@@ -1674,6 +1674,7 @@ define([`
`1674`	`1674`	`$(that.wrapSelector('.' + VP_FE_DETAIL_BOX)).hide();`
`1675`	`1675`	`}`
`1676`	`1676`	`if (!$(evt.target).hasClass(VP_FE_BUTTON_PREVIEW)`
	`1677`	`+ && !$(evt.target).hasClass(VP_FE_PREVIEW_BOX)`
`1677`	`1678`	`&& $(that.wrapSelector('.' + VP_FE_PREVIEW_BOX)).has(evt.target).length === 0) {`
`1678`	`1679`	`that.closePreview();`
`1679`	`1680`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,10 +252,11 @@ define([`
`252`	`252`
`253`	`253`	`// click other`
`254`	`254`	`$(document).on('click.' + this.uuid, function(evt) {`
`255`		`- if (!$(evt.target).hasClass('.' + VP_PP_BUTTON_DETAIL)) {`
	`255`	`+ if (!$(evt.target).hasClass(VP_PP_BUTTON_DETAIL)) {`
`256`	`256`	`$(that.wrapSelector('.' + VP_PP_DETAIL_BOX)).hide();`
`257`	`257`	`}`
`258`		`- if (!$(evt.target).hasClass('.' + VP_PP_BUTTON_PREVIEW)`
	`258`	`+ if (!$(evt.target).hasClass(VP_PP_BUTTON_PREVIEW)`
	`259`	`+ && !$(evt.target).hasClass(VP_PP_PREVIEW_BOX)`
`259`	`260`	`&& $(that.wrapSelector('.' + VP_PP_PREVIEW_BOX)).has(evt.target).length === 0) {`
`260`	`261`	`that.closePreview();`
`261`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,8 @@ define([`
`239`	`239`	`if (!$(evt.target).hasClass('.' + APP_BUTTON_DETAIL)) {`
`240`	`240`	`$(that._wrapSelector('.' + APP_DETAIL_BOX)).hide();`
`241`	`241`	`}`
`242`		`- if (!$(evt.target).hasClass('.' + APP_BUTTON_PREVIEW)`
	`242`	`+ if (!$(evt.target).hasClass(APP_BUTTON_PREVIEW)`
	`243`	`+ && !$(evt.target).hasClass(APP_PREVIEW_BOX)`
`243`	`244`	`&& $(that._wrapSelector('.' + APP_PREVIEW_BOX)).has(evt.target).length === 0) {`
`244`	`245`	`that.closePreview();`
`245`	`246`	`}`