gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

small changes to linting and protected session

Browse Source
This commit is contained in:
azivner 2018-02-23 20:10:29 -05:00
parent 4acc5432c3
commit 19308bbfbd
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/javascripts/protected_session.js
View File

@ -25,7 +25,9 @@ const protected_session = (function() {
if (requireProtectedSession && !isProtectedSessionAvailable()) { if (requireProtectedSession && !isProtectedSessionAvailable()) {
protectedSessionDeferred = dfd; protectedSessionDeferred = dfd;
$noteDetailWrapper.hide(); if (noteTree.getCurrentNode().data.isProtected) {
$noteDetailWrapper.hide();
}
$dialog.dialog({ $dialog.dialog({
modal: modal, modal: modal,

9
src/public/libraries/codemirror/addon/lint/eslint.js vendored
View File

@ -11,9 +11,15 @@
})(function(CodeMirror) { })(function(CodeMirror) {
"use strict"; "use strict";
async function validator(text, options) {console.log("Validating..."); async function validator(text, options) {
await requireLibrary(ESLINT); await requireLibrary(ESLINT);
if (text.length > 20000) {
console.log("Skipping linting because of large size: ", text.length);
return [];
}
var errors = new eslint().verify(text, { var errors = new eslint().verify(text, {
root: true, root: true,
parserOptions: { parserOptions: {
@ -29,7 +35,6 @@
'import/no-extraneous-dependencies': 'off', 'import/no-extraneous-dependencies': 'off',
'func-names': 'off', 'func-names': 'off',
'no-multi-spaces': 'off', 'no-multi-spaces': 'off',
'spaced-comment': ["error", "always", { "markers": ["/"] }],
'comma-dangle': ['error'], 'comma-dangle': ['error'],
'padded-blocks': 'off', 'padded-blocks': 'off',
'linebreak-style': 'off', 'linebreak-style': 'off',