Merge branch 'stable'

This commit is contained in:
azivner
2017-11-13 23:42:23 -05:00
7 changed files with 50 additions and 3 deletions

View File

@@ -21,7 +21,7 @@ const settings = (function() {
dialogEl.dialog({
modal: true,
width: 600
width: 800
});
tabsEl.tabs();
@@ -146,6 +146,21 @@ settings.addModule((function () {
return false;
});
return {
settingsLoaded
};
})());
settings.addModule((function () {
const buildDateEl = $("#build-date");
const buildRevisionEl = $("#build-revision");
function settingsLoaded(settings) {
buildDateEl.html(settings['buildDate']);
buildRevisionEl.html(settings['buildRevision']);
buildRevisionEl.attr('href', 'https://github.com/zadam/trilium/commit/' + settings['buildRevision']);
}
return {
settingsLoaded
};