loleaflet/.gitignore | 1 +
loleaflet/README | 7 +++++--
loolwsd/LOOLKit.cpp | 16 ++++++++--------
3 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit be0f1c0f3c2e721578865db62dc0c8f42850847c
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Aug 11 17:30:00 2016 +0530
loolwsd: Fix the case of mysterious zero viewid
First viewid is automatically created when we load a new
document, so createView() should not be called again, otherwise
it would create another viewid and viewid=0 will keep lurking in
the background emitting callbacks.
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index c59aade..7a7b545 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -927,16 +927,16 @@ private:
return nullptr;
}
}
- }
- if (_multiView)
- {
- Log::info("Loading view to document from URI: [" + uri + "] for
session [" + sessionId + "].");
- const auto viewId = _loKitDocument->createView();
+ if (_multiView)
+ {
+ Log::info("Loading view to document from URI: [" + uri + "]
for session [" + sessionId + "].");
+ const auto viewId = _loKitDocument->createView();
- Log::info() << "Document [" << _url << "] view ["
- << viewId << "] loaded, leaving "
- << (_clientViews + 1) << " views." << Log::end;
+ Log::info() << "Document [" << _url << "] view ["
+ << viewId << "] loaded, leaving "
+ << (_clientViews + 1) << " views." << Log::end;
+ }
}
// initializeForRendering() should be called before
commit af36ebeae26f18078222cd95640b2e53ef5f3ac2
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Aug 11 16:39:54 2016 +0530
loleaflet: Update README regarding source-maps and .gitignore
diff --git a/loleaflet/.gitignore b/loleaflet/.gitignore
index edf8521..4bdf28b 100644
--- a/loleaflet/.gitignore
+++ b/loleaflet/.gitignore
@@ -10,6 +10,7 @@ component.json
_site
dist/*.js
+dist/*.map
dist/branding.css
!dist/errormessages.js
dist/images/toolbar-bg.png
diff --git a/loleaflet/README b/loleaflet/README
index aa8e91c..048c704 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -48,14 +48,17 @@ Just do:
make
-Above step would create bundle.js and admin-bundle.js in dist/ for main
loleaflet and admin console
+Above step would create a minified bundle.js and admin-bundle.js in dist/ for
main loleaflet and admin console
respectively.
To build with debug-info, i.e with sourcemaps:
make debug
-Above will produce a larger-sized bundle.js and admin-bundle.js in dist/ with
source-maps so that you can debug while browsing.
+Above will produce source-map files, bundle.js.map and admin-bundle.js.map,
for bundle.js and admin-bundle.js respectively.
+It will also link existing bundle.js and admin-bundle.js to their map files by
adding a sourceMappingURL to them. While debugging,
+these .map files will be fetched from the server if present in dist/,
otherwise there is no way to debug while browsing without these
+source-map files.
Running
-------
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
