Frame, Subset Codeview, Dataview toggling

minjk-bl · minjk-bl · commit 7b7c83dbeeb2 · 2021-08-27T16:29:21.000+09:00
diff --git a/src/common/vpFrameEditor.js b/src/common/vpFrameEditor.js
@@ -770,6 +770,7 @@ define([
 
     /** open preview box */
     FrameEditor.prototype.openPreview = function() {
+        this.closeDataview();
         $(this.wrapSelector('.' + VP_FE_PREVIEW_BOX)).show();
 
         if (!this.cmpreviewall) {
@@ -823,6 +824,7 @@ define([
     }
 
     FrameEditor.prototype.openDataview = function() {
+        this.closePreview();
         this.dataviewOpened = true;
         $(this.wrapSelector('.' + VP_FE_INFO)).show();
     }
@@ -1343,8 +1345,13 @@ define([
                 // close menu
                 that.hideMenu();
             }
-            if (!$(evt.target).hasClass('.' + VP_FE_BUTTON_DATAVIEW)) {
-                // close info
+            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();
+            }
+            if (!$(evt.target).hasClass(VP_FE_BUTTON_DATAVIEW)
+                && $(that.wrapSelector('.' + VP_FE_INFO)).has(evt.target).length === 0) {
                 that.closeDataview();
             }
         });
@@ -1638,14 +1645,14 @@ define([
 
         // click others
         $(document).on('click.' + this.uuid, function(evt) {
-            if (!$(evt.target).hasClass('.' + VP_FE_BUTTON_DETAIL)) {
+            if (!$(evt.target).hasClass(VP_FE_BUTTON_DETAIL)) {
                 $(that.wrapSelector('.' + VP_FE_DETAIL_BOX)).hide();
             }
-            if (!$(evt.target).hasClass('.' + VP_FE_BUTTON_PREVIEW)
+            if (!$(evt.target).hasClass(VP_FE_BUTTON_PREVIEW)
                 && $(that.wrapSelector('.' + VP_FE_PREVIEW_BOX)).has(evt.target).length === 0) {
                 that.closePreview();
             }
-            if (!$(evt.target).hasClass('.' + VP_FE_BUTTON_DATAVIEW)
+            if (!$(evt.target).hasClass(VP_FE_BUTTON_DATAVIEW)
                 && $(that.wrapSelector('.' + VP_FE_INFO)).has(evt.target).length === 0) {
                 that.closeDataview();
             }
diff --git a/src/common/vpSubsetEditor.js b/src/common/vpSubsetEditor.js
@@ -1848,14 +1848,15 @@ define([
 
         // click others
         $(document).on('click.' + this.uuid, function(evt) {
-            if (!$(evt.target).hasClass('.' + VP_DS_BUTTON_DETAIL)) {
+            if (!$(evt.target).hasClass(VP_DS_BUTTON_DETAIL)) {
                 $(that.wrapSelector('.' + VP_DS_DETAIL_BOX)).hide();
             }
-            if (!$(evt.target).hasClass('.' + VP_DS_BUTTON_PREVIEW)
+            if (!$(evt.target).hasClass(VP_DS_BUTTON_PREVIEW)
+                && !$(evt.target).hasClass(VP_DS_PREVIEW_BOX)
                 && $(that.wrapSelector('.' + VP_DS_PREVIEW_BOX)).has(evt.target).length === 0) {
                 that.closePreview();
             }
-            if (!$(evt.target).hasClass('.' + VP_DS_BUTTON_DATAVIEW)
+            if (!$(evt.target).hasClass(VP_DS_BUTTON_DATAVIEW)
                 && $(that.wrapSelector('.' + VP_DS_DATA)).has(evt.target).length === 0) {
                 that.closeDataview();
             }
@@ -1967,6 +1968,7 @@ define([
     }
 
     SubsetEditor.prototype.openDataview = function() {
+        this.closePreview();
         this.dataviewOpened = true;
         $(this.wrapSelector('.' + VP_DS_DATA)).show();
     }
@@ -1978,6 +1980,7 @@ define([
 
     /** open preview box */
     SubsetEditor.prototype.openPreview = function() {
+        this.closeDataview();
         $(this.wrapSelector('.' + VP_DS_PREVIEW_BOX)).show();
 
         if (!this.cmpreviewall) {

Original file line number	Diff line number	Diff line change
`@@ -1848,14 +1848,15 @@ define([`
`1848`	`1848`
`1849`	`1849`	`// click others`
`1850`	`1850`	`$(document).on('click.' + this.uuid, function(evt) {`
`1851`		`- if (!$(evt.target).hasClass('.' + VP_DS_BUTTON_DETAIL)) {`
	`1851`	`+ if (!$(evt.target).hasClass(VP_DS_BUTTON_DETAIL)) {`
`1852`	`1852`	`$(that.wrapSelector('.' + VP_DS_DETAIL_BOX)).hide();`
`1853`	`1853`	`}`
`1854`		`- if (!$(evt.target).hasClass('.' + VP_DS_BUTTON_PREVIEW)`
	`1854`	`+ if (!$(evt.target).hasClass(VP_DS_BUTTON_PREVIEW)`
	`1855`	`+ && !$(evt.target).hasClass(VP_DS_PREVIEW_BOX)`
`1855`	`1856`	`&& $(that.wrapSelector('.' + VP_DS_PREVIEW_BOX)).has(evt.target).length === 0) {`
`1856`	`1857`	`that.closePreview();`
`1857`	`1858`	`}`
`1858`		`- if (!$(evt.target).hasClass('.' + VP_DS_BUTTON_DATAVIEW)`
	`1859`	`+ if (!$(evt.target).hasClass(VP_DS_BUTTON_DATAVIEW)`
`1859`	`1860`	`&& $(that.wrapSelector('.' + VP_DS_DATA)).has(evt.target).length === 0) {`
`1860`	`1861`	`that.closeDataview();`
`1861`	`1862`	`}`
`@@ -1967,6 +1968,7 @@ define([`
`1967`	`1968`	`}`
`1968`	`1969`
`1969`	`1970`	`SubsetEditor.prototype.openDataview = function() {`
	`1971`	`+ this.closePreview();`
`1970`	`1972`	`this.dataviewOpened = true;`
`1971`	`1973`	`$(this.wrapSelector('.' + VP_DS_DATA)).show();`
`1972`	`1974`	`}`
`@@ -1978,6 +1980,7 @@ define([`
`1978`	`1980`
`1979`	`1981`	`/** open preview box */`
`1980`	`1982`	`SubsetEditor.prototype.openPreview = function() {`
	`1983`	`+ this.closeDataview();`
`1981`	`1984`	`$(this.wrapSelector('.' + VP_DS_PREVIEW_BOX)).show();`
`1982`	`1985`
`1983`	`1986`	`if (!this.cmpreviewall) {`