refactor: 1sec delay in mac to open live preview panel at start

Author: abose

src/extensionsIntegrated/Phoenix-live-preview/main.js

@@ -789,20 +789,14 @@ define(function (require, exports, module) {
         let fileChangeListenerStartDelay = 0;
         if(Phoenix.isNativeApp && Phoenix.platform === "mac") {
             // in mac, if we do the `open with Phoenix Code` from finder, then, the open with events come as events
-            // after app start. This causes a problem where if we opens a txt file with open with, and and html file was
+            // after app start. This causes a problem where if we open a txt file with open with, and an html file was
             // open previously, then currentFileChange listener will see the html file at first and open the live
             // preview panel, and immediately, the txt file event will be sent by os resulting in a no preview page.
             // we should not show a no preview page for opening txt / non-previewable files. So, we dont attach the
-            // change listener in macos for a few seconds, and attach the listener if the user explicitly clicks on a
-            // file.
-            fileChangeListenerStartDelay = 500;
-            ProjectManager.on(ProjectManager.EVENT_FILE_CLICKED_SIDEBAR, ()=>{
-                MainViewManager.off("currentFileChange", _currentFileChanged);
-                MainViewManager.on("currentFileChange", _currentFileChanged);
-            });
+            // change listener in macos for a second to give some time for the os event to reach.
+            fileChangeListenerStartDelay = 600;
         }
         setTimeout(()=>{
-            MainViewManager.off("currentFileChange", _currentFileChanged);
             MainViewManager.on("currentFileChange", _currentFileChanged);
             if(Phoenix.isNativeApp && Phoenix.platform === "mac" && MainViewManager.getCurrentlyViewedFile()) {
                 _currentFileChanged(null, MainViewManager.getCurrentlyViewedFile());

src/project/FileTreeView.js

@@ -37,12 +37,7 @@ define(function (require, exports, module) {
         LanguageManager   = require("language/LanguageManager"),
         FileTreeViewModel = require("project/FileTreeViewModel"),
         ViewUtils         = require("utils/ViewUtils"),
-        KeyEvent          = require("utils/KeyEvent"),
-        EventDispatcher     = require("utils/EventDispatcher");
-
-    EventDispatcher.makeEventDispatcher(exports);
-
-    const EVENT_FILE_NODE_CLICKED_IN_TREE = "fileNodeClickedInTree";
+        KeyEvent          = require("utils/KeyEvent");
 
     var DOM = Preact.DOM;
 
@@ -588,7 +583,6 @@ define(function (require, exports, module) {
             }
             this.props.actions.setSelected(this.myPath(), doNotOpen);
             this.render();
-            exports.trigger(EVENT_FILE_NODE_CLICKED_IN_TREE);
         },
 
         /**
@@ -1337,6 +1331,4 @@ define(function (require, exports, module) {
     exports.addClassesProvider = addClassesProvider;
     exports.render = render;
 
-    // private events
-    exports._EVENT_FILE_NODE_CLICKED_IN_TREE = EVENT_FILE_NODE_CLICKED_IN_TREE;
 });

src/project/ProjectManager.js

@@ -93,8 +93,7 @@ define(function (require, exports, module) {
         EVENT_PROJECT_REFRESH = "projectRefresh",
         EVENT_CONTENT_CHANGED = "contentChanged",
         EVENT_PROJECT_FILE_CHANGED = "projectFileChanged",
-        EVENT_PROJECT_FILE_RENAMED = "projectFileRenamed",
-        EVENT_FILE_CLICKED_SIDEBAR = "fileClickedSidebar";
+        EVENT_PROJECT_FILE_RENAMED = "projectFileRenamed";
 
     EventDispatcher.setLeakThresholdForEvent(EVENT_PROJECT_OPEN, 25);
 
@@ -2216,14 +2215,6 @@ define(function (require, exports, module) {
         _renderTree(true);
     }
 
-    FileTreeView.on(FileTreeView._EVENT_FILE_NODE_CLICKED_IN_TREE, ()=>{
-        exports.trigger(EVENT_FILE_CLICKED_SIDEBAR);
-    });
-
-    WorkingSetView.on(WorkingSetView._EVENT_FILE_NODE_CLICKED_WORKING_SET, ()=>{
-        exports.trigger(EVENT_FILE_CLICKED_SIDEBAR);
-    });
-
 
     // Private API helpful in testing
     exports._actionCreator                = actionCreator;
@@ -2281,5 +2272,4 @@ define(function (require, exports, module) {
     exports.EVENT_PROJECT_FILE_CHANGED = EVENT_PROJECT_FILE_CHANGED;
     exports.EVENT_PROJECT_FILE_RENAMED = EVENT_PROJECT_FILE_RENAMED;
     exports.EVENT_PROJECT_OPEN_FAILED = EVENT_PROJECT_OPEN_FAILED;
-    exports.EVENT_FILE_CLICKED_SIDEBAR = EVENT_FILE_CLICKED_SIDEBAR;
 });

src/project/WorkingSetView.js

@@ -43,12 +43,7 @@ define(function (require, exports, module) {
         paneListTemplate      = require("text!htmlContent/working-set.html"),
         Strings               = require("strings"),
         _                     = require("thirdparty/lodash"),
-        Mustache              = require("thirdparty/mustache/mustache"),
-        EventDispatcher     = require("utils/EventDispatcher");
-
-    EventDispatcher.makeEventDispatcher(exports);
-
-    const EVENT_FILE_NODE_CLICKED_WORKING_SET = "fileNodeClickedWorkingSet";
+        Mustache              = require("thirdparty/mustache/mustache");
 
     /**
      * Open view dictionary
@@ -281,7 +276,6 @@ define(function (require, exports, module) {
 
         // The mouse down handler pretty much handles everything
         $el.mousedown(function (e) {
-            exports.trigger(EVENT_FILE_NODE_CLICKED_WORKING_SET);
             var scrollDir = 0,
                 dragged = false,
                 startPageY = e.pageY,
@@ -1587,7 +1581,4 @@ define(function (require, exports, module) {
     // API to be used only by default extensions
     exports.useIconProviders              = useIconProviders;
     exports.useClassProviders               = useClassProviders;
-
-    // private events
-    exports._EVENT_FILE_NODE_CLICKED_WORKING_SET = EVENT_FILE_NODE_CLICKED_WORKING_SET;
 });