Fix bug with classic site

OlivierCC · Apr 16, 2017 · abafcf7 · abafcf7
1 parent bff3117
commit abafcf7
Show file tree

Hide file tree

Showing 18 changed files with 71 additions and 14 deletions.
diff --git a/src/webparts/accordion/AccordionWebPart.ts b/src/webparts/accordion/AccordionWebPart.ts
@@ -15,6 +15,7 @@ import {
 } from '@microsoft/sp-webpart-base';
 import { DisplayMode, Version } from '@microsoft/sp-core-library';
 import { SPComponentLoader } from '@microsoft/sp-loader';
+import { Environment, EnvironmentType } from '@microsoft/sp-core-library';
 
 import * as strings from 'AccordionStrings';
 import { IAccordionWebPartProps } from './IAccordionWebPartProps';
@@ -49,8 +50,10 @@ export default class AccordionWebPart extends BaseClientSideWebPart<IAccordionWe
     //we need to bind this object on it first
     this.onPropertyPaneFieldChanged = this.onPropertyPaneFieldChanged.bind(this);
 
-    //Load the JQuery smoothness CSS file
-    SPComponentLoader.loadCss('//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css');
+    if (Environment.type !== EnvironmentType.ClassicSharePoint) {
+      //Load the JQuery smoothness CSS file
+      SPComponentLoader.loadCss('//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css');
+    }
   }
 
   /**
@@ -67,6 +70,18 @@ export default class AccordionWebPart extends BaseClientSideWebPart<IAccordionWe
    */
   public render(): void {
 
+    if (Environment.type === EnvironmentType.ClassicSharePoint) {
+      var errorHtml = '';
+      errorHtml += '<div style="color: red;">';
+      errorHtml += '<div style="display:inline-block; vertical-align: middle;"><i class="ms-Icon ms-Icon--Error" style="font-size: 20px"></i></div>';
+      errorHtml += '<div style="display:inline-block; vertical-align: middle;margin-left:7px;"><span>';
+      errorHtml += strings.ErrorClassicSharePoint;
+      errorHtml += '</span></div>';
+      errorHtml += '</div>';
+      this.domElement.innerHTML = errorHtml;
+      return;
+    }
+
     var html = '';
 
     //Define the main div

diff --git a/src/webparts/accordion/loc/de-de.js b/src/webparts/accordion/loc/de-de.js
@@ -13,6 +13,7 @@ define([], function() {
     "Collapsible": "Zusammenklappbar",
     "Animate": "Animieren",
     "Speed": "Geschwindigkeit (Millisekunden)",
-    "HeightStyle": "Höhe Stil"
+    "HeightStyle": "Höhe Stil",
+    "ErrorClassicSharePoint": "Sorry, aber das Web funktioniert nicht in einer Sharepoint -Website klassischen, aber nur in einem modernen Ort."
   }
 });
diff --git a/src/webparts/accordion/loc/en-us.js b/src/webparts/accordion/loc/en-us.js
@@ -13,6 +13,7 @@ define([], function() {
     "Collapsible": "Collapsible",
     "Animate": "Animate",
     "Speed": "Speed (ms)",
-    "HeightStyle": "Height Style"
+    "HeightStyle": "Height Style",
+    "ErrorClassicSharePoint": "Sorry, but this Web Part does not work in a classic SharePoint site, but only in a modern site."
   }
 });
diff --git a/src/webparts/accordion/loc/es-es.js b/src/webparts/accordion/loc/es-es.js
@@ -13,6 +13,7 @@ define([], function() {
     "Collapsible": "Plegable",
     "Animate": "Animar",
     "Speed": "Velocidad (milisegundo)",
-    "HeightStyle": "Estilo de altura"
+    "HeightStyle": "Estilo de altura",
+    "ErrorClassicSharePoint": "Lo sentimos pero la web no funciona en un sitio de SharePoint clásico, pero sólo en un sitio moderno."
   }
 });
diff --git a/src/webparts/accordion/loc/fr-fr.js b/src/webparts/accordion/loc/fr-fr.js
@@ -13,6 +13,7 @@ define([], function() {
     "Collapsible": "Rétractable",
     "Animate": "Animation",
     "Speed": "Vitesse (ms)",
-    "HeightStyle": "Hauteur"
+    "HeightStyle": "Hauteur",
+    "ErrorClassicSharePoint": "Désolé mais cette WebPart ne fonctionne pas dans un site SharePoint classique, mais uniquement dans un site moderne."
   }
 });
