chore: reload live preview working and reload liev perview menu item in file menu

Author: abose

src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js

@@ -233,7 +233,10 @@ define(function (require, exports, module) {
             processedMessageIDs.set(messageID, true);
         }
         if(_livePreviewMessageHandler) {
-            _livePreviewMessageHandler(msg);
+            let preventDefault = _livePreviewMessageHandler(msg);
+            if(preventDefault){
+                return;
+            }
         }
 
         if (msg.id) {

src/LiveDevelopment/main.js

@@ -86,9 +86,7 @@ define(function main(require, exports, module) {
 
         // update the config with the new state
         config.imageGalleryState = state;
-        if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) {
-            MultiBrowserLiveDev.updateConfig(JSON.stringify(config));
-        }
+        refreshConfigInLivePreview();
     }
 
     let params = new UrlParams();
@@ -222,13 +220,6 @@ define(function main(require, exports, module) {
         });
     }
 
-    /** force reload the live preview currently only with shortcut ctrl-shift-R */
-    function _handleReloadLivePreviewCommand() {
-        if (MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) {
-            MultiBrowserLiveDev.reload();
-        }
-    }
-
     /**
      * Internal api used to update live edit capability status as entitlements changes. calling this will update the UI
      * but will not functionally enable live editing capabilities as that are dependent on entitlements framework.
@@ -315,7 +306,10 @@ define(function main(require, exports, module) {
             return;
         }
         config.mode = currentMode;
+        refreshConfigInLivePreview();
+    }
 
+    function refreshConfigInLivePreview() {
         if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) {
             MultiBrowserLiveDev.updateConfig(JSON.stringify(config));
         }
@@ -326,22 +320,15 @@ define(function main(require, exports, module) {
     function updateElementHighlightConfig() {
         const prefValue = PreferencesManager.get("livePreviewElementHighlights");
         config.elemHighlights = prefValue || "hover";
-        if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) {
-            MultiBrowserLiveDev.updateConfig(JSON.stringify(config));
-        }
+        refreshConfigInLivePreview();
     }
 
     function updateRulerLinesConfig() {
         const prefValue = PreferencesManager.get("livePreviewShowRulerLines");
         config.showRulerLines = prefValue || false;
-        if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) {
-            MultiBrowserLiveDev.updateConfig(JSON.stringify(config));
-        }
+        refreshConfigInLivePreview();
     }
 
-    // init commands
-    CommandManager.register(Strings.CMD_RELOAD_LIVE_PREVIEW, Commands.CMD_RELOAD_LIVE_PREVIEW, _handleReloadLivePreviewCommand);
-
     EventDispatcher.makeEventDispatcher(exports);
 
     // private api

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

@@ -1199,10 +1199,15 @@ define(function (require, exports, module) {
         });
         CommandManager.register(Strings.CMD_LIVE_FILE_PREVIEW_SETTINGS,
             Commands.FILE_LIVE_FILE_PREVIEW_SETTINGS, _showSettingsDialog);
+        CommandManager.register(Strings.CMD_RELOAD_LIVE_PREVIEW, Commands.CMD_RELOAD_LIVE_PREVIEW, function () {
+            _loadPreview(true, true);
+        });
         let fileMenu = Menus.getMenu(Menus.AppMenuBar.FILE_MENU);
         fileMenu.addMenuItem(Commands.FILE_LIVE_FILE_PREVIEW, "", Menus.AFTER, Commands.FILE_EXTENSION_MANAGER);
-        fileMenu.addMenuItem(Commands.FILE_LIVE_FILE_PREVIEW_SETTINGS, "",
+        fileMenu.addMenuItem(Commands.CMD_RELOAD_LIVE_PREVIEW, "",
             Menus.AFTER, Commands.FILE_LIVE_FILE_PREVIEW);
+        fileMenu.addMenuItem(Commands.FILE_LIVE_FILE_PREVIEW_SETTINGS, "",
+            Menus.AFTER, Commands.CMD_RELOAD_LIVE_PREVIEW);
         fileMenu.addMenuDivider(Menus.BEFORE, Commands.FILE_LIVE_FILE_PREVIEW);
 
         _registerHandlers();

src/nls/root/strings.js

@@ -543,7 +543,7 @@ define({
     "CMD_LIVE_FILE_PREVIEW": "Live Preview",
     "CMD_LIVE_FILE_PREVIEW_SETTINGS": "Live Preview Settings",
     "CMD_TOGGLE_LIVE_PREVIEW_MB_MODE": "Enable Experimental Live Preview",
-    "CMD_RELOAD_LIVE_PREVIEW": "Force Reload Live Preview",
+    "CMD_RELOAD_LIVE_PREVIEW": "Reload Live Preview",
     "CMD_PROJECT_SETTINGS": "Project Settings\u2026",
     "CMD_FILE_RENAME": "Rename",
     "CMD_FILE_DELETE": "Delete",