merge nvaccess 3873 and 4145. nvdajp issues are ti35974, ti33812, and ti33778.

diff --git a/source/api.py b/source/api.py
index 3181f3d..7b72280 100644 (file)
--- a/source/api.py
+++ b/source/api.py
@@ -93,12 +93,7 @@ Before overriding the last object, this function calls event_loseFocus on the ob
                                origAncestors=oldFocusLine[0:index+1]\r
                                #make sure to cache the last old ancestor as a parent on the first new ancestor so as not to leave a broken parent cache\r
                                if ancestors and origAncestors:\r
-                                       # ancestors[0].container=origAncestors[-1]\r
-                                       # reverting #3873 for nvdajp ti33778\r
-                                       if config.conf["keyboard"]["nvdajpEnableKeyEvents"]:\r
-                                               ancestors[0].parent=origAncestors[-1]\r
-                                       else:\r
-                                               ancestors[0].container=origAncestors[-1]\r
+                                       ancestors[0].container=origAncestors[-1]\r
                                origAncestors.extend(ancestors)\r
                                ancestors=origAncestors\r
                                focusDifferenceLevel=index+1\r