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

[Pranav Kant]

 loleaflet/dist/toolbar.css              |    4 ++--
 loleaflet/dist/toolbar/toolbar.js       |   19 ++++++++++++++-----
 loleaflet/src/control/Control.Scroll.js |    1 +
 3 files changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 0e96f2c68928d51c17774b56d0fc57ef94e857cf
Author: Pranav Kant <pranavk at collabora.com>
Date:   Fri May 13 00:35:01 2016 +0530

    bccu#1788: Center/Align the color feedback under the icon
    
    Change-Id: I985f502e4810ff76d99f4375bd85d6819e64e325
    (cherry picked from commit cf932d52ec87adc987ec21f8fee89f0805ce539e)

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 40922cb..495c662 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -177,8 +177,8 @@ button.leaflet-control-search-next
 .back-color-indicator {
     width: 16px;
     height: 5px;
-    margin-top: -7px;
-    margin-left: 5px;
+    margin-top: -7px !important;
+    margin-left: 5px !important;
     position: fixed;
     background: transparent;
 }
commit 73f72c23d132c93c624e582b07d2a2594875b3b9
Author: Pranav Kant <pranavk at collabora.com>
Date:   Fri May 13 00:34:07 2016 +0530

    loleaflet: More checking; don't add element if already added
    
    Change-Id: Id0e71b5f100167e39d95cbad6033a42f1111b570
    (cherry picked from commit fc87000a6268efa0cf891c7495f8d33ad372a863)

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 3dc3f0d..20eab86 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -88,10 +88,15 @@ $(function () {
 			onClick(e.target);
 		},
 		onRefresh: function(e) {
-			var fontColorIndicator = L.DomUtil.create('div', 'font-color-indicator', L.DomUtil.get('tb_toolbar-up_item_fontcolor'));
-			fontColorIndicator.id = 'fontcolorindicator';
-			var backColorIndicator = L.DomUtil.create('div', 'back-color-indicator', L.DomUtil.get('tb_toolbar-up_item_backcolor'));
-			backColorIndicator.id = 'backcolorindicator';
+			if (!L.DomUtil.get('fontcolorindicator')) {
+				var fontColorIndicator = L.DomUtil.create('div', 'font-color-indicator', L.DomUtil.get('tb_toolbar-up_item_fontcolor'));
+				fontColorIndicator.id = 'fontcolorindicator';
+			}
+
+			if (!L.DomUtil.get('backcolorindicator')) {
+				var backColorIndicator = L.DomUtil.create('div', 'back-color-indicator', L.DomUtil.get('tb_toolbar-up_item_backcolor'));
+				backColorIndicator.id = 'backcolorindicator';
+			}
 		}
 	});
 
commit fb838deebe2daafe7beb2d46a21192e04805fb90
Author: Pranav Kant <pranavk at collabora.com>
Date:   Fri May 13 00:00:49 2016 +0530

    bccu#1756: Check for empty input
    
    In case of presentation we are getting an empty value in response
    to .uno:CharFontName. While this looks like a bug in LOKit, no harm
    in putting a check for empty values here.
    
    In ES5 argument to Object.keys must be an object otherwise it
    throws an exception.
    
    Change-Id: I5c2f7963544fda55bab3f314f1b098b3c9e3bd0b
    (cherry picked from commit 870b46be78a3fd09384d7e8e3e74d02cfe66614e)

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 48b6deb..3dc3f0d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -782,7 +782,11 @@ map.on('updatetoolbarcommandvalues', function (e) {
 		$(".styles-select").on('select2:select', onStyleSelect);
 	}
 	else if (e.commandName === '.uno:CharFontName') {
-		data = data.concat(Object.keys(e.commandValues));
+		// Old browsers like IE11 et al don't like Object.keys with
+		// empty arguments
+		if (typeof e.commandValues === 'object') {
+			data = data.concat(Object.keys(e.commandValues));
+		}
 		$(".fonts-select").select2({
 			data: data,
 			placeholder: _("Font")
commit 83085391fe50a363544edbce472f718f31cee0a7
Author: Pranav Kant <pranavk at collabora.com>
Date:   Thu May 12 20:17:10 2016 +0530

    loleaflet: Update scrollbar after resizing the container
    
    Currently, it does get fired, it seems, and vertical scrollbar
    does get adjusted automatically according to new size, but
    horizontal scrollbar doesn't for some reason/bug. Lets explicitly
    tell the plugin to update on every resize we do.
    
    Change-Id: I706228302cb43fb22cf54acfe1b990d3e66d5281
    (cherry picked from commit 268eb615c20773d4d90eb2ec429e5ffa465513fb)

diff --git a/loleaflet/src/control/Control.Scroll.js b/loleaflet/src/control/Control.Scroll.js
index 1ce203f..8cc7dcb 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -116,6 +116,7 @@ L.Control.Scroll = L.Control.extend({
 		this._ignoreScroll = true;
 		L.DomUtil.setStyle(this._mockDoc, 'width', e.x + 'px');
 		L.DomUtil.setStyle(this._mockDoc, 'height', e.y + 'px');
+		$('.scroll-container').mCustomScrollbar('update');
 		this._ignoreScroll = null;
 	},