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

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4b9753d262dc6e5048ed46c7d8571621a969cd74
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Dec 16 21:47:07 2016 +0530

    loleaflet: Fix incorrect key name
    
    It is insertannotation, not just annotation
    
    Change-Id: I1bc01e87da963d0e07d670ffec261e33b45062d2
    Reviewed-on: https://gerrit.libreoffice.org/32096
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>
    (cherry picked from commit e2151b30b270ef47faf403a412ee6e858febdeee)
    Reviewed-on: https://gerrit.libreoffice.org/32102
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index ee1e304..dd698e3 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -384,7 +384,7 @@ $(function () {
 			{type: 'break', id: 'incdecindent'},
 			{type: 'html',  id: 'inserttable-html', html: '<div id="inserttable-popup" class="inserttable-pop ui-widget ui-widget-content ui-corner-all" style="position: absolute; display: none;"><div class="inserttable-grid"></div><div id="inserttable-status" class="loleaflet-font" style="padding: 5px;"><br/></div>'},
 			{type: 'button',  id: 'inserttable',  img: 'inserttable', hint: _('Insert table')},
-			{type: 'button',  id: 'annotation', img: 'annotation', hint: _('Insert comment'), uno: 'InsertAnnotation'},
+			{type: 'button',  id: 'insertannotation', img: 'annotation', hint: _('Insert comment'), uno: 'InsertAnnotation'},
 			{type: 'button',  id: 'insertgraphic',  img: 'insertgraphic', hint: _('Insert graphic')},
 			{type: 'button',  id: 'specialcharacter', img: 'specialcharacter', hint: _('Special Character')},
 			{type: 'html', id: 'right'},
@@ -501,7 +501,7 @@ $(function () {
 var formatButtons = {
 	'undo': true, 'redo': true, 'save': true,
 	'bold': true, 'italic': true, 'underline': true, 'strikeout': true,
-	'annotation': true, 'inserttable': true,
+	'insertannotation': true, 'inserttable': true,
 	'fontcolor': true, 'backcolor': true, 'bullet': true, 'numbering': true,
 	'alignleft': true, 'alignhorizontal': true, 'alignright': true, 'alignblock': true,
 	'incrementindent': true, 'decrementindent': true, 'insertgraphic': true,