Răsfoiți Sursa

build: Code format

jamesread 1 an în urmă
părinte
comite
27c287c2de
2 a modificat fișierele cu 17 adăugiri și 19 ștergeri
  1. 11 12
      webui.dev/js/ExecutionDialog.js
  2. 6 7
      webui.dev/js/marshaller.js

+ 11 - 12
webui.dev/js/ExecutionDialog.js

@@ -198,17 +198,17 @@ export class ExecutionDialog {
 
     clearInterval(window.executionDialogTicker)
 
-	if ("type" in res && res.type == "execution-dialog-output-html") {
-		this.domOutputHtml.hidden = false
-		this.domOutput.hidden = true
-		this.domOutputHtml.innerHTML = res.logEntry.output
-		this.domOutputHtml.hidden = false
-		this.hideDetailsonResult = true
-	} else {
-	    this.domOutput.hidden = false
-		this.domOutputHtml.innerHTML = ''
-		this.domOutputHtml.hidden = true
-	}
+    if ('type' in res && res.type === 'execution-dialog-output-html') {
+      this.domOutputHtml.hidden = false
+      this.domOutput.hidden = true
+      this.domOutputHtml.innerHTML = res.logEntry.output
+      this.domOutputHtml.hidden = false
+      this.hideDetailsonResult = true
+    } else {
+      this.domOutput.hidden = false
+      this.domOutputHtml.innerHTML = ''
+      this.domOutputHtml.hidden = true
+    }
 
     if (this.hideDetailsOnResult) {
       this.domExecutionDetails.hidden = true
@@ -229,7 +229,6 @@ export class ExecutionDialog {
 
     this.updateDuration(res.logEntry)
 
-
     window.terminal.reset()
     window.terminal.write(res.logEntry.output, () => {
       window.terminal.fit()

+ 6 - 7
webui.dev/js/marshaller.js

@@ -187,15 +187,14 @@ function onExecutionFinished (evt) {
     return
   }
 
-  let feedbackButton = actionButton;
+  const executionButton = document.querySelector('execution-button#execution-' + logEntry.executionTrackingId)
+  let feedbackButton = actionButton
 
   switch (actionButton.popupOnStart) {
     case 'execution-button':
-	  let executionButton = document.querySelector('execution-button#execution-' + logEntry.executionTrackingId)
-
-	  if (executionButton != null) {
-	    feedbackButton = executionButton
-	  }
+      if (executionButton != null) {
+        feedbackButton = executionButton
+      }
 
       break
     case 'execution-dialog-output-html':
@@ -220,7 +219,7 @@ function onExecutionFinished (evt) {
   if (window.executionDialog.dlg.open && window.executionDialog.executionUuid === logEntry.uuid) {
     window.executionDialog.renderExecutionResult({
       logEntry: logEntry,
-	  type: actionButton.popupOnStart,
+      type: actionButton.popupOnStart
     })
   }
 }