Merge remote-tracking branch 'upstream/master' into exit_on_back2

Conflicts: src/components/apphost.js
2020-01-27 17:47:19 +03:00
parent 23c6b5daaf 08b4d9aa73
commit ddf7eae55b
136 changed files with 4985 additions and 2523 deletions
@@ -22,9 +22,7 @@ define(['playbackManager', 'focusManager', 'appRouter', 'dom', 'apphost'], funct

    var eventListenerCount = 0;
    function on(scope, fn) {
-        if (eventListenerCount) {
-            eventListenerCount++;
-        }
+        eventListenerCount++;
        dom.addEventListener(scope, 'command', fn, {});
    }