TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to editor preferences

This commit is contained in:
Samuel Georges 2016-04-21 04:50:05 +10:00
parent 788ffbb417
commit cfd53375ac
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/controllers/EditorPreferences.php
View File

@ -54,8 +54,8 @@ class EditorPreferences extends Controller
$this->vars['language'] = 'css';
$this->vars['margin'] = 0;
$this->vars['enableBasicAutocompletion'] = $editorSettings->enable_basic_autocompletion;
$this->vars['enableSnippets'] = $editorSettings->enable_snippets;
$this->vars['enableLiveAutocompletion'] = $editorSettings->enable_live_autocompletion;
$this->vars['enableSnippets'] = $editorSettings->enable_snippets;
$this->vars['displayIndentGuides'] = $editorSettings->display_indent_guides;
$this->vars['showPrintMargin'] = $editorSettings->show_print_margin;
$this->asExtension('FormController')->update();

10
modules/backend/controllers/editorpreferences/index.htm
View File

@ -21,11 +21,11 @@
data-tab-size="<?= $tabSize ?>"
data-theme="<?= $theme ?>"
data-show-invisibles="<?= $showInvisibles ?>"
data-enable-basic-autocompletion="<?= $enableBasicAutocompletion ?>"
data-enable-snippets="<?= $enableSnippets ?>"
data-enable-live-autocompletion="<?= $enableLiveAutocompletion ?>"
data-display-indent-guides="<?= $displayIndentGuides ?>"
data-show-print-margin="<?= $showPrintMargin ?>"
data-enable-basic-autocompletion="<?= $enableBasicAutocompletion ?>"
data-enable-live-autocompletion="<?= $enableLiveAutocompletion ?>"
data-enable-snippets="<?= $enableSnippets ?>"
data-display-indent-guides="<?= $displayIndentGuides ?>"
data-show-print-margin="<?= $showPrintMargin ?>"
data-highlight-active-line="<?= $highlightActiveLine ?>"
data-use-soft-tabs="<?= $useSoftTabs ?>"
data-show-gutter="<?= $showGutter ? 'true' : 'false' ?>"

8
modules/backend/models/EditorPreferences.php
View File

@ -32,10 +32,10 @@ class EditorPreferences extends Model
$this->show_gutter = $config->get('editor.show_gutter', true);
$this->auto_closing = $config->get('editor.auto_closing', true);
$this->enable_basic_autocompletion = $config->get('editor.enable_basic_autocompletion', true);
$this->enable_snippets = $config->get('editor.enable_snippets', true);
$this->enable_snippets = $config->get('editor.enable_snippets', true);
$this->enable_live_autocompletion = $config->get('editor.enable_live_autocompletion', true);
$this->display_indent_guides = $config->get('editor.display_indent_guides', true);
$this->show_print_margin = $config->get('editor.show_print_margin', true);
$this->show_print_margin = $config->get('editor.show_print_margin', true);
}
public static function applyConfigValues()
@ -53,10 +53,10 @@ class EditorPreferences extends Model
$config->set('editor.show_gutter', $settings->show_gutter);
$config->set('editor.auto_closing', $settings->auto_closing);
$config->set('editor.enable_basic_autocompletion', $settings->enable_basic_autocompletion);
$config->set('editor.editor.enable_snippets', $settings->enable_snippets);
$config->set('editor.editor.enable_snippets', $settings->enable_snippets);
$config->set('editor.enable_live_autocompletion', $settings->enable_live_autocompletion);
$config->set('editor.display_indent_guides', $settings->display_indent_guides);
$config->set('editor.show_print_margin', $settings->show_print_margin);
$config->set('editor.show_print_margin', $settings->show_print_margin);
}
public function getThemeOptions()

2
modules/cms/lang/en/lang.php
View File

@ -167,7 +167,7 @@ return [
'exit_fullscreen' => 'Exit fullscreen mode',
'open_searchbox' => 'Open Search box',
'close_searchbox' => 'Close Search box',
'open_replacebox' => 'Open Replace box',
'open_replacebox' => 'Open Replace box',
'close_replacebox' => 'Close Replace box'
],
'asset' => [