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

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Menubar.js |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 3d8bec750fbcf4aba9fb2c60973c343d7e0ce435
Author:     Eduard Ardeleanu <eduard-andrei.ardeleanu at 1and1.ro>
AuthorDate: Wed Feb 13 17:28:00 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Feb 14 08:42:10 2019 +0100

    loleaflet: fix ControlMenubar's DeleteSlide for presentation files
    
    Change-Id: Id45d112ce70029f2c102be3fc3cbff6afc2c8821
    Reviewed-on: https://gerrit.libreoffice.org/67782
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 4bc56d3fd4bb9fb01fb974884c4a00fbe1833288)
    Reviewed-on: https://gerrit.libreoffice.org/67801

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 882481831..f97772ca8 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -756,10 +756,15 @@ L.Control.Menubar = L.Control.extend({
 		} else if (id === 'duplicatepage') {
 			this._map.duplicatePage();
 		} else if (id === 'deletepage') {
+			var map = this._map;
 			vex.dialog.confirm({
 				message: _('Are you sure you want to delete this slide?'),
-				callback: this._onDeleteSlide
-			}, this);
+				callback: function(e) {
+					if (e) {
+						map.deletePage();
+					}
+				}
+			});
 		} else if (id === 'about') {
 			this._map.showLOAboutDialog();
 		} else if (id === 'keyboard-shortcuts') {
@@ -794,12 +799,6 @@ L.Control.Menubar = L.Control.extend({
 		this._map.sendUnoCommand(unoCommand);
 	},
 
-	_onDeleteSlide: function(e) {
-		if (e) {
-			this._map.deletePage();
-		}
-	},
-
 	_onItemSelected: function(e, item) {
 		var self = e.data.self;
 		var type = $(item).data('type');