[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - bundled/include loleaflet/src

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon May 13 14:37:17 UTC 2019


 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |    2 ++
 loleaflet/src/control/Control.LokDialog.js           |    4 ++++
 2 files changed, 6 insertions(+)

New commits:
commit 573c1970288deeb15831afd4bbdb4ea543fc52a1
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Apr 29 17:51:41 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon May 13 16:36:58 2019 +0200

    loleaflet: Allow to hide dialog
    
    Change-Id: Ieb6ba7e51ad91916e550a529cd94151d062b33d3
    Reviewed-on: https://gerrit.libreoffice.org/71548
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 7ff69d1b3..2c29ef201 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -605,6 +605,8 @@ typedef enum
      * - "cursor_visible" - cursor visible status is changed. Status is available
      *    in "visible" field
      * - "close" - window is closed
+     * - "show" - show the window
+     * - "hide" - hide the window
      */
     LOK_CALLBACK_WINDOW = 36,
 
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 6b5f8756e..5c292b297 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -303,6 +303,10 @@ L.Control.LokDialog = L.Control.extend({
 				this._onSidebarClose(e.id);
 			else
 				this._onDialogClose(e.id, false);
+		} else if (e.action === 'hide') {
+			$('#' + strId).parent().css({display: 'none'});
+		} else if (e.action === 'show') {
+			$('#' + strId).parent().css({display: 'block'});
 		}
 	},
 


More information about the Libreoffice-commits mailing list