[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist

[Henry Castro]

 loleaflet/dist/toolbar/toolbar.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f576c195f6e2271ab38b3819fc3f4761e72f7e0e
Author: Henry Castro <hcastro at collabora.com>
Date:   Tue May 23 16:35:37 2017 -0400

    loleaflet: fix undo repair document popup
    
    UNDO_CONFLICT was intented to notify views, but
    the constant value changed with latest patch upstream
    
    Change-Id: I09062725539df3d974a47d89374d822d1d852770
    Reviewed-on: https://gerrit.libreoffice.org/38110
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index ca6fea60..42069afd 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1412,7 +1412,7 @@ map.on('commandresult', function (e) {
 		}
 	}
 	else if ((commandName === '.uno:Undo' || commandName === '.uno:Redo') &&
-		e.success === true && e.result.value && e.result.value === '130') { /*UNDO_CONFLICT*/
+		e.success === true && e.result.value && !isNaN(e.result.value)) { /*UNDO_CONFLICT*/
 		$('#tb_toolbar-up_item_repair').w2overlay({ html: '<div style="padding: 10px; line-height: 150%">' +
 			_('Conflict Undo/Redo with multiple users. Please use document repair to resolve') + '</div>'});
 	}