[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loleaflet/reference.html loleaflet/src

[Jan Holesovsky]

 loleaflet/reference.html |    7 +++++++
 loleaflet/src/map/Map.js |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit bf7db3857a8f8e9074e4aaacd4100a1e453a123d
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Feb 5 12:32:50 2016 +0100

    loleaflet: Document .uno:CharBackgroundExt.

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index bae4e86..6982cae 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -8268,6 +8268,13 @@ var unoCommands = [
 },
 
 {
+    uno: '.uno:CharBackgroundExt',
+    parameter: null,
+    description: '.uno:CharBackgroundExt is supplementary to .uno:BackColor. When .uno:BackColor is set, Writer turns into a "watercan" mode, where the user directly marks parts of the text with the wanted background color. ' +
+                 '.uno:CharBackgroundExt then controls this watercan mode - dispatching it toggles the watercan mode on/off, and also the StateChanged events reflect the on/off mode accordingly.'
+},
+
+{
     uno: '.uno:BackgroundColor',
     parameter: {
         'BackgroundColor': {
commit cd5daeac5d7c98fe482c0d2511d85cdd6365e2d9
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Feb 5 12:32:07 2016 +0100

    loleaflet: Don't try to operate on undefined.

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index c001e1f..f0d5798 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -640,7 +640,7 @@ L.Map = L.Evented.extend({
 
 	_onGotFocus: function () {
 		var doclayer = this._docLayer;
-		if (doclayer._isCursorVisibleOnLostFocus && doclayer._isCursorOverlayVisibleOnLostFocus) {
+		if (doclayer !== undefined && doclayer._isCursorVisibleOnLostFocus && doclayer._isCursorOverlayVisibleOnLostFocus) {
 			// we restore the old cursor position by a small delay, so that if the user clicks
 			// inside the document we skip to restore it, so that the user does not see the cursor
 			// jumping from the old position to the new one