[Libreoffice-commits] online.git: loleaflet/main.js loleaflet/src

[Pranav Kant]

 loleaflet/main.js        |    5 ++++-
 loleaflet/src/map/Map.js |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 48977108be4f299e3dd43e7af58c7a9ab10ccbfb
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Mar 10 14:58:47 2017 +0530

    loleaflet: Allow not inactivating the screen
    
    Change-Id: Iad6233e2855b9260732ce4449668c0fab1cd3804

diff --git a/loleaflet/main.js b/loleaflet/main.js
index 7822577..4f32fce 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -72,6 +72,8 @@ var timestamp = getParameterByName('timestamp');
 var closebutton = getParameterByName('closebutton');
 // Shows revision history file menu option
 var revHistoryEnabled = getParameterByName('revisionhistory');
+// Should the document go inactive or not
+var alwaysActive = getParameterByName('alwaysactive');
 // Loleaflet Debug mode
 var debugMode = getParameterByName('debug');
 if (wopiSrc === '' && filePath === '') {
@@ -107,7 +109,8 @@ var map = L.map('map', {
     timestamp: timestamp,
     documentContainer: 'document-container',
     debug: debugMode,
-	wopi: isWopi
+	wopi: isWopi,
+	alwaysActive: alwaysActive
 });
 // toolbar.js (loaded in <script> tag accesses map as global variable,
 // so expose it
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 7b07fe9..c1861d3 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -783,7 +783,7 @@ L.Map = L.Evented.extend({
 	},
 
 	_dim: function() {
-		if (this._debugAlwaysActive === true) {
+		if (this.options.alwaysActive || this._debugAlwaysActive === true) {
 			return;
 		}