mirror of
https://github.com/zadam/trilium.git
synced 2025-01-16 20:21:43 +08:00
Merge remote-tracking branch 'origin/master' into m41
# Conflicts: # src/public/javascripts/services/tree.js
This commit is contained in:
commit
b946599320
1 changed files with 6 additions and 1 deletions
|
@ -248,6 +248,10 @@ function copySelectionToClipboard() {
|
|||
}
|
||||
}
|
||||
|
||||
function isCKEditorInitialized() {
|
||||
return !!(window && window.cutToNote);
|
||||
}
|
||||
|
||||
export default {
|
||||
reloadApp,
|
||||
parseDate,
|
||||
|
@ -281,5 +285,6 @@ export default {
|
|||
clearBrowserCache,
|
||||
getUrlForDownload,
|
||||
normalizeShortcut,
|
||||
copySelectionToClipboard
|
||||
copySelectionToClipboard,
|
||||
isCKEditorInitialized
|
||||
};
|
Loading…
Reference in a new issue