mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
Merge remote-tracking branch 'origin/master' into m41
# Conflicts: # src/public/javascripts/services/tree.js
This commit is contained in:
commit
b946599320
@ -248,6 +248,10 @@ function copySelectionToClipboard() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isCKEditorInitialized() {
|
||||||
|
return !!(window && window.cutToNote);
|
||||||
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
reloadApp,
|
reloadApp,
|
||||||
parseDate,
|
parseDate,
|
||||||
@ -281,5 +285,6 @@ export default {
|
|||||||
clearBrowserCache,
|
clearBrowserCache,
|
||||||
getUrlForDownload,
|
getUrlForDownload,
|
||||||
normalizeShortcut,
|
normalizeShortcut,
|
||||||
copySelectionToClipboard
|
copySelectionToClipboard,
|
||||||
|
isCKEditorInitialized
|
||||||
};
|
};
|
Loading…
x
Reference in New Issue
Block a user