1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-07-13 10:06:23 +02:00

Add line wrap settings. fixes #186

This commit is contained in:
Kushagra Gour
2017-09-16 17:52:34 +05:30
parent eb1cd50ebb
commit cd2ab830e1
2 changed files with 11 additions and 2 deletions

View File

@ -1619,6 +1619,7 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
$('[data-setting=autoComplete]').checked = prefs.autoComplete;
$('[data-setting=preserveConsoleLogs]').checked = prefs.preserveConsoleLogs;
$('[data-setting=lightVersion]').checked = prefs.lightVersion;
$('[data-setting=lineWrap]').checked = prefs.lineWrap;
}
/**
@ -1688,6 +1689,10 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
'keyMap',
$('[data-setting=keymap]:checked').value
);
scope.cm[type].setOption(
'lineWrapping',
$('[data-setting=lineWrap]').checked
);
scope.cm[type].refresh();
});
scope.consoleCm.setOption('theme', $('[data-setting=editorTheme]').value);
@ -2030,7 +2035,6 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
}
// Ctrl/⌘ + Shift + 5
if (
!prefs.autoPreview &&
(event.ctrlKey || event.metaKey) &&
event.shiftKey &&
event.keyCode === 53
@ -2218,7 +2222,8 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
autoSave: true,
autoComplete: true,
preserveConsoleLogs: true,
lightVersion: true
lightVersion: true,
lineWrap: true
},
function syncGetCallback(result) {
if (result.preserveLastCode && lastCode) {
@ -2256,6 +2261,7 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
prefs.autoComplete = result.autoComplete;
prefs.preserveConsoleLogs = result.preserveConsoleLogs;
prefs.lightVersion = result.lightVersion;
prefs.lineWrap = result.lineWrap;
updateSettingsInUi();
scope.updateSetting();