diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/directeditor.js | 4 | ||||
-rw-r--r-- | js/editor.js | 17 | ||||
-rw-r--r-- | js/listener.js | 66 | ||||
-rw-r--r-- | js/main.js | 40 | ||||
-rw-r--r-- | js/settings.js | 22 | ||||
-rw-r--r-- | js/viewer.js | 8 |
6 files changed, 75 insertions, 82 deletions
diff --git a/js/directeditor.js b/js/directeditor.js index 9aa95df..aaccf86 100644 --- a/js/directeditor.js +++ b/js/directeditor.js @@ -65,10 +65,10 @@ } OCA.Onlyoffice.directEditor = { - close: function() { + close: function () { callMobileMessage("close"); }, - loaded: function() { + loaded: function () { callMobileMessage("loaded"); } }; diff --git a/js/editor.js b/js/editor.js index de00055..2f4334c 100644 --- a/js/editor.js +++ b/js/editor.js @@ -76,7 +76,8 @@ var dsVersion = DocsAPI.DocEditor.version(); var versionArray = dsVersion.split("."); if (versionArray[0] < 5 || versionArray[0] == 5 && versionArray[1] < 5) { - if (OCA.Onlyoffice.inframe) { + if (OCA.Onlyoffice.inframe + && window.parent.OCA.Onlyoffice.ShowHeaderButton) { window.parent.postMessage({ method: "editorShowHeaderButton" }, @@ -112,7 +113,7 @@ var docIsChanged = null; var docIsChangedTimeout = null; - var setPageTitle = function(event) { + var setPageTitle = function (event) { clearTimeout(docIsChangedTimeout); if (docIsChanged !== event.data) { @@ -138,7 +139,7 @@ }; if (config.editorConfig.tenant) { - config.events.onAppReady = function() { + config.events.onAppReady = function () { OCA.Onlyoffice.docEditor.showMessage(t(OCA.Onlyoffice.AppName, "You are using public demo ONLYOFFICE Document Server. Please do not store private sensitive data.")); }; } @@ -202,7 +203,7 @@ }); }; - OCA.Onlyoffice.onRequestHistoryData = function(fileId, version, shareToken) { + OCA.Onlyoffice.onRequestHistoryData = function (fileId, version, shareToken) { $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/version?fileId={fileId}&version={version}&shareToken={shareToken}", { fileId: fileId, @@ -220,7 +221,7 @@ }); }; - OCA.Onlyoffice.onRequestHistoryClose = function() { + OCA.Onlyoffice.onRequestHistoryClose = function () { location.reload(true); }; @@ -337,14 +338,14 @@ "*"); }; - OCA.Onlyoffice.onRequestSharingSettings = function() { + OCA.Onlyoffice.onRequestSharingSettings = function () { window.parent.postMessage({ method: "editorRequestSharingSettings" }, "*"); }; - OCA.Onlyoffice.onRequestCompareFile = function() { + OCA.Onlyoffice.onRequestCompareFile = function () { var revisedMimes = [ "application/vnd.openxmlformats-officedocument.wordprocessingml.document" ]; @@ -360,7 +361,7 @@ } }; - OCA.Onlyoffice.editorSetRevised = function(filePath) { + OCA.Onlyoffice.editorSetRevised = function (filePath) { $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/url?filePath={filePath}", { filePath: filePath diff --git a/js/listener.js b/js/listener.js index 3f8a4d8..3a25edb 100644 --- a/js/listener.js +++ b/js/listener.js @@ -30,65 +30,19 @@ OCA.Onlyoffice = _.extend({ AppName: "onlyoffice", - context: null, - folderUrl: null, frameSelector: null, - canExpandHeader: true, }, OCA.Onlyoffice); - OCA.Onlyoffice.ShowHeaderButton = function () { - if (!OCA.Onlyoffice.canExpandHeader) { - return; - } - - var wrapper = $("<div id='onlyofficeHeader' />") - - var btnClose = $("<a class='icon icon-close-white'></a>"); - btnClose.on("click", function() { - OCA.Onlyoffice.CloseEditor(); - }); - wrapper.prepend(btnClose); - - if (!$("#isPublic").val()) { - var btnShare = $("<a class='icon icon-shared icon-white'></a>"); - btnShare.on("click", function () { - OCA.Onlyoffice.OpenShareDialog(); - }) - wrapper.prepend(btnShare); - } - - if (!$("#header .header-right").length) { - $("#header").append("<div class='header-right'></div>"); - } - wrapper.prependTo(".header-right"); - }; - - OCA.Onlyoffice.CloseEditor = function () { - $("body").removeClass("onlyoffice-inline"); + OCA.Onlyoffice.onRequestClose = function () { $(OCA.Onlyoffice.frameSelector).remove(); - $("#onlyofficeHeader").remove(); + if (OCA.Viewer && OCA.Viewer.close) { OCA.Viewer.close(); } - OCA.Onlyoffice.context = null; - - var url = OCA.Onlyoffice.folderUrl; - if (!!url) { - window.history.pushState(null, null, url); - OCA.Onlyoffice.folderUrl = null; - } - }; - - OCA.Onlyoffice.OpenShareDialog = function () { - if (OCA.Onlyoffice.context) { - if (!$("#app-sidebar").is(":visible")) { - OCA.Onlyoffice.context.fileList.showDetailsView(OCA.Onlyoffice.context.fileName, "shareTabView"); - OC.Apps.showAppSidebar(); - } else { - OC.Apps.hideAppSidebar(); - } + if (OCA.Onlyoffice.CloseEditor) { + OCA.Onlyoffice.CloseEditor(); } }; @@ -123,20 +77,24 @@ revisedMimes); }; - window.addEventListener("message", function(event) { + window.addEventListener("message", function (event) { if ($(OCA.Onlyoffice.frameSelector)[0].contentWindow !== event.source || !event.data["method"]) { return; } switch (event.data.method) { case "editorShowHeaderButton": - OCA.Onlyoffice.ShowHeaderButton(); + if (OCA.Onlyoffice.ShowHeaderButton) { + OCA.Onlyoffice.ShowHeaderButton(); + } break; case "editorRequestClose": - OCA.Onlyoffice.CloseEditor(); + OCA.Onlyoffice.onRequestClose(); break; case "editorRequestSharingSettings": - OCA.Onlyoffice.OpenShareDialog(); + if (OCA.Onlyoffice.OpenShareDialog) { + OCA.Onlyoffice.OpenShareDialog(); + } break; case "editorRequestSaveAs": OCA.Onlyoffice.onRequestSaveAs(event.data.param); @@ -116,6 +116,42 @@ } }; + OCA.Onlyoffice.ShowHeaderButton = function () { + var wrapper = $("<div id='onlyofficeHeader' />") + + var btnClose = $("<a class='icon icon-close-white'></a>"); + btnClose.on("click", function() { + OCA.Onlyoffice.CloseEditor(); + }); + wrapper.prepend(btnClose); + + if (!$("#isPublic").val()) { + var btnShare = $("<a class='icon icon-shared icon-white'></a>"); + btnShare.on("click", function () { + OCA.Onlyoffice.OpenShareDialog(); + }) + wrapper.prepend(btnShare); + } + + if (!$("#header .header-right").length) { + $("#header").append("<div class='header-right'></div>"); + } + wrapper.prependTo(".header-right"); + }; + + OCA.Onlyoffice.CloseEditor = function () { + $("body").removeClass("onlyoffice-inline"); + $("#onlyofficeHeader").remove(); + + OCA.Onlyoffice.context = null; + + var url = OCA.Onlyoffice.folderUrl; + if (!!url) { + window.history.pushState(null, null, url); + OCA.Onlyoffice.folderUrl = null; + } + }; + OCA.Onlyoffice.OpenShareDialog = function () { if (OCA.Onlyoffice.context) { if (!$("#app-sidebar").is(":visible")) { @@ -187,7 +223,7 @@ return; } - var register = function() { + var register = function () { var formats = OCA.Onlyoffice.setting.formats; $.each(formats, function (ext, config) { @@ -277,7 +313,7 @@ var fileName = $("#filename").val(); var extension = getFileExtension(fileName); - var initSharedButton = function() { + var initSharedButton = function () { var formats = OCA.Onlyoffice.setting.formats; var config = formats[extension]; diff --git a/js/settings.js b/js/settings.js index adaf52f..fe41d2b 100644 --- a/js/settings.js +++ b/js/settings.js @@ -61,7 +61,7 @@ $("#onlyofficeGroups").click(groupListToggle); groupListToggle(); - var demoToggle = function() { + var demoToggle = function () { $("#onlyofficeAddrSettings input:not(#onlyofficeStorageUrl)").prop("disabled", $("#onlyofficeDemo").prop("checked")); }; @@ -87,14 +87,14 @@ "allTags", "linkTags", ]; - $.each(watermarkLists, function(i, watermarkList) { - var watermarkListToggle = function() { + $.each(watermarkLists, function (i, watermarkList) { + var watermarkListToggle = function () { if ($("#onlyofficeWatermark_" + watermarkList).prop("checked")) { if (watermarkList.indexOf("Group") >= 0) { OC.Settings.setupGroupsSelect($("#onlyofficeWatermark_" + watermarkList + "List")); } else { OC.SystemTags.collection.fetch({ - success: function() { + success: function () { $("#onlyofficeWatermark_" + watermarkList + "List").select2({ allowClear: true, closeOnSelect: false, @@ -102,13 +102,13 @@ separator: "|", toggleSelect: true, placeholder: t(OCA.Onlyoffice.AppName, "Select tag"), - query: _.debounce(function(query) { + query: _.debounce(function (query) { query.callback({ results: OC.SystemTags.collection.filterByName(query.term) }); }, 100, true), - initSelection: function(element, callback) { - var selection = ($(element).val() || []).split("|").map(function(tagId){ + initSelection: function (element, callback) { + var selection = ($(element).val() || []).split("|").map(function (tagId) { return OC.SystemTags.collection.get(tagId); }); callback(selection); @@ -119,8 +119,8 @@ formatSelection: function (tag) { return tag.get("name"); }, - sortResults: function(results) { - results.sort(function(a, b) { + sortResults: function (results) { + results.sort(function (a, b) { return OC.Util.naturalSortCompare(a.get("name"), b.get("name")); }); return results; @@ -188,12 +188,12 @@ $(".section-onlyoffice").addClass("icon-loading"); var defFormats = {}; - $("input[id^=\"onlyofficeDefFormat\"]").each(function() { + $("input[id^=\"onlyofficeDefFormat\"]").each(function () { defFormats[this.name] = this.checked; }); var editFormats = {}; - $("input[id^=\"onlyofficeEditFormat\"]").each(function() { + $("input[id^=\"onlyofficeEditFormat\"]").each(function () { editFormats[this.name] = this.checked; }); diff --git a/js/viewer.js b/js/viewer.js index 183a8e3..ca5f8da 100644 --- a/js/viewer.js +++ b/js/viewer.js @@ -67,7 +67,7 @@ src: self.url + "&inframe=true", }, on: { - load: function() { + load: function () { self.doneLoading(); }, }, @@ -96,13 +96,11 @@ var initPage = function () { if (OCA.Viewer) { - OCA.Onlyoffice.canExpandHeader = false; - OCA.Onlyoffice.frameSelector = "#onlyofficeViewerFrame"; - OCA.Onlyoffice.GetSettings(function(){ + OCA.Onlyoffice.GetSettings(function () { - var mimes = $.map(OCA.Onlyoffice.setting.formats, function(format) { + var mimes = $.map(OCA.Onlyoffice.setting.formats, function (format) { return format.mime; }); |