diff --git a/src/webparts/accordion/loc/mystrings.d.ts b/src/webparts/accordion/loc/mystrings.d.ts
@@ -13,6 +13,7 @@ declare interface IAccordionStrings {
   Animate: string;
   Speed: string;
   HeightStyle: string;
+  ErrorClassicSharePoint: string;
 }
 
 declare module 'AccordionStrings' {

diff --git a/src/webparts/fckText/FckTextWebPart.ts b/src/webparts/fckText/FckTextWebPart.ts
@@ -12,6 +12,7 @@ import {
   PropertyPaneToggle
 } from '@microsoft/sp-webpart-base';
 import { DisplayMode, Version } from '@microsoft/sp-core-library';
+import { Environment, EnvironmentType } from '@microsoft/sp-core-library';
 
 import * as strings from 'fckTextStrings';
 import { IFckTextWebPartProps } from './IFckTextWebPartProps';
@@ -49,6 +50,19 @@ export default class FckTextWebPart extends BaseClientSideWebPart<IFckTextWebPar
    */
   public render(): void {
 
+    if (Environment.type === EnvironmentType.ClassicSharePoint) {
+      var errorHtml = '';
+      errorHtml += '<div style="color: red;">';
+      errorHtml += '<div style="display:inline-block; vertical-align: middle;"><i class="ms-Icon ms-Icon--Error" style="font-size: 20px"></i></div>';
+      errorHtml += '<div style="display:inline-block; vertical-align: middle;margin-left:7px;"><span>';
+      errorHtml += strings.ErrorClassicSharePoint;
+      errorHtml += '</span></div>';
+      errorHtml += '</div>';
+      this.domElement.innerHTML = errorHtml;
+      return;
+    }
+
+
     if (this.displayMode == DisplayMode.Edit) {
       //Edit mode
       var html = '';

diff --git a/src/webparts/fckText/loc/de-de.js b/src/webparts/fckText/loc/de-de.js
@@ -3,6 +3,7 @@ define([], function() {
     "PropertyPaneDescription": "Passen Sie Ihre webpart",
     "BasicGroupName": "Text-Editor-Einstellungen",
     "DescriptionFieldLabel": "Beschreibung",
-    "Inline": "Inline"
+    "Inline": "Inline",
+    "ErrorClassicSharePoint": "Sorry, aber das Web funktioniert nicht in einer Sharepoint -Website klassischen, aber nur in einem modernen Ort."
   }
 });
diff --git a/src/webparts/fckText/loc/en-us.js b/src/webparts/fckText/loc/en-us.js
@@ -3,6 +3,7 @@ define([], function() {
     "PropertyPaneDescription": "Customize your Text Editor",
     "BasicGroupName": "Text Editor Settings",
     "DescriptionFieldLabel": "Description Field",
-    "Inline": "Inline"
+    "Inline": "Inline",
+    "ErrorClassicSharePoint": "Sorry, but this Web Part does not work in a classic SharePoint site, but only in a modern site."
   }
 });
diff --git a/src/webparts/fckText/loc/es-es.js b/src/webparts/fckText/loc/es-es.js
@@ -3,6 +3,7 @@ define([], function() {
     "PropertyPaneDescription": "Personaliza tu WebPart",
     "BasicGroupName": "Configuración del Editor de texto",
     "DescriptionFieldLabel": "Descripción",
-    "Inline": "En línea"
+    "Inline": "En línea",
+    "ErrorClassicSharePoint": "Lo sentimos pero la web no funciona en un sitio de SharePoint clásico, pero sólo en un sitio moderno."
   }
 });
diff --git a/src/webparts/fckText/loc/fr-fr.js b/src/webparts/fckText/loc/fr-fr.js
@@ -3,6 +3,7 @@ define([], function() {
     "PropertyPaneDescription": "Personnalisez votre web part",
     "BasicGroupName": "Paramètres de l'éditeur",
     "DescriptionFieldLabel": "Description",
-    "Inline": "Inline"
+    "Inline": "Inline",
+    "ErrorClassicSharePoint": "Désolé mais cette WebPart ne fonctionne pas dans un site SharePoint classique, mais uniquement dans un site moderne."
   }
 });
