diff --git a/web/source/kmwnative.ts b/web/source/kmwnative.ts
index a9e4bb2ce1..c6784983d9 100644
--- a/web/source/kmwnative.ts
+++ b/web/source/kmwnative.ts
@@ -465,30 +465,38 @@ if(!window['keyman']['initialized']) {
         );
       }                                            
     }
+
+    // Placing the rotation handler in two separate functions allows us to stub the functions for
+    // debugging/event-logging.
+    keymanweb.innerRotationHandler = function() {
+      keymanweb.alignInputs(true);
+      osk.hideLanguageList();
+      osk._Load();
+      if(osk.wasVisible) {
+        osk._Show();
+      }
+
+      // clear timeout variable, if it exists.
+    }
+
+    // A general handler for rotation events on touch-enabled devices.
+    keymanweb.rotationHandler = function() {
+      osk.wasVisible = osk.isVisible();
+      osk.hideNow();
+
+      // At least on simulators, it seems we can reach a minor race condition on screen-size updates without a timeout.
+      //window.setTimeout(function() {
+        keymanweb.innerRotationHandler();
+      //}, 500);
+    }
                     
     /**
      * Use rotation events to adjust OSK and input element positions and scaling as necessary
      */     
     keymanweb.handleRotationEvents=function() {
-      // General handler for rotation events.
-      var rotationHandler: () => void = function() {
-        osk.wasVisible = osk.isVisible();
-        osk.hideNow();
-
-        // At least on simulators, it seems we can reach a minor race condition on screen-size updates without a timeout.
-        //window.setTimeout(function() {
-          keymanweb.alignInputs(true);
-          osk.hideLanguageList();
-          osk._Load();
-          if(osk.wasVisible) {
-            osk._Show();
-          }
-        //}, 500);
-      };
-
-      if(device.OS == 'iOS') {
-        util.attachDOMEvent(window, 'orientationchange', rotationHandler);
-        util.attachDOMEvent(window, 'resize', rotationHandler);
+            if(device.OS == 'iOS') {
+        util.attachDOMEvent(window, 'orientationchange', keymanweb.rotationHandler);
+        util.attachDOMEvent(window, 'resize', keymanweb.rotationHandler);
       }
       
       // Also manage viewport rescaling after rotation on Android
@@ -500,7 +508,7 @@ if(!window['keyman']['initialized']) {
           util.attachDOMEvent(screen,'mozorientationchange',osk.hideNow);
 
         // Then align inputs and redisplay the OSK on resize event following rotation
-        util.attachDOMEvent(window, 'resize', rotationHandler);
+        util.attachDOMEvent(window, 'resize', keymanweb.rotationHandler);
       } 
 
       //TODO: may be able to recognize start of rotation using accelerometer call...
diff --git a/web/test.html b/web/test.html
deleted file mode 100644
index e8e6542c57..0000000000
--- a/web/test.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" name="viewport">
-</head>
-<body>
-
-<textarea cols=40 rows=20 id='e' style='overflow: scroll'></textarea>
-
-<script>
-  var e = document.getElementById('e');
-  var lastW, lastH, lastO;
-  var noRecentChange = 100;
-  
-  function doLog(event, onlyIfChanged) {
-    if(onlyIfChanged) {
-      if(lastW == window.innerWidth && lastH == window.innerHeight && lastO == window.orientation) {
-        if(noRecentChange == 100) {
-          e.value = e.value + event + ": no-change" + '\n\n';
-        }
-        noRecentChange++;
-        return;
-      }
-      lastW = window.innerWidth;
-      lastH = window.innerHeight;
-      lastO = window.orientation;
-    }
-    e.value = e.value + event + ': w.iw='+window.innerWidth+' w.ih='+window.innerHeight+' w.o='+window.orientation+'\n';
-    e.scrollTop = e.scrollHeight;
-    noRecentChange = 0;
-  }
-  
-  window.setInterval(function() {
-    doLog('tick', true);
-  }, 1);
-  
-  window.addEventListener('resize', function() { doLog('resize-b', false) }, false);
-  window.addEventListener('resize', function() { doLog('resize-c', false) }, true);
-  window.addEventListener('orientationchange', function() { doLog('orientationchange-b', false) }, false);
-  window.addEventListener('orientationchange', function() { doLog('orientationchange-c', false) }, true);
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/web/testing/index.html b/web/testing/index.html
index 0f3941b1e9..817c53feb9 100644
--- a/web/testing/index.html
+++ b/web/testing/index.html
@@ -38,6 +38,7 @@
   <h2><a href="./issue160/">Uxxxx code testing</a></h2>
   <h2><a href="./issue271">Test page for interactions between setActiveKeyboard and the toolbar UI.</a></h2>
   <h2><a href="./basic-iframe">Test page for IFrame connectivity and class prototype management.</a></h2>
+  <h2><a href="./rotation-events">Test page for evaluating issues with mobile device rotation events.</a></h2>
   <p><a href="../">Return to main index.</a>
   </body>
 </html>
diff --git a/web/testing/rotation-events/index.html b/web/testing/rotation-events/index.html
new file mode 100644
index 0000000000..484f371566
--- /dev/null
+++ b/web/testing/rotation-events/index.html
@@ -0,0 +1,101 @@
+<!doctype html>
+<html>
+<head>
+  <meta content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" name="viewport">
+  
+  <title>KeymanWeb Sample Page - Unminified Source</title>
+
+  <!-- Your page CSS --> 
+  <style type='text/css'>   
+    body {font-family: Tahoma,helvetica;}
+    h3 {font-size: 1em;font-weight:normal;color: darkred; margin-bottom: 4px}
+    .test {font-size: 1.5em; width:80%; min-height:30px; border: 1px solid gray;}
+    #KeymanWebControl {width:50%;min-width:600px;}       
+  </style> 
+
+  <!-- Insert uncompiled KeymanWeb source scripts -->              
+  <script src="../../release/unminified/web/keymanweb.js" type="application/javascript"></script>
+
+  <!-- 
+    For desktop browsers, a script for the user interface must be inserted here.
+     
+    Standard UIs are toggle, button, float and toolbar.  
+    The toolbar UI is best for any page designed to support keyboards for 
+    a large number of languages.
+  -->
+  <script src="../../release/unminified/web/kmwuitoggle.js"></script>
+
+  <!-- Initialization: set paths to keyboards, resources and fonts as required -->
+  <script>
+    var kmw=window.keyman;
+    kmw.init({
+  attachType:'auto'
+      });
+  </script> 
+  
+  <!-- Add keyboard management script for local selection of keyboards to use -->
+  <script src="../commonHeader.js"></script>
+</head>
+<body onload='loadKeyboards(1);'>
+
+<textarea cols=50 rows=20 id='e' style='overflow: scroll' class='kmw-disabled'></textarea>
+<br><br>
+<input></input>
+
+<script>
+  var e = document.getElementById('e');
+  var lastW, lastH, lastO;
+  //var lastOSKW, lastOSKH, lastVS;
+  var noRecentChange = 100;
+  
+  function doLog(event, onlyIfChanged) {
+    var orient = window.orientation;
+    var orientText = ' w.o=';
+    
+    if(orient === undefined) {
+      orient = window.screen.orientation.angle;
+      orientText = ' w.soa=';
+    }
+    
+    if(onlyIfChanged) {
+      if(lastW == window.innerWidth && lastH == window.innerHeight && lastO == orient) {
+        if(noRecentChange == 100) {
+          e.value = e.value + event + ": no-change" + '\n\n';
+        }
+        noRecentChange++;
+        return;
+      }
+      lastW = window.innerWidth;
+      lastH = window.innerHeight;
+      lastO = orient;
+    }
+    
+    e.value = e.value + event + ': w.iw='+window.innerWidth+' w.ih='+window.innerHeight+orientText+orient+'\n';
+    
+    if(event == 'kmw.rh') {
+      e.value = e.value + '  osk.w=' + keyman.osk.getWidth() + ' osk.h=' + keyman.osk.getHeight() + ' kmw.vs=' + keyman.util.getViewportScale() + '\n';
+    }
+    
+    e.scrollTop = e.scrollHeight;
+    noRecentChange = 0;
+  }
+  
+  window.setInterval(function() {
+    doLog('tick', true);
+  }, 1);
+  
+  window.addEventListener('resize', function() { doLog('resize-b', false) }, false);
+  window.addEventListener('resize', function() { doLog('resize-c', false) }, true);
+  window.addEventListener('orientationchange', function() { doLog('orientationchange-b', false) }, false);
+  window.addEventListener('orientationchange', function() { doLog('orientationchange-c', false) }, true);
+  
+  var kmw_rh = keyman.rotationHandler;
+  
+  keyman.rotationHandler = function() {
+    doLog('kmw.rh');
+    kmw_rh();
+  }
+</script>
+  <p><a href="../">Return to main index.</a>
+</body>
+</html>
\ No newline at end of file
