[Libreoffice-commits] online.git: 2 commits - loleaflet/dist wsd/DocumentBroker.cpp

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |   20 +++++---------------
 wsd/DocumentBroker.cpp            |    1 -
 2 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 33a60961759758388164074197c46132d8d4f8a3
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Dec 5 22:04:06 2016 +0530

    loleaflet: Disable calc toolbar items in readonly/view mode
    
    Change-Id: I2989de5f201eb7f52f5f47d98f9172c640e38fad

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index a40c4b0..22b850e 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -509,7 +509,11 @@ var formatButtons = {
 	'fontcolor': true, 'backcolor': true, 'bullet': true, 'numbering': true,
 	'alignleft': true, 'alignhorizontal': true, 'alignright': true, 'alignblock': true,
 	'incrementindent': true, 'decrementindent': true, 'insertgraphic': true,
-	'insertfootnote': true, 'repair': true, 'specialcharacter': true
+	'insertfootnote': true, 'repair': true, 'specialcharacter': true,
+	'wraptext': true, 'togglemergecells': true, 'numberformatcurrency': true,
+	'numberformatpercent': true, 'numberformatdecimal': true, 'numberformatdate': true,
+	'numberformatincdecimals': true, 'numberformatdecdecimals': true,
+	'sortascending': true, 'sortdescending': true
 };
 
 var userJoinedPopupMessage = '<div>' + _('%user has joined') + '</div>';
@@ -980,20 +984,6 @@ map.on('commandstatechanged', function (e) {
 		state = toLocalePattern('Slide %1 of %2', 'Slide (\\d+) of (\\d+)', state, '%1', '%2');
 		$('#PageStatus').html(state ? state : '    &nbsp');
 	}
-	else if (commandName === '.uno:WrapText' ||
-		 commandName === '.uno:ToggleMergeCells' ||
-		 commandName === '.uno:NumberFormatCurrency' ||
-		 commandName === '.uno:NumberFormatDecimal' ||
-		 commandName === '.uno:NumberFormatPercent' ||
-		 commandName === '.uno:NumberFormatDate') {
-		toggleButton(toolbar, state, commandName);
-		toggleButton(toolbarUpMore, state, commandName);
-	}
-	else if (commandName === '.uno:SortAscending' ||
-		 commandName === '.uno:SortDescending') {
-		disableButton(toolbar, state, commandName);
-		disableButton(toolbarUpMore, state, commandName);
-	}
 
 	var id = commandName.toLowerCase().substr(5);
 	if (typeof formatButtons[id] !== 'undefined') {
commit 68339f4673537b5294a3b5fbe66cf2cf8683c46b
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Dec 5 21:28:52 2016 +0530

    wsd: 'perm: readonly' is already sent in ClientSession::setReadOnly
    
    Change-Id: If8cb509f72539296dbfd816587df2674e82e1e60

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index ed5b726..2251cd0 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -384,7 +384,6 @@ bool DocumentBroker::save(const std::string& sessionId, bool success, const std:
         for (auto& sessionIt : _sessions)
         {
             sessionIt.second->setReadOnly();
-            sessionIt.second->sendTextFrame("perm: readonly");
             sessionIt.second->sendTextFrame("error: cmd=storage kind=savediskfull");
         }
     }