[Libreoffice-commits] online.git: 3 commits - loleaflet/dist loleaflet/Makefile loleaflet/src

[Pranav Kant]

 loleaflet/Makefile                |    2 +-
 loleaflet/dist/toolbar/toolbar.js |    8 ++++++--
 loleaflet/src/core/Socket.js      |    8 +++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit ede173201f01faf74d97d9f0b3028442badbe36f
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Sep 21 13:05:52 2016 +0530

    loleaflet: Fix admin l10n strings file location
    
    Location was changed in 6c69b63be58f9a2989a5dc8a47a44c9eafc72b4e
    in an effort to modularize everything including these l10n
    strings.
    
    Change-Id: I4d7538a6e6d1370a45326bc163a496cf7c681259

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4cc64a8..e4b1ac6 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -39,13 +39,13 @@ dist: all
 
 pot:
 	xgettext --from-code=UTF-8 --keyword=_ --output=po/templates/loleaflet-ui.pot \
+		admin.strings.js \
 		evol.colorpicker.strings.js \
 		unocommands.js \
 		dist/errormessages.js \
 		dist/toolbar/toolbar.js \
 		src/admin/AdminSocketBase.js \
 		src/admin/AdminSocketOverview.js \
-		src/admin/AdminStrings.js \
 		src/admin/Util.js \
 		src/control/Control.ColumnHeader.js \
 		src/control/Control.DocumentRepair.js \
commit ed860594a1ec4d3161c99e291674768a6c54ab5c
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Sep 21 13:00:39 2016 +0530

    loleaflet: Guard against null
    
    This helps in preventing some of many warnings in the browser
    console.
    
    Change-Id: I568b9a20e7cecfddaffd7309271fae4f6c265b46

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 8e4e6aa..2e282e9 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -911,7 +911,9 @@ map.on('commandstatechanged', function (e) {
 			color = '#' + '0'.repeat(6 - color.length) + color;
 		}
 		div = L.DomUtil.get('fontcolorindicator');
-		L.DomUtil.setStyle(div, 'background', color);
+		if (div) {
+			L.DomUtil.setStyle(div, 'background', color);
+		}
 	}
 	else if (commandName === '.uno:BackColor' || commandName === '.uno:BackgroundColor' || commandName === '.uno:CharBackColor') {
 		// confusingly, the .uno: command is named differently in Writer, Calc and Impress
@@ -924,7 +926,9 @@ map.on('commandstatechanged', function (e) {
 			color = '#' + '0'.repeat(6 - color.length) + color;
 		}
 		div = L.DomUtil.get('backcolorindicator');
-		L.DomUtil.setStyle(div, 'background', color);
+		if (div) {
+			L.DomUtil.setStyle(div, 'background', color);
+		}
 	}
 	else if (commandName === '.uno:ModifiedStatus') {
 		var modifiedStatus = e.state === 'true';
commit a9946c59c0ddd22857096c557815843994d7d3c1
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Sep 21 12:46:49 2016 +0530

    loleaflet: cleanup
    
    Change-Id: Ia61402f5e0d650d7de606b1d8c8a548453972475

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index edeac8d..4bb4b8e 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -305,11 +305,13 @@ L.Socket = L.Class.extend({
 
 	_onSocketClose: function () {
 		this.hideBusy();
-		if (this._map) {
-			this._map._active = false;
+		if (this) {
+			this._active = false;
 		}
 
-		this._docLayer.removeAllViews();
+		if (this._docLayer) {
+			this._docLayer.removeAllViews();
+		}
 		if (this.fail) {
 			this.fire('error', {msg: _('Well, this is embarrassing, we cannot connect to your document. Please try again.'), cmd: 'socket', kind: 'closed', id: 4});
 		}