From 574ac978151663b48f53228ff696feeb30fd52bb Mon Sep 17 00:00:00 2001
From: Joshua Horton <joshua_horton@sil.org>
Date: Mon, 26 Jun 2017 10:13:02 +0700
Subject: [PATCH] Added a kmwembedded flag to make the error output's condition
 more explicit, refactored in-PR code to match.

---
 web/source/keymanweb.js   | 18 +++++++++++-------
 web/source/kmwembedded.js |  5 ++++-
 web/source/kmwnative.js   |  3 +++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/web/source/keymanweb.js b/web/source/keymanweb.js
index 77153577bf..e1ebbd425c 100644
--- a/web/source/keymanweb.js
+++ b/web/source/keymanweb.js
@@ -3087,20 +3087,24 @@
     var kbdLang = kbdStub['KL'];
     var kbdName = kbdStub['KN'];
 
-    if(typeof(kbdStub.asyncLoader.callback) == "function") {
-      // Add a handler for cases where the new <script> block fails to load.
-      Lscript.addEventListener('error', function() {
+
+    // Add a handler for cases where the new <script> block fails to load.
+    Lscript.addEventListener('error', function() {
+      if(kbdStub.asyncLoader.timer !== null) {
         // Clear the timeout timer.
         window.clearTimeout(kbdStub.asyncLoader.timer);
         kbdStub.asyncLoader.timer = null;
+      }
 
+      // Do not output error messages when embedded.  (KMEA/KMEI)
+      if(!keymanweb.embedded) {
         // We already know the load has failed... why wait?
         kbdStub.asyncLoader.callback('Cannot find the ' + kbdName + ' keyboard for ' + kbdLang + '.');
         console.log('Error:  cannot find the', kbdName, 'keyboard for', kbdLang, 'at', kbdFile + '.');
+      }
+      kbdStub.asyncLoader = null;
+    }, true);
 
-        kbdStub.asyncLoader = null;
-      }, true);
-    }
     
     // The load event will activate a newly-loaded keyboard if successful and report an error if it is not.
     Lscript.addEventListener('load', function() {
@@ -3137,7 +3141,7 @@
             util.wait(false);
           }
         } // A handler portion for cases where the new <script> block loads, but fails to process.
-      } else if(typeof(kbdStub.asyncLoader.callback) == "function") {
+      } else if(!keymanweb.embedded) {  // Do not output error messages when embedded.  (KMEA/KMEI)
           kbdStub.asyncLoader.callback('Error registering the ' + kbdName + ' keyboard for ' + kbdLang + '.');
           console.log('Error registering the', kbdName, 'keyboard for', kbdLang + '.');
       }
diff --git a/web/source/kmwembedded.js b/web/source/kmwembedded.js
index cf7383ce4e..a9f2438178 100644
--- a/web/source/kmwembedded.js
+++ b/web/source/kmwembedded.js
@@ -19,7 +19,10 @@
   keymanweb.mustReloadKeyboard = true;
   
   // Skip full page initialization (code not needed for embedded applications)
-  keymanweb.fullInitialization = false;  
+  keymanweb.fullInitialization = false;
+
+  // Explicitly marks that KeymanWeb is in embedded mode.
+  keymanweb.embedded = true;  
 
   osk.popupDelay = 400;  // Delay must be less than native touch-hold delay 
   
diff --git a/web/source/kmwnative.js b/web/source/kmwnative.js
index eaf054ced8..5c97736876 100644
--- a/web/source/kmwnative.js
+++ b/web/source/kmwnative.js
@@ -17,6 +17,9 @@
   // Force full initialization
   keymanweb.fullInitialization = true;  
 
+  // Explicitly marks that KeymanWeb is in native mode.
+  keymanweb.embedded = false;  
+
   /**
    * Set default device options
    * @param {Object}  opt device options object