[Libreoffice-commits] online.git: 2 commits - android/gradle.properties loleaflet/src

[Libreoffice Gerrit user]

 android/gradle.properties               |    2 +-
 loleaflet/src/map/handler/Map.Scroll.js |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 589fcc3ac799be6bc47d10c2bd974ee747297333
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 22 14:18:38 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Feb 22 14:21:04 2019 +0100

    android: We need more memory for the build.
    
    Change-Id: I69e54171eba354c85e739d7342da8e9b94096437

diff --git a/android/gradle.properties b/android/gradle.properties
index 9e6fce102..255921f27 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx4g
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
commit 071960901f5438590ac8379e438820ae43b0b18a
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 22 14:17:01 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Feb 22 14:17:01 2019 +0100

    Remove extra whitespace.
    
    Change-Id: Ia5f4e3838123bf1c08151a0745ac2871bbe16b73

diff --git a/loleaflet/src/map/handler/Map.Scroll.js b/loleaflet/src/map/handler/Map.Scroll.js
index 4abfbb12d..2b0e047c1 100644
--- a/loleaflet/src/map/handler/Map.Scroll.js
+++ b/loleaflet/src/map/handler/Map.Scroll.js
@@ -94,7 +94,7 @@ L.Map.Scroll = L.Handler.extend({
 				map.setZoom(zoom + delta);
 			}
 		} else { // eslint-disable-next-line no-lonely-if
-			if (map.getDocType() === 'spreadsheet') { 
+			if (map.getDocType() === 'spreadsheet') {
 				if (delta > 0) {
 					map.setZoomAround(this._lastMousePos, 14); // 200%
 				} else {