diff --git a/src/webparts/fckText/loc/mystrings.d.ts b/src/webparts/fckText/loc/mystrings.d.ts
@@ -2,6 +2,7 @@ declare interface IFckTextStrings {
   PropertyPaneDescription: string;
   BasicGroupName: string;
   Inline: string;
+  ErrorClassicSharePoint: string;
 }
 
 declare module 'fckTextStrings' {

diff --git a/src/webparts/tabs/TabsWebPart.ts b/src/webparts/tabs/TabsWebPart.ts
@@ -13,6 +13,7 @@ import {
 } from '@microsoft/sp-webpart-base';
 import { DisplayMode, Version } from '@microsoft/sp-core-library';
 import { SPComponentLoader } from '@microsoft/sp-loader';
+import { Environment, EnvironmentType } from '@microsoft/sp-core-library';
 
 import * as strings from 'TabsStrings';
 import { ITabsWebPartProps } from './ITabsWebPartProps';
@@ -55,6 +56,18 @@ export default class TabsWebPart extends BaseClientSideWebPart<ITabsWebPartProps
    */
   public render(): void {
 
+    if (Environment.type === EnvironmentType.ClassicSharePoint) {
+      var errorHtml = '';
+      errorHtml += '<div style="color: red;">';
+      errorHtml += '<div style="display:inline-block; vertical-align: middle;"><i class="ms-Icon ms-Icon--Error" style="font-size: 20px"></i></div>';
+      errorHtml += '<div style="display:inline-block; vertical-align: middle;margin-left:7px;"><span>';
+      errorHtml += strings.ErrorClassicSharePoint;
+      errorHtml += '</span></div>';
+      errorHtml += '</div>';
+      this.domElement.innerHTML = errorHtml;
+      return;
+    }
+
     var html = '';
     html += `
 <style>

diff --git a/src/webparts/tabs/loc/de-de.js b/src/webparts/tabs/loc/de-de.js
@@ -9,6 +9,7 @@ define([], function() {
     "ManageTabs": "Verwalten von Tabs",
     "Tabs": "Tabs",
     "DisableColor": "Inaktive Tab-Farbe",
-    "SelectedColor": "Ausgewählte Tabrandfarbe"
+    "SelectedColor": "Ausgewählte Tabrandfarbe",
+    "ErrorClassicSharePoint": "Sorry, aber das Web funktioniert nicht in einer Sharepoint -Website klassischen, aber nur in einem modernen Ort."
   }
 });
diff --git a/src/webparts/tabs/loc/en-us.js b/src/webparts/tabs/loc/en-us.js
@@ -9,6 +9,7 @@ define([], function() {
     "ManageTabs": "Manage Tabs",
     "Tabs": "Tabs",
     "DisableColor": "Inactive Tab Color",
-    "SelectedColor": "Selected Tab Border Color"
+    "SelectedColor": "Selected Tab Border Color",
+    "ErrorClassicSharePoint": "Sorry, but this Web Part does not work in a classic SharePoint site, but only in a modern site."
   }
 });
diff --git a/src/webparts/tabs/loc/es-es.js b/src/webparts/tabs/loc/es-es.js
@@ -9,6 +9,7 @@ define([], function() {
     "ManageTabs": "Administrar pestañas",
     "Tabs": "Pestañas",
     "DisableColor": "Color de la pestaña inactiva",
-    "SelectedColor": "Color del borde de la ficha seleccionada"
+    "SelectedColor": "Color del borde de la ficha seleccionada",
+    "ErrorClassicSharePoint": "Lo sentimos pero la web no funciona en un sitio de SharePoint clásico, pero sólo en un sitio moderno."
   }
 });
diff --git a/src/webparts/tabs/loc/fr-fr.js b/src/webparts/tabs/loc/fr-fr.js
@@ -9,6 +9,7 @@ define([], function() {
     "ManageTabs": "Gérer les onglets",
     "Tabs": "Onglets",
     "DisableColor": "Couleur des onglets inactifs",
-    "SelectedColor": "Couleur de l'onglet sélectionné"
+    "SelectedColor": "Couleur de l'onglet sélectionné",
+    "ErrorClassicSharePoint": "Désolé mais cette WebPart ne fonctionne pas dans un site SharePoint classique, mais uniquement dans un site moderne."
   }
 });
diff --git a/src/webparts/tabs/loc/mystrings.d.ts b/src/webparts/tabs/loc/mystrings.d.ts
@@ -9,6 +9,7 @@ declare interface ITabsStrings {
   Tabs: string;
   DisableColor: string;
   SelectedColor: string;
+  ErrorClassicSharePoint: string;
 }
 
 declare module 'TabsStrings' {