loleaflet/dist/loleaflet.html | 1 - loleaflet/main.js | 2 +- loleaflet/src/map/Map.js | 10 +++------- loleaflet/src/map/handler/Map.Keyboard.js | 3 --- 4 files changed, 4 insertions(+), 12 deletions(-)
New commits: commit 940e78162fb08e7f94c12f01e9144fae5acfb4ff Author: Henry Castro <[email protected]> Date: Wed Sep 28 09:59:41 2016 -0400 loleaflet: remove map attribution diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html index bf1794b..ff3edca 100644 --- a/loleaflet/dist/loleaflet.html +++ b/loleaflet/dist/loleaflet.html @@ -56,7 +56,6 @@ <script> window.host = '%HOST%'; window.access_token = '%ACCESS_TOKEN%'; - window.attribution = '%CODE%'; </script> <script src="/loleaflet/%VERSION%/branding.js"></script> <!-- logo onclick handler --> <script src="/loleaflet/%VERSION%/bundle.js"></script> diff --git a/loleaflet/main.js b/loleaflet/main.js index 226a55b..cb53fb7 100644 --- a/loleaflet/main.js +++ b/loleaflet/main.js @@ -93,7 +93,7 @@ var map = L.map('map', { timestamp: timestamp, documentContainer: 'document-container', debug: debugMode -}, attribution); +}); // toolbar.js (loaded in <script> tag accesses map as global variable, // so expose it global.map = map; diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index 5fe8dd3..f456ce6 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -20,7 +20,7 @@ L.Map = L.Evented.extend({ urlPrefix: 'lool' }, - initialize: function (id, options, attribution) { // (HTMLElement or String, Object) + initialize: function (id, options) { // (HTMLElement or String, Object) options = L.setOptions(this, options); if (this.options.documentContainer) { @@ -55,10 +55,6 @@ L.Map = L.Evented.extend({ options.webserver = options.server.replace(/^(ws|wss):/i, protocol); } - if (attribution) { - this._attributionControl = L.control.attribution({prefix: attribution}).addTo(this); - } - // we are adding components like '/insertfile' at the end which would // lead to URL's of the form <webserver>//insertfile/... options.webserver = options.webserver.replace(/\/*$/, ''); @@ -1055,6 +1051,6 @@ L.Map = L.Evented.extend({ } }); -L.map = function (id, options, attribution) { - return new L.Map(id, options, attribution); +L.map = function (id, options) { + return new L.Map(id, options); }; diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js index 248fdc6..5872247 100644 --- a/loleaflet/src/map/handler/Map.Keyboard.js +++ b/loleaflet/src/map/handler/Map.Keyboard.js @@ -397,9 +397,6 @@ L.Map.Keyboard = L.Handler.extend({ } else if (e.originalEvent.altKey) { switch (e.originalEvent.keyCode) { case 68: // Ctrl + Shift + Alt + d for tile debugging mode - if (this._map._attributionControl) { - this._map.removeControl(this._map._attributionControl); - } this._map._docLayer.toggleTileDebugMode(); } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
