Moved 'isServer()' checks to static editor class functions (proper ha…

…ndling of window check). Renamed additional "experience editor" > "Sitecore editor".
Sitecore · Jun 3, 2021 · 63a0249 · 63a0249
1 parent 2f5c84b
commit 63a0249
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/packages/sitecore-jss/src/utils/editing.ts b/packages/sitecore-jss/src/utils/editing.ts
@@ -5,13 +5,19 @@ import isServer from './is-server';
  */
 export class ExperienceEditor {
   static isActive(): boolean {
+    if (isServer()) {
+      return false;
+    }
     // eslint-disable-next-line
-    const sc = window && (window as any).Sitecore;
+    const sc = (window as any).Sitecore;
     return Boolean(sc && sc.PageModes && sc.PageModes.ChromeManager);
   }
   static resetChromes(): void {
+    if (isServer()) {
+      return;
+    }
     // eslint-disable-next-line
-    window && (window as any).Sitecore.PageModes.ChromeManager.resetChromes();
+    (window as any).Sitecore.PageModes.ChromeManager.resetChromes();
   }
 }
 
@@ -20,12 +26,18 @@ export class ExperienceEditor {
  */
 export class HorizonEditor {
   static isActive(): boolean {
+    if (isServer()) {
+      return false;
+    }
     // Horizon will add "sc_horizon=editor" query string parameter for the editor and "sc_horizon=simulator" for the preview
-    return window && window.location.search.indexOf('sc_horizon=editor') > -1;
+    return window.location.search.indexOf('sc_horizon=editor') > -1;
   }
   static resetChromes(): void {
+    if (isServer()) {
+      return;
+    }
     // No way to reset chromes in Horizon, simply reload the canvas (iframe) instead
-    window && window.location.reload();
+    window.location.reload();
   }
 }
 
@@ -34,19 +46,13 @@ export class HorizonEditor {
  * @returns true if executing within a Sitecore editor
  */
 export const isEditorActive = (): boolean => {
-  if (isServer()) {
-    return false;
-  }
   return ExperienceEditor.isActive() || HorizonEditor.isActive();
 };
 
 /**
  * Resets Sitecore editor "chromes"
  */
 export const resetEditorChromes = (): void => {
-  if (isServer()) {
-    return;
-  }
   if (ExperienceEditor.isActive()) {
     ExperienceEditor.resetChromes();
   } else if (HorizonEditor.isActive()) {

diff --git a/samples/angular/src/app/routing/jss-route-resolver.service.ts b/samples/angular/src/app/routing/jss-route-resolver.service.ts
@@ -12,7 +12,7 @@ export class JssRouteResolver implements Resolve<JssState> {
   ) { }
 
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<JssState> {
-    // in experience editor, we need to reload to avoid confusing the editor ribbon
+    // in Sitecore editor, we need to reload to avoid confusing the editor
     if (isEditorActive() && window) {
       const currentLocation = window.location.pathname + window.location.search + window.location.hash;
       if (currentLocation !== state.url) {

diff --git a/samples/react/src/RouteHandler.js b/samples/react/src/RouteHandler.js
@@ -127,7 +127,7 @@ class RouteHandler extends React.Component {
       return;
     }
 
-    // if in experience editor - force reload instead of route data update
+    // if in Sitecore editor - force reload instead of route data update
     // avoids confusing Sitecore's editing JS
     if (isEditorActive()) {
       window.location.assign(newRoute);

diff --git a/samples/vue/src/RouteHandler.vue b/samples/vue/src/RouteHandler.vue
@@ -119,7 +119,7 @@ export default {
       if (newRoute.hash !== '' && newRoute.path === oldRoute.path) {
         return;
       }
-      // if in experience editor - force reload instead of route data update
+      // if in Sitecore editor - force reload instead of route data update
       // avoids confusing Sitecore's editing JS
       if (isEditorActive()) {
         window.location.assign(newRoute.path);