Skip to content

Commit b552963

Browse files
committed
refactor: live preview setting server type unknown to custom
1 parent 67d5ba8 commit b552963

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ define(function (require, exports, module) {
5353

5454
EventDispatcher.makeEventDispatcher(exports);
5555

56-
const FRAMEWORK_UNKNOWN = "unknown",
56+
const FRAMEWORK_CUSTOM = "Custom",
5757
FRAMEWORK_DOCUSAURUS = "Docusaurus";
5858

5959
const EVENT_SERVER_CHANGED = "customServerChanged";
@@ -99,7 +99,7 @@ define(function (require, exports, module) {
9999
return;
100100
}
101101
}
102-
$frameworkSelect.val(FRAMEWORK_UNKNOWN);
102+
$frameworkSelect.val(FRAMEWORK_CUSTOM);
103103
$hotReloadChk.prop('checked', false);
104104
}
105105

@@ -108,9 +108,7 @@ define(function (require, exports, module) {
108108
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_URL, liveServerURL, PreferencesManager.PROJECT_SCOPE);
109109
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_PATH, serveRoot, PreferencesManager.PROJECT_SCOPE);
110110
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_HOT_RELOAD_SUPPORTED, hotReloadSupported, PreferencesManager.PROJECT_SCOPE);
111-
if(framework !== FRAMEWORK_UNKNOWN) {
112-
PreferencesManager.set(PREFERENCE_PROJECT_PREVIEW_FRAMEWORK, framework, PreferencesManager.PROJECT_SCOPE);
113-
}
111+
PreferencesManager.set(PREFERENCE_PROJECT_PREVIEW_FRAMEWORK, framework, PreferencesManager.PROJECT_SCOPE);
114112
}
115113

116114
function showSettingsDialog() {

src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1 class="dialog-title">{{Strings.LIVE_DEV_SETTINGS_TITLE}}</h1>
1818
value="{{settings.fontSize}}" placeholder="{{Strings.LIVE_DEV_SETTINGS_SERVER_ROOT_HELP}}">
1919
<label id="frameworkLabel" class="forced-hidden" style="margin-left: 20px;">{{Strings.LIVE_DEV_SETTINGS_FRAMEWORK}}</label>
2020
<select id="frameworkSelect" class="forced-hidden" style="width: 20%; margin-left: 20px;">
21-
<option style="text-align:left;" value="unknown">{{Strings.LIVE_DEV_SETTINGS_FRAMEWORK_UNKNOWN}}</option>
21+
<option style="text-align:left;" value="Custom">{{Strings.LIVE_DEV_SETTINGS_FRAMEWORK_CUSTOM}}</option>
2222
<option style="text-align:left;" value="Docusaurus">Docusaurus</option>
2323
</select>
2424

src/nls/root/strings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ define({
169169
"LIVE_DEV_SETTINGS_RELOAD": "Server supports hot reload",
170170
"LIVE_DEV_SETTINGS_RELOAD_HELP": "Some servers support hot reload where code changes are pushed to page without a full page reload.\nEnable this feature if you do not want {APP_NAME} to reload the page on every save.",
171171
"LIVE_DEV_SETTINGS_FRAMEWORK": "Server Framework",
172-
"LIVE_DEV_SETTINGS_FRAMEWORK_UNKNOWN": "Unknown",
172+
"LIVE_DEV_SETTINGS_FRAMEWORK_CUSTOM": "Custom",
173173
"LIVE_DEV_SETTINGS_FRAMEWORK_PREFERENCES": "Server Framework, currently supports only docusaurus",
174174

175175
"LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live Preview was canceled because the browser's developer tools were opened",

test/spec/LiveDevelopmentCustomServer-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ define(function (require, exports, module) {
169169
expect(testWindow.$("#serveRoot").is(":visible")).toBeTrue();
170170
expect(testWindow.$("#frameworkSelect").is(":visible")).toBeTrue();
171171
expect(testWindow.$("#hotReloadChk").is(":visible")).toBeTrue();
172-
expect(testWindow.$("#frameworkSelect").val()).toBe("unknown");
172+
expect(testWindow.$("#frameworkSelect").val()).toBe("Custom");
173173

174174
// close-cancel dialog
175175
await SpecRunnerUtils.clickDialogButton(Dialogs.DIALOG_BTN_CANCEL);
@@ -470,7 +470,7 @@ define(function (require, exports, module) {
470470
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_ENABLED, true, PreferencesManager.PROJECT_SCOPE);
471471
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_URL, "http://localhost:43768", PreferencesManager.PROJECT_SCOPE);
472472
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_PATH, "", PreferencesManager.PROJECT_SCOPE);
473-
PreferencesManager.set(PREFERENCE_PROJECT_PREVIEW_FRAMEWORK, "unknown", PreferencesManager.PROJECT_SCOPE);
473+
PreferencesManager.set(PREFERENCE_PROJECT_PREVIEW_FRAMEWORK, "Custom", PreferencesManager.PROJECT_SCOPE);
474474
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_HOT_RELOAD_SUPPORTED, true, PreferencesManager.PROJECT_SCOPE);
475475

476476
await awaitsForDone(SpecRunnerUtils.openProjectFiles(["readme.md"]),
@@ -499,7 +499,7 @@ define(function (require, exports, module) {
499499
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_ENABLED, true, PreferencesManager.PROJECT_SCOPE);
500500
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_URL, "http://localhost:43768", PreferencesManager.PROJECT_SCOPE);
501501
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_PATH, sub, PreferencesManager.PROJECT_SCOPE);
502-
PreferencesManager.set(PREFERENCE_PROJECT_PREVIEW_FRAMEWORK, "unknown", PreferencesManager.PROJECT_SCOPE);
502+
PreferencesManager.set(PREFERENCE_PROJECT_PREVIEW_FRAMEWORK, "Custom", PreferencesManager.PROJECT_SCOPE);
503503
PreferencesManager.set(PREFERENCE_PROJECT_SERVER_HOT_RELOAD_SUPPORTED, supportsHotReload, PreferencesManager.PROJECT_SCOPE);
504504
await awaits(1000); // this is here so that the preferences json is properly created and loaded
505505
return testTempDir;

0 commit comments

Comments
 (0)