[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/src
loleaflet/dist/loleaflet.css |4 loleaflet/src/layer/tile/TileLayer.js | 12 ++-- loleaflet/src/map/handler/Map.Keyboard.js |6 +- 3 files changed, 19 insertions(+), 3 deletions(-) New commits: commit 91e4dce9b6f4e2f1a258e1a4e14365d1edb9c468 Author: Henry CastroDate: Sat Feb 10 14:20:52 2018 -0400 loleaflet: copy text of the annotation element to clipboard Change-Id: I8675b3752656afc1ba79d614d2f1fe3e7d98f600 Reviewed-on: https://gerrit.libreoffice.org/49546 Reviewed-by: pranavk Tested-by: pranavk diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css index 57185f0e..98bffaa7 100644 --- a/loleaflet/dist/loleaflet.css +++ b/loleaflet/dist/loleaflet.css @@ -142,6 +142,10 @@ body { .loleaflet-annotation { position: absolute; text-align: center; + user-select: text; + -moz-user-select: text; + -webkit-user-select: text; + -ms-user-select: text; } .loleaflet-annotation-content-wrapper, .loleaflet-annotation-redline-content-wrapper { diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index 8e36d7ab..5f777182 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -1815,7 +1815,11 @@ L.TileLayer = L.GridLayer.extend({ _onCopy: function (e) { e = e.originalEvent; e.preventDefault(); - if (this._selectionTextContent) { + if (this._map._docLayer._textArea.value !== '') { + L.Compatibility.clipboardSet(e, this._map._docLayer._textArea.value); + this._map._docLayer._textArea.value = ''; + } + if (this._textSelectionStart && this._textSelectionEnd && this._selectionTextContent) { L.Compatibility.clipboardSet(e, this._selectionTextContent); // remember the copied text, for rich copy/paste inside a document @@ -1828,7 +1832,11 @@ L.TileLayer = L.GridLayer.extend({ _onCut: function (e) { e = e.originalEvent; e.preventDefault(); - if (this._selectionTextContent) { + if (this._map._docLayer._textArea.value !== '') { + L.Compatibility.clipboardSet(e, this._map._docLayer._textArea.value); + this._map._docLayer._textArea.value = ''; + } + if (this._textSelectionStart && this._textSelectionEnd && this._selectionTextContent) { L.Compatibility.clipboardSet(e, this._selectionTextContent); // remember the copied text, for rich copy/paste inside a document diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js index c7161535..11c9d57b 100644 --- a/loleaflet/src/map/handler/Map.Keyboard.js +++ b/loleaflet/src/map/handler/Map.Keyboard.js @@ -428,6 +428,10 @@ L.Map.Keyboard = L.Handler.extend({ }, _handleCtrlCommand: function (e) { + // Control + if (e.originalEvent.keyCode == 17) + return true; + if (e.type !== 'keydown' && e.originalEvent.key !== 'c' && e.originalEvent.key !== 'v' && e.originalEvent.key !== 'x' && /* Safari */ e.originalEvent.keyCode !== 99 && e.originalEvent.keyCode !== 118 && e.originalEvent.keyCode !== 120) { e.originalEvent.preventDefault(); @@ -515,7 +519,7 @@ L.Map.Keyboard = L.Handler.extend({ case 91: // Left Cmd (Safari) case 93: // Right Cmd (Safari) // we prepare for a copy or cut event - this._map._docLayer._textArea.value = 'dummy text'; + this._map._docLayer._textArea.value = window.getSelection().toString(); this._map._docLayer._textArea.focus(); this._map._docLayer._textArea.select(); return true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/src
loleaflet/dist/leaflet.css|4 ++-- loleaflet/src/layer/tile/TileLayer.js |5 + loleaflet/src/map/Map.js |3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 33665347bc3ade2d977ce40b5927f7f48d0538df Author: Pranav KantDate: Thu Feb 8 15:04:29 2018 +0530 Move the IME candidate window with cursor position Change-Id: I7b37b0c4981b4ebcefb7606915711ca2adec3c31 (cherry picked from commit 1e91799663945fdfde84385bcfbb96fd03c6fe2e) Reviewed-on: https://gerrit.libreoffice.org/49775 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css index c324ebfd..b2bf8115 100644 --- a/loleaflet/dist/leaflet.css +++ b/loleaflet/dist/leaflet.css @@ -679,7 +679,7 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header { } .clipboard-container { - position: fixed; + position: absolute; left: 0px; top: 0px; width: 0px; @@ -863,4 +863,4 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header { border-radius: 2px; top: 24px; color: white; - } \ No newline at end of file + } diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index 0ac34006..a4b95dbc 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -1438,6 +1438,11 @@ L.TileLayer = L.GridLayer.extend({ this._cursorMarker.setLatLng(cursorPos, pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom(; } this._map.addLayer(this._cursorMarker); + + // move the hidden input field with the cursor + var clipContainer = L.DomUtil.get('doc-clipboard-container'); + var pos = this._map.latLngToLayerPoint(L.latLng(cursorPos)).round(); + L.DomUtil.setPosition(clipContainer, pos); } else if (this._cursorMarker) { this._map.removeLayer(this._cursorMarker); diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index 10f5acfd..ad092edc 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -692,7 +692,8 @@ L.Map = L.Evented.extend({ throw new Error('Map container is already initialized.'); } - var textAreaContainer = L.DomUtil.create('div', 'clipboard-container', container.parentElement); + var textAreaContainer = L.DomUtil.create('div', 'clipboard-container', container); + textAreaContainer.id = 'doc-clipboard-container'; this._textArea = L.DomUtil.create('input', 'clipboard', textAreaContainer); this._textArea.setAttribute('type', 'text'); this._textArea.setAttribute('autocorrect', 'off'); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js |7 +++ loleaflet/src/admin/AdminSocketAnalytics.js |3 +-- loleaflet/src/control/Control.ColumnHeader.js |2 +- loleaflet/src/control/Control.DocumentRepair.js |1 + loleaflet/src/control/Control.Menubar.js| 10 +- loleaflet/src/control/Control.RowHeader.js |2 +- loleaflet/src/control/Control.Tabs.js |2 +- 7 files changed, 13 insertions(+), 14 deletions(-) New commits: commit 41361cbe7f1793cdf5aa0c576747b095a692a94c Author: Jan HolesovskyDate: Fri Jan 5 13:49:50 2018 +0100 Fix various JS warnings. Change-Id: I6042781141eed9fbbdb452337e7bb0b18803fa1b Reviewed-on: https://gerrit.libreoffice.org/47469 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 99818f9a..e351d940 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -2,8 +2,7 @@ * LibreOffice Online toolbar */ -/* global $ map closebutton w2ui w2utils vex _ */ - +/* global $ map closebutton w2ui w2utils vex _ _UNO */ var mobileWidth = 768; function onDelete(e) { @@ -1072,8 +1071,8 @@ map.on('doclayerinit', function () { { func: '32', text: _('Minimum'), icon: ''}, { func: '512', text: _('Sum'), icon: 'selected'}, { func: '8192', text: _('Selection count'), icon: ''}, - { func: '1', text: _('None'), icon: ''}, - ]}, + { func: '1', text: _('None'), icon: ''} + ]} ]); // Remove irrelevant toolbars diff --git a/loleaflet/src/admin/AdminSocketAnalytics.js b/loleaflet/src/admin/AdminSocketAnalytics.js index 397dfdf3..0d28f662 100644 --- a/loleaflet/src/admin/AdminSocketAnalytics.js +++ b/loleaflet/src/admin/AdminSocketAnalytics.js @@ -3,8 +3,7 @@ containing various graphs to show to the user on specified interval */ -/* global d3 Util AdminSocketBase */ -/* eslint no-unused-vars:0 */ +/* global _ d3 Util AdminSocketBase $ Admin */ var AdminSocketAnalytics = AdminSocketBase.extend({ constructor: function(host) { this.base(host); diff --git a/loleaflet/src/control/Control.ColumnHeader.js b/loleaflet/src/control/Control.ColumnHeader.js index bc9d362d..ddb51d6c 100644 --- a/loleaflet/src/control/Control.ColumnHeader.js +++ b/loleaflet/src/control/Control.ColumnHeader.js @@ -2,7 +2,7 @@ * Control.ColumnHeader */ -/* global $ _ */ +/* global $ _UNO */ L.Control.ColumnHeader = L.Control.Header.extend({ options: { cursor: 'col-resize' diff --git a/loleaflet/src/control/Control.DocumentRepair.js b/loleaflet/src/control/Control.DocumentRepair.js index bbd3b20b..aafe9deb 100644 --- a/loleaflet/src/control/Control.DocumentRepair.js +++ b/loleaflet/src/control/Control.DocumentRepair.js @@ -2,6 +2,7 @@ * L.Control.DocumentRepair. */ +/* global $ _ _UNO */ L.Control.DocumentRepair = L.Control.extend({ options: { position: 'topright' diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index eb9ffc60..c863eeec 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -11,7 +11,7 @@ L.Control.Menubar = L.Control.extend({ {name: _UNO('.uno:EditMenu'), disabled: true}, {name: _UNO('.uno:ViewMenu'), disabled: true}, {name: _UNO('.uno:InsertMenu'), disabled: true}, - {name: _UNO('.uno:ToolsMenu'), disabled: true}, + {name: _UNO('.uno:ToolsMenu'), disabled: true} ], text: [ {name: _UNO('.uno:PickList', 'text'), id: 'file', type: 'menu', menu: [ @@ -47,7 +47,7 @@ L.Control.Menubar = L.Control.extend({ {uno: '.uno:PreviousTrackedChange'}, {uno: '.uno:NextTrackedChange'} ]}, - {uno: '.uno:EditStyle'}, + {uno: '.uno:EditStyle'} ]}, {name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [ {name: _UNO('.uno:FullScreen', 'text'), id: 'fullscreen', type: 'action'}, @@ -56,7 +56,7 @@ L.Control.Menubar = L.Control.extend({ {name: _UNO('.uno:ZoomMinus', 'text'), id: 'zoomout', type: 'action'}, {name: _('Reset zoom'), id: 'zoomreset', type: 'action'}, {type: 'separator'}, -
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/src
loleaflet/dist/loleaflet.css |1 + loleaflet/src/control/Control.LokDialog.js |1 + 2 files changed, 2 insertions(+) New commits: commit 5d190a3a363aacbc6eee4ac218fed7db956695bf Author: Pranav KantDate: Sat Dec 23 17:57:00 2017 +0530 loleaflet: '/' or backspace launches browser-specific actions Make the canvas contentEditable which prevents such actions from being invoked. Other alternative would be to add a dummy text field but this seems to do the work as well. Change-Id: I8d39f06b02959459e0beeebad2eefcd8e9e00d9d Reviewed-on: https://gerrit.libreoffice.org/47069 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css index 7c054c33..38d9383e 100644 --- a/loleaflet/dist/loleaflet.css +++ b/loleaflet/dist/loleaflet.css @@ -349,5 +349,6 @@ body { } .lokdialog_canvas { +cursor: default; display: block; /* required to remove all borders around canvas element */ } diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js index 0f3dc49f..4abf350b 100644 --- a/loleaflet/src/control/Control.LokDialog.js +++ b/loleaflet/src/control/Control.LokDialog.js @@ -187,6 +187,7 @@ L.Control.LokDialog = L.Control.extend({ dialogCanvas.width = width; dialogCanvas.height = height; dialogCanvas.tabIndex = '0'; + dialogCanvas.contentEditable = true; dialogCanvas.id = strDlgId + '-canvas'; var that = this; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/src loleaflet/unocommands.js scripts/unocommands.py
loleaflet/dist/l10n/uno/af.json |4 loleaflet/dist/l10n/uno/am.json |8 loleaflet/dist/l10n/uno/ar.json |8 loleaflet/dist/l10n/uno/as.json |4 loleaflet/dist/l10n/uno/ast.json |4 loleaflet/dist/l10n/uno/be.json |4 loleaflet/dist/l10n/uno/bg.json |8 loleaflet/dist/l10n/uno/bn-IN.json|4 loleaflet/dist/l10n/uno/bn.json |4 loleaflet/dist/l10n/uno/bo.json |4 loleaflet/dist/l10n/uno/br.json |8 loleaflet/dist/l10n/uno/brx.json |3 +++ loleaflet/dist/l10n/uno/bs.json |4 loleaflet/dist/l10n/uno/ca-valencia.json |5 + loleaflet/dist/l10n/uno/ca.json |8 loleaflet/dist/l10n/uno/cs.json |8 loleaflet/dist/l10n/uno/cy.json |8 loleaflet/dist/l10n/uno/da.json |8 loleaflet/dist/l10n/uno/de.json |8 loleaflet/dist/l10n/uno/dgo.json |4 loleaflet/dist/l10n/uno/dz.json |5 + loleaflet/dist/l10n/uno/el.json |8 loleaflet/dist/l10n/uno/en-GB.json|8 loleaflet/dist/l10n/uno/en-ZA.json|4 loleaflet/dist/l10n/uno/eo.json |8 loleaflet/dist/l10n/uno/es.json |8 loleaflet/dist/l10n/uno/et.json |8 loleaflet/dist/l10n/uno/eu.json |8 loleaflet/dist/l10n/uno/fa.json |3 +++ loleaflet/dist/l10n/uno/fi.json |8 loleaflet/dist/l10n/uno/fr.json |8 loleaflet/dist/l10n/uno/ga.json |5 + loleaflet/dist/l10n/uno/gd.json |8 loleaflet/dist/l10n/uno/gl.json |8 loleaflet/dist/l10n/uno/gu.json |4 loleaflet/dist/l10n/uno/gug.json |9 + loleaflet/dist/l10n/uno/he.json |4 loleaflet/dist/l10n/uno/hi.json |4 loleaflet/dist/l10n/uno/hr.json |8 loleaflet/dist/l10n/uno/hu.json |8 loleaflet/dist/l10n/uno/id.json |8 loleaflet/dist/l10n/uno/is.json |8 loleaflet/dist/l10n/uno/it.json |8 loleaflet/dist/l10n/uno/ja.json |8 loleaflet/dist/l10n/uno/ka.json |4 loleaflet/dist/l10n/uno/kk.json |8 loleaflet/dist/l10n/uno/km.json |4 loleaflet/dist/l10n/uno/kmr-Latn.json |5 + loleaflet/dist/l10n/uno/kn.json |4 loleaflet/dist/l10n/uno/ko.json |5 + loleaflet/dist/l10n/uno/kok.json |4 loleaflet/dist/l10n/uno/ks.json |3 +++ loleaflet/dist/l10n/uno/lo.json |3 +++ loleaflet/dist/l10n/uno/lt.json |8 loleaflet/dist/l10n/uno/lv.json |8 loleaflet/dist/l10n/uno/mai.json |3 +++ loleaflet/dist/l10n/uno/mk.json |5 + loleaflet/dist/l10n/uno/ml.json |4 loleaflet/dist/l10n/uno/mn.json |5 + loleaflet/dist/l10n/uno/mni.json |3 +++ loleaflet/dist/l10n/uno/mr.json |4 loleaflet/dist/l10n/uno/my.json |5 + loleaflet/dist/l10n/uno/nb.json |8 loleaflet/dist/l10n/uno/ne.json |4 loleaflet/dist/l10n/uno/nl.json |8 loleaflet/dist/l10n/uno/nn.json |8 loleaflet/dist/l10n/uno/nr.json |2 ++ loleaflet/dist/l10n/uno/nso.json |4 loleaflet/dist/l10n/uno/oc.json |8 loleaflet/dist/l10n/uno/om.json |4 loleaflet/dist/l10n/uno/or.json |4 loleaflet/dist/l10n/uno/pa-IN.json|4 loleaflet/dist/l10n/uno/pl.json |8 loleaflet/dist/l10n/uno/pt-BR.json|8 loleaflet/dist/l10n/uno/pt.json |8 loleaflet/dist/l10n/uno/ro.json |8 loleaflet/dist/l10n/uno/ru.json |8 loleaflet/dist/l10n/uno/rw.json |4 loleaflet/dist/l10n/uno/sa-IN.json|4 loleaflet/dist/l10n/uno/sat.json |3 +++ loleaflet/dist/l10n/uno/sd.json |4 loleaflet/dist/l10n/uno/si.json |4
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/src loleaflet/unocommands.js scripts/unocommands.py
loleaflet/dist/l10n/uno/af.json | 49 ++- loleaflet/dist/l10n/uno/am.json | 109 --- loleaflet/dist/l10n/uno/ar.json | 109 --- loleaflet/dist/l10n/uno/as.json | 54 ++- loleaflet/dist/l10n/uno/ast.json | 54 ++- loleaflet/dist/l10n/uno/be.json | 36 +- loleaflet/dist/l10n/uno/bg.json | 109 --- loleaflet/dist/l10n/uno/bn-IN.json | 54 ++- loleaflet/dist/l10n/uno/bn.json | 51 ++- loleaflet/dist/l10n/uno/bo.json | 49 ++- loleaflet/dist/l10n/uno/br.json | 84 +++-- loleaflet/dist/l10n/uno/brx.json | 43 ++ loleaflet/dist/l10n/uno/bs.json | 54 ++- loleaflet/dist/l10n/uno/ca-valencia.json | 75 +++- loleaflet/dist/l10n/uno/ca.json | 109 --- loleaflet/dist/l10n/uno/cs.json | 109 --- loleaflet/dist/l10n/uno/cy.json | 109 --- loleaflet/dist/l10n/uno/da.json | 109 --- loleaflet/dist/l10n/uno/de.json | 109 --- loleaflet/dist/l10n/uno/dgo.json | 48 ++- loleaflet/dist/l10n/uno/dz.json | 49 ++- loleaflet/dist/l10n/uno/el.json | 109 --- loleaflet/dist/l10n/uno/en-GB.json | 109 --- loleaflet/dist/l10n/uno/en-ZA.json | 50 ++- loleaflet/dist/l10n/uno/eo.json | 109 --- loleaflet/dist/l10n/uno/es.json | 109 --- loleaflet/dist/l10n/uno/et.json | 109 --- loleaflet/dist/l10n/uno/eu.json | 109 --- loleaflet/dist/l10n/uno/fa.json | 45 +- loleaflet/dist/l10n/uno/fi.json | 109 --- loleaflet/dist/l10n/uno/fr.json | 109 --- loleaflet/dist/l10n/uno/ga.json | 56 ++- loleaflet/dist/l10n/uno/gd.json | 109 --- loleaflet/dist/l10n/uno/gl.json | 109 --- loleaflet/dist/l10n/uno/gu.json | 54 ++- loleaflet/dist/l10n/uno/gug.json | 96 -- loleaflet/dist/l10n/uno/he.json | 66 +++- loleaflet/dist/l10n/uno/hi.json | 53 ++- loleaflet/dist/l10n/uno/hr.json | 91 - loleaflet/dist/l10n/uno/hu.json | 109 --- loleaflet/dist/l10n/uno/id.json | 84 +++-- loleaflet/dist/l10n/uno/is.json | 109 --- loleaflet/dist/l10n/uno/it.json | 109 --- loleaflet/dist/l10n/uno/ja.json | 91 - loleaflet/dist/l10n/uno/ka.json | 52 ++- loleaflet/dist/l10n/uno/kk.json | 109 --- loleaflet/dist/l10n/uno/km.json | 54 ++- loleaflet/dist/l10n/uno/kmr-Latn.json| 48 ++- loleaflet/dist/l10n/uno/kn.json | 53 ++- loleaflet/dist/l10n/uno/ko.json | 63 ++-- loleaflet/dist/l10n/uno/kok.json | 47 ++- loleaflet/dist/l10n/uno/ks.json | 43 ++ loleaflet/dist/l10n/uno/lo.json | 44 +- loleaflet/dist/l10n/uno/lt.json | 109 --- loleaflet/dist/l10n/uno/lv.json | 109 --- loleaflet/dist/l10n/uno/mai.json | 43 ++ loleaflet/dist/l10n/uno/mk.json | 49 ++- loleaflet/dist/l10n/uno/ml.json | 53 ++- loleaflet/dist/l10n/uno/mn.json | 49 ++- loleaflet/dist/l10n/uno/mni.json | 46 ++- loleaflet/dist/l10n/uno/mr.json | 53 ++- loleaflet/dist/l10n/uno/my.json | 51 ++- loleaflet/dist/l10n/uno/nb.json | 109 --- loleaflet/dist/l10n/uno/ne.json | 52 ++- loleaflet/dist/l10n/uno/nl.json | 109 --- loleaflet/dist/l10n/uno/nn.json | 109 --- loleaflet/dist/l10n/uno/nr.json | 27 + loleaflet/dist/l10n/uno/nso.json | 49 ++- loleaflet/dist/l10n/uno/oc.json | 108 --- loleaflet/dist/l10n/uno/om.json | 49 ++- loleaflet/dist/l10n/uno/or.json | 53 ++- loleaflet/dist/l10n/uno/pa-IN.json | 52 ++- loleaflet/dist/l10n/uno/pl.json | 109 --- loleaflet/dist/l10n/uno/pt-BR.json | 109 --- loleaflet/dist/l10n/uno/pt.json | 109 --- loleaflet/dist/l10n/uno/ro.json | 92 -- loleaflet/dist/l10n/uno/ru.json | 109 --- loleaflet/dist/l10n/uno/rw.json | 48 ++- loleaflet/dist/l10n/uno/sa-IN.json | 48 ++- loleaflet/dist/l10n/uno/sat.json | 21 - loleaflet/dist/l10n/uno/sd.json | 44 ++ loleaflet/dist/l10n/uno/si.json | 50 ++- loleaflet/dist/l10n/uno/sid.json | 53 ++- loleaflet/dist/l10n/uno/sk.json | 109 --- loleaflet/dist/l10n/uno/sl.json | 109 ---
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/src
loleaflet/dist/spreadsheet.css| 27 +- loleaflet/src/control/Control.ColumnHeader.js | 265 +++ loleaflet/src/control/Control.Header.js | 347 -- loleaflet/src/control/Control.Menubar.js |9 loleaflet/src/control/Control.RowHeader.js| 248 +++--- loleaflet/src/control/Control.Scroll.js |5 loleaflet/src/dom/DomUtil.js | 12 loleaflet/src/layer/tile/CalcTileLayer.js |4 8 files changed, 788 insertions(+), 129 deletions(-) New commits: commit 6311305822aec8d1e94212a1a98f188b850be0eb Author: Marco CecchettiDate: Mon Nov 27 19:37:53 2017 +0100 calc: outline and groups handling Change-Id: Ie7dcb9a742344e6b0a8813faebc589167a457261 Reviewed-on: https://gerrit.libreoffice.org/45418 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css index 8435b271..e97f6041 100644 --- a/loleaflet/dist/spreadsheet.css +++ b/loleaflet/dist/spreadsheet.css @@ -59,7 +59,7 @@ } #spreadsheet-row-column-frame { -position: absolute; + position: absolute; left: 0; right: 0; top: 103px; @@ -70,7 +70,7 @@ top: 30px; } -.spreadsheet-header-corner { +#spreadsheet-header-corner-container { border: 1px solid darkgrey; background-color: lightgrey; cursor: pointer; @@ -84,7 +84,26 @@ height: 19px; } -.spreadsheet-header-columns-container { +#spreadsheet-header-corner { + display: inline-block; + white-space: nowrap; + width: 100%; + height: 100%; + border-spacing: 0px !important; + position: relative; + margin: 0px; + padding: 0px; + } + +.spreadsheet-header-corner-styles { + border: 1px solid darkgray; + font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif; + color: black; + background-color: lightgray; + cursor: pointer; + } + +#spreadsheet-header-columns-container { border: 1px solid darkgrey; background-color: lightgrey; @@ -130,7 +149,7 @@ cursor: col-resize; } -.spreadsheet-header-rows-container { +#spreadsheet-header-rows-container { border: 1px solid darkgrey; background-color: lightgrey; diff --git a/loleaflet/src/control/Control.ColumnHeader.js b/loleaflet/src/control/Control.ColumnHeader.js index 264fea4d..ae95f183 100644 --- a/loleaflet/src/control/Control.ColumnHeader.js +++ b/loleaflet/src/control/Control.ColumnHeader.js @@ -15,38 +15,44 @@ L.Control.ColumnHeader = L.Control.Header.extend({ _initialize: function () { this._initialized = true; + this._isColumn = true; this._map.on('scrolloffset', this.offsetScrollPosition, this); this._map.on('updatescrolloffset', this.setScrollPosition, this); this._map.on('viewrowcolumnheaders', this.viewRowColumnHeaders, this); this._map.on('updateselectionheader', this._onUpdateSelection, this); this._map.on('clearselectionheader', this._onClearSelection, this); this._map.on('updatecurrentheader', this._onUpdateCurrentColumn, this); + this._map.on('updatecornerheader', this.drawCornerHeader, this); var rowColumnFrame = L.DomUtil.get('spreadsheet-row-column-frame'); - var cornerHeader = L.DomUtil.create('div', 'spreadsheet-header-corner', rowColumnFrame); - L.DomEvent.on(cornerHeader, 'contextmenu', L.DomEvent.preventDefault); - L.DomEvent.addListener(cornerHeader, 'click', this._onCornerHeaderClick, this); - this._headersContainer = L.DomUtil.create('div', 'spreadsheet-header-columns-container', rowColumnFrame); + this._headerContainer = L.DomUtil.createWithId('div', 'spreadsheet-header-columns-container', rowColumnFrame); this._initHeaderEntryStyles('spreadsheet-header-column'); this._initHeaderEntryHoverStyles('spreadsheet-header-column-hover'); this._initHeaderEntrySelectedStyles('spreadsheet-header-column-selected'); this._initHeaderEntryResizeStyles('spreadsheet-header-column-resize'); - this._headerCanvas = L.DomUtil.create('canvas', 'spreadsheet-header-columns', this._headersContainer); - this._canvasContext = this._headerCanvas.getContext('2d'); - this._headerCanvas.width = parseInt(L.DomUtil.getStyle(this._headersContainer, 'width')); - this._headerCanvas.height = parseInt(L.DomUtil.getStyle(this._headersContainer, 'height')); + this._canvas = L.DomUtil.create('canvas', 'spreadsheet-header-columns', this._headerContainer); +