loleaflet/main.js | 5 ++++- loleaflet/src/map/Map.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit f56b5422165af0b0c3aec1ab050f2a934564b707 Author: Pranav Kant <[email protected]> Date: Fri Mar 10 14:58:47 2017 +0530 loleaflet: Allow not inactivating the screen Change-Id: Iad6233e2855b9260732ce4449668c0fab1cd3804 (cherry picked from commit 48977108be4f299e3dd43e7af58c7a9ab10ccbfb) Reviewed-on: https://gerrit.libreoffice.org/35035 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/loleaflet/main.js b/loleaflet/main.js index 27ca4987..619e8506 100644 --- a/loleaflet/main.js +++ b/loleaflet/main.js @@ -63,6 +63,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 === '') { @@ -98,7 +100,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 e97b19e1..f3ef565f 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -782,7 +782,7 @@ L.Map = L.Evented.extend({ _dim: function() { // console.log('_dim:'); - if (window.devtools.open || !map._socket.connected()) { + if (window.devtools.open || !map._socket.connected() || this.options.alwaysActive) { return; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
