Merge branch 'master' into release

electric-eloquence · May 26, 2022 · e600840 · e600840
2 parents b70752f + 27c0653
commit e600840
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/scripts/classes/code-viewer.js b/scripts/classes/code-viewer.js
@@ -621,19 +621,18 @@ export default class CodeViewer {
             if (this.$orgs['#sg-code-panel-feplet'].length) {
               this.$orgs['#sg-code-panel-feplet'][0]
                 .contentWindow.location.replace(`/mustache-browser?partial=${this.patternPartial}`);
-              this.$orgs['#sg-code-panel-feplet'][0]
-                .addEventListener('load', () => {
-                  const height =
-                    this.$orgs['#sg-code-panel-feplet'][0].contentWindow.document.documentElement.offsetHeight;
-
-                  /* istanbul ignore if */
-                  if (height > 150) {
-                    this.$orgs['#sg-code-panel-feplet'].dispatchAction('css', {height: `${height}px`, visibility: ''});
-                  }
-                  else {
-                    this.$orgs['#sg-code-panel-feplet'].dispatchAction('css', {height: '', visibility: ''});
-                  }
-                });
+              this.$orgs['#sg-code-panel-feplet'].on('load', () => {
+                const height =
+                  this.$orgs['#sg-code-panel-feplet'][0].contentWindow.document.documentElement.offsetHeight;
+
+                /* istanbul ignore if */
+                if (height > 150) {
+                  this.$orgs['#sg-code-panel-feplet'].dispatchAction('css', {height: `${height}px`, visibility: ''});
+                }
+                else {
+                  this.$orgs['#sg-code-panel-feplet'].dispatchAction('css', {height: '', visibility: ''});
+                }
+              });
             }
             // DEPRECATED: Here for backward-compatibility. Will be removed.
             else {

diff --git a/scripts/listeners/index.js b/scripts/listeners/index.js
@@ -63,7 +63,9 @@ export default class Listeners {
           this.#fepperUi.dataSaver.findValue('lastViewer') === 'annotations'
         ) {
           // Open annotations viewer if last opened viewer was annotations.
-          this.#fepperUi.annotationsViewer.openAnnotations();
+          this.$orgs['#sg-viewport'].on('load', () => {
+            this.#fepperUi.annotationsViewer.openAnnotations();
+          });
         }
         else {
           // Open code viewer by default.