zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-20 23:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into m41

Browse source 
# Conflicts:
#	src/public/javascripts/services/tree.js
This commit is contained in:
zadam 2020-02-02 10:45:27 +01:00
parent 3cd4be4e48 adb8caa8a2
commit b946599320
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/public/javascripts/services/utils.js
View file

@ -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
};