[Libreoffice-commits] online.git: 6 commits - loleaflet/src
Mihai Varga
mihai.varga at collabora.com
Thu Jun 25 05:52:21 PDT 2015
loleaflet/src/control/Control.EditView.js | 34 +++++++++++------------
loleaflet/src/control/Control.Parts.js | 4 +-
loleaflet/src/control/Control.Search.js | 14 ++++-----
loleaflet/src/control/Control.StatusIndicator.js | 2 -
loleaflet/src/layer/marker/Cursor.js | 2 -
loleaflet/src/layer/tile/GridLayer.js | 12 ++++----
6 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit f5c8ec852dec7759b16ea2773409bdcd101ac42a
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Thu Jun 25 15:50:53 2015 +0300
Fixed eslint errors in Control.EditView.js
diff --git a/loleaflet/src/control/Control.EditView.js b/loleaflet/src/control/Control.EditView.js
index 2baf269..6032017 100644
--- a/loleaflet/src/control/Control.EditView.js
+++ b/loleaflet/src/control/Control.EditView.js
@@ -4,31 +4,31 @@
L.Control.EditViewSwitch = L.Control.extend({
options: {
- position: 'topleft',
+ position: 'topleft'
},
- onAdd: function (map) {
+ onAdd: function () {
var partName = 'leaflet-control-editviewswitch',
- container = L.DomUtil.create('label', partName + ' leaflet-bar');
+ container = L.DomUtil.create('label', partName + ' leaflet-bar');
- this._checkBox = L.DomUtil.create('input', 'editview-cb', container);
- this._checkBox.type = 'checkbox';
- L.DomEvent.on(this._checkBox, 'change', this._onChange, this);
+ this._checkBox = L.DomUtil.create('input', 'editview-cb', container);
+ this._checkBox.type = 'checkbox';
+ L.DomEvent.on(this._checkBox, 'change', this._onChange, this);
container.appendChild(document.createTextNode('View only'));
return container;
},
- _onChange: function() {
- var className = 'leaflet-viewmode';
- if (this._checkBox.checked) {
- this._map.fire('viewmode');
- L.DomUtil.addClass(this._map._container, className);
- }
- else {
- this._map.fire('editmode');
- L.DomUtil.removeClass(this._map._container, className);
- }
- }
+ _onChange: function() {
+ var className = 'leaflet-viewmode';
+ if (this._checkBox.checked) {
+ this._map.fire('viewmode');
+ L.DomUtil.addClass(this._map._container, className);
+ }
+ else {
+ this._map.fire('editmode');
+ L.DomUtil.removeClass(this._map._container, className);
+ }
+ }
});
L.Map.mergeOptions({
commit a72d66f08b257b6f6f1725c622ca1334f788fbd8
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Thu Jun 25 15:48:51 2015 +0300
Fixed eslint errors in Control.Parts.js
diff --git a/loleaflet/src/control/Control.Parts.js b/loleaflet/src/control/Control.Parts.js
index 2b198d7..c0e75d9 100644
--- a/loleaflet/src/control/Control.Parts.js
+++ b/loleaflet/src/control/Control.Parts.js
@@ -29,7 +29,7 @@ L.Control.Parts = L.Control.extend({
return container;
},
- _prevPart: function (e) {
+ _prevPart: function () {
this._map.fire('prevpart');
if (this._currentPart > 0) {
this._currentPart -= 1;
@@ -37,7 +37,7 @@ L.Control.Parts = L.Control.extend({
this._updateDisabled();
},
- _nextPart: function (e) {
+ _nextPart: function () {
this._map.fire('nextpart');
if (this._currentPart < this._parts - 1) {
this._currentPart += 1;
commit fa3a5ab0c123baf5dbdbd51ae9845c35ce9d5854
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Thu Jun 25 15:36:02 2015 +0300
Fixed eslint errors in Control.Search
diff --git a/loleaflet/src/control/Control.Search.js b/loleaflet/src/control/Control.Search.js
index 5f7c678..c007067 100644
--- a/loleaflet/src/control/Control.Search.js
+++ b/loleaflet/src/control/Control.Search.js
@@ -58,7 +58,7 @@ L.Control.Search = L.Control.extend({
Math.max(viewTopLeftpx.y, docBoundsTopLeft.y)));
var topLeftTwips = this._map._docLayer._latLngToTwips(topLeft);
- if (e.keyCode === 13 && this._searchBar.value !== '' ) {
+ if (e.keyCode === 13 && this._searchBar.value !== '') {
this._disabled = false;
this._updateDisabled();
this._searchCmd['SearchItem.SearchString'].value = this._searchBar.value;
@@ -79,25 +79,25 @@ L.Control.Search = L.Control.extend({
if (e.type === 'clearnotfound') {
L.DomUtil.removeClass(this._searchBar, 'search-not-found');
}
- else if (e.type == 'searchnotfound') {
+ else if (e.type === 'searchnotfound') {
L.DomUtil.addClass(this._searchBar, 'search-not-found');
setTimeout(L.bind(this._map.fire, this._map, 'clearnotfound'), 500);
}
},
- _searchPrev: function (e) {
+ _searchPrev: function () {
this._searchCmd['SearchItem.Backward'].value = true;
this._searchCmd['SearchItem.SearchString'].value = this._searchBar.value;
this._map.socket.send('uno .uno:ExecuteSearch ' + JSON.stringify(this._searchCmd));
},
- _searchNext: function (e) {
+ _searchNext: function () {
this._searchCmd['SearchItem.Backward'].value = false;
this._searchCmd['SearchItem.SearchString'].value = this._searchBar.value;
this._map.socket.send('uno .uno:ExecuteSearch ' + JSON.stringify(this._searchCmd));
},
- _cancel: function (e) {
+ _cancel: function () {
L.DomUtil.setStyle(this._cancelButton, 'display', 'none');
this._map.fire('clearselection');
this._disabled = true;
@@ -148,8 +148,8 @@ L.Map.mergeOptions({
});
L.Map.addInitHook(function () {
- this.searchControl = new L.Control.Search();
- this.addControl(this.searchControl);
+ this.searchControl = new L.Control.Search();
+ this.addControl(this.searchControl);
});
L.control.search = function (options) {
commit 7be20044bef068c99746cf38ac11ca52280f4826
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Thu Jun 25 15:25:46 2015 +0300
Fixed eslint errors in Control.StatusIndicator.js
diff --git a/loleaflet/src/control/Control.StatusIndicator.js b/loleaflet/src/control/Control.StatusIndicator.js
index 96b9da9..78c24fd 100644
--- a/loleaflet/src/control/Control.StatusIndicator.js
+++ b/loleaflet/src/control/Control.StatusIndicator.js
@@ -4,7 +4,7 @@
L.Control.StatusIndicator = L.Control.extend({
options: {
- position: 'topleft',
+ position: 'topleft'
},
onAdd: function (map) {
commit d85b853e3384c72def8177ba8c85e23ee4c27d37
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Thu Jun 25 15:24:41 2015 +0300
Fixed eslint errors in Cursor.js
diff --git a/loleaflet/src/layer/marker/Cursor.js b/loleaflet/src/layer/marker/Cursor.js
index d40ffa5..9c5b4f8 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -13,7 +13,7 @@ L.Cursor = L.Layer.extend({
this._latlng = L.latLng(latlng);
},
- onAdd: function (map) {
+ onAdd: function () {
this._initLayout();
this.update();
},
commit a04a0c4a9f9584f393030c42cba9ed42d4901d19
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Thu Jun 25 15:23:03 2015 +0300
Fixed eslint errors in GridLayer.js
diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index 7961688..e3f51b5 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -493,7 +493,7 @@ L.GridLayer = L.Layer.extend({
// we know that a new set of tiles that cover the whole view has been requested
// so we're able to cancel the previous requests that are being processed
this._map.socket.send('canceltiles');
- for (var key in this._tiles) {
+ for (key in this._tiles) {
if (!this._tiles[key].loaded) {
L.DomUtil.remove(this._tiles[key].el);
delete this._tiles[key];
@@ -763,11 +763,11 @@ L.GridLayer = L.Layer.extend({
-evt.mcs.left - this._prevScrollX,
-evt.mcs.top - this._prevScrollY);
- if (!offset.equals(new L.Point(0, 0))) {
- this._prevScrollY = -evt.mcs.top;
- this._prevScrollX = -evt.mcs.left;
- this._map.panBy(offset, {animate:false});
- }
+ if (!offset.equals(new L.Point(0, 0))) {
+ this._prevScrollY = -evt.mcs.top;
+ this._prevScrollX = -evt.mcs.left;
+ this._map.panBy(offset, {animate:false});
+ }
},
_onScrollEnd: function (evt) {
More information about the Libreoffice-commits
mailing list