merge master config fixes to development

.gitignore

@@ -1,2 +1,3 @@
 out/
 node_modules/
+.idea/

README.md

@@ -314,7 +314,7 @@ page](#stand-alone-page) section.
       // as a JSON file or events. The configUrl variable in the
       // loaderOptions above can be used to put these config values in a file
       // instead of explicitly passing it as an argument.
-      var chatbotUiconfig = {
+      var chatbotUiConfig = {
         ui: {
           // origin of the parent site where you are including the chatbot UI
           // set to window.location.origin since hosting on same site
@@ -337,7 +337,7 @@ page](#stand-alone-page) section.
 
       // Call the load function which returns a promise that is resolved
       // once the component is loaded or is rejected if there is an error
-      iframeLoader.load(chabotUiConfig)
+      iframeLoader.load(chatbotUiConfig)
         .then(function () {
           console.log('iframe loaded');
         })

src/lex-web-ui-loader/css/lex-web-ui-iframe.css

@@ -44,7 +44,7 @@ and (max-width: 480px) {
     margin-right: 2vw;
     align-self: center;
   }
-  .lex-web-ui-ifame--minimize {
+  .lex-web-ui-iframe--minimize {
     min-width: 60vw;
     height: 48px;
   }

src/lex-web-ui-loader/js/defaults/lex-web-ui.js

@@ -27,7 +27,6 @@ export const configBase = {
   iframe: {
     iframeOrigin: '',
     iframeSrcPath: '',
-    shouldLoadIframeMinimized: true,
   },
 };
 

src/lex-web-ui-loader/js/index.js

@@ -157,13 +157,16 @@ export class IframeLoader extends Loader {
   }
 
   load(configParam = {}) {
-    this.config.iframe = this.config.iframe || {};
-    this.config.iframe.iframeSrcPath = this.mergeSrcPath(configParam);
-
     return super.load(configParam)
       .then(() => {
         // assign API to this object to make calls more succint
         this.api = this.compLoader.api;
+        // make sure iframe and iframeSrcPath are set to values if not
+        // configured by standard mechanisms. At this point, default
+        // values from ./defaults/loader.js will be used.
+        this.config.iframe = this.config.iframe || {};
+        this.config.iframe.iframeSrcPath = this.config.iframe.iframeSrcPath ||
+          this.mergeSrcPath(configParam);
       });
   }
 

src/lex-web-ui-loader/js/lib/iframe-component-loader.js

@@ -61,6 +61,9 @@ export class IframeComponentLoader {
       this.config.iframe.iframeOrigin =
         this.config.parentOrigin || window.location.origin;
     }
+    if (iframeConfig.shouldLoadIframeMinimized === undefined) {
+      this.config.iframe.shouldLoadIframeMinimized = true;
+    }
     // assign parentOrigin if not found in config
     if (!(this.config.parentOrigin)) {
       this.config.parentOrigin =
@@ -102,6 +105,11 @@ export class IframeComponentLoader {
       console.error('missing parentOrigin config field');
       return false;
     }
+    if (!('shouldLoadIframeMinimized' in iframeConfig)) {
+      console.error('missing shouldLoadIframeMinimized config field');
+      return false;
+    }
+
     return true;
   }