[Libreoffice-commits] online.git: loleaflet/reference.html loleaflet/spec loleaflet/src

[Jan Holesovsky]

 loleaflet/reference.html                      |   12 +++++++-----
 loleaflet/spec/headlessLoadTest.js            |    2 +-
 loleaflet/spec/loleaflet/control/PartsSpec.js |    2 +-
 loleaflet/src/map/Map.js                      |    4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 5e96e32b565e5c14a4f1fad467a21e76dbbe88a3
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Apr 18 14:41:27 2016 +0200

    bccu#1699: Use 256 pixels at 96dpi as the TWIPs size (3840 TWIPs).

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index c7c5bec..2da1563 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -1510,22 +1510,24 @@ unexpected behaviour.</h4>
 	<tr>
 		<td><code><b>tileWidthTwips</b></code></td>
 		<td><code>Number</code></td>
-		<td><code><span class="literal">3000</span></code></td>
+		<td><code><span class="literal">3840</span></code></td>
 		<td>Default tile width in twips (how much of the document is covered horizontally in a 256x256 pixels tile).
-            Unless you know what you are doing, this should not be modified.</td>
+            Unless you know what you are doing, this should not be modified;
+	    this means twips value for 256 pixels at 96dpi.</td>
 	</tr>
 	<tr>
 		<td><code><b>tileHeightTwips</b></code></td>
 		<td><code>Number</code></td>
-		<td><code><span class="literal">3000</span></code></td>
+		<td><code><span class="literal">3840</span></code></td>
 		<td>Default tile height in twips (how much of the document is covered vertically in a 256x256 pixels tile).
-            Unless you know what you are doing, this should not be modified.</td>
+            Unless you know what you are doing, this should not be modified;
+	    this means twips value for 256 pixels at 96dpi.</td>
 	</tr>
 	<tr>
 		<td><code><b>defaultZoom</b></code></td>
 		<td><code>Number</code></td>
 		<td><code><span class="literal">10</span></code></td>
-		<td>The zoom level at which the tile size in twips equals the default size (3000 x 3000).
+		<td>The zoom level at which the tile size in twips equals the default size (3840 x 3840).
             Unless you know what you are doing, this should not be modified.</td>
 	</tr>
     <tr>
diff --git a/loleaflet/spec/headlessLoadTest.js b/loleaflet/spec/headlessLoadTest.js
index 2b11da0..5f953d2 100644
--- a/loleaflet/spec/headlessLoadTest.js
+++ b/loleaflet/spec/headlessLoadTest.js
@@ -16,7 +16,7 @@ describe('LoadTest', function () {
 	var testsRan = 0,
 		testsToRun = 500;
 		tileSize = 256,
-		tileSizeTwips = 3000,
+		tileSizeTwips = 3840,
 		host = 'wss://localhost:9980';
 
 	var _parseServerCmd = function (msg) {
diff --git a/loleaflet/spec/loleaflet/control/PartsSpec.js b/loleaflet/spec/loleaflet/control/PartsSpec.js
index 93b4292..26df9d3 100644
--- a/loleaflet/spec/loleaflet/control/PartsSpec.js
+++ b/loleaflet/spec/loleaflet/control/PartsSpec.js
@@ -55,7 +55,7 @@ describe('Parts and Pages', function () {
 				expect(e.docType).to.be('text');
 				done();
 			});
-			map.getCustomPreview(2, 0, 100, 200, 0, 0, 3000, 6000, {autoUpdate: true});
+			map.getCustomPreview(2, 0, 100, 200, 0, 0, 3840, 7680, {autoUpdate: true});
 		});
 
 
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index c01b430..fb4509d 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -14,8 +14,8 @@ L.Map = L.Evented.extend({
 		trackResize: true,
 		markerZoomAnimation: true,
 		defaultZoom: 10,
-		tileWidthTwips: 3000,
-		tileHeightTwips: 3000
+		tileWidthTwips: 3840,
+		tileHeightTwips: 3840
 	},
 
 	initialize: function (id, options) { // (HTMLElement or String, Object)