[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 Castro Date: 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/dist/toolbar.css|3 ++- loleaflet/dist/toolbar/toolbar.js |4 2 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 093dd959f0737cb060e1a99fdf274b0be051982d Author: Aditya Dewan Date: Sat Dec 16 02:15:35 2017 +0530 show/hide of document name on top right Change-Id: I83ae0256c0fdd1c9f61495638ecf9d69f5473790 Reviewed-on: https://gerrit.libreoffice.org/46576 Reviewed-by: pranavk Tested-by: pranavk (cherry picked from commit 30b44bf37349f9a0d42182f018f377d6d3ce9066) (cherry picked from commit 49bbe4367ff65264677e05ca1fa0744d7b8c90b3) Reviewed-on: https://gerrit.libreoffice.org/48376 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css index 6564ae95..a00694d7 100644 --- a/loleaflet/dist/toolbar.css +++ b/loleaflet/dist/toolbar.css @@ -79,7 +79,7 @@ top: 2px; width: 200px; font-size: 16px; -//font-weight: bold; +padding-right: 20px; border: 1px solid transparent; background-color: transparent; } @@ -95,6 +95,7 @@ background-image: url('../images/lc_editdoc.svg'); background-position: right; background-repeat: no-repeat; +padding-right: 20px; } #closebuttonwrapper { diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index db7e9b67..d083e4d6 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -73,6 +73,8 @@ function _mobilify() { oneUser = '1'; noUser = '0'; updateUserListCount(); + + $('#document-name-input').hide(); } function _unmobilify() { @@ -104,6 +106,8 @@ function _unmobilify() { oneUser = _('1 user'); noUser = _('0 users'); updateUserListCount(); + + $('#document-name-input').show(); } function resizeToolbar() { ___ 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/dist/toolbar/toolbar.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 72ea966c271129ce3e776e707ca8258b37fe9c99 Author: Pranav Kant Date: Thu Feb 15 13:23:20 2018 +0530 loleaflet: Hide items from correct toolbar Change-Id: I3020f01d693ad2f99202f8a99a7efb9eadc25158 (cherry picked from commit 11673e589d1faaea2d84288eeb958ac5c793e824) Reviewed-on: https://gerrit.libreoffice.org/49800 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index d9f5da21..db7e9b67 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -57,7 +57,7 @@ function _mobilify() { } for (itemIdx in toolbarUpMore.items) { id = toolbarUpMore.items[itemIdx].id; - if (toolbarUpMobileItems.indexOf(id) === -1 && toolbarUp.get(id) && !toolbarUp.get(id).hidden) { + if (toolbarUpMobileItems.indexOf(id) === -1 && toolbarUpMore.get(id) && !toolbarUpMore.get(id).hidden) { toolbarUpMore.hide(id); } } ___ 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 Kant Date: 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/dist/toolbar/toolbar.js |2 ++ 1 file changed, 2 insertions(+) New commits: commit 341afa6dc368dae8c57d3243b6e1d18c5c10a04f Author: Pranav Kant Date: Thu Feb 15 11:55:40 2018 +0530 Fix some buttons doesn't show up in mobile mode Change-Id: I25ceecc56e2dae9a0b31e038412c7b74447c391f (cherry picked from commit c470116012eaf1ee47c4dc77c92eca125dd70577) Reviewed-on: https://gerrit.libreoffice.org/49786 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index fc6cb8dc..d9f5da21 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -117,6 +117,8 @@ function resizeToolbar() { _unmobilify(); } + toolbarUp.refresh(); + toolbarUpMore.refresh(); // move items from toolbar-up-more -> toolbar-up while ($('#toolbar-up')[0].scrollWidth <= $(window).width()) { var item = toolbarUpMore.items[0]; ___ 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/dist/toolbar/toolbar.js |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 198f3e7356684b97a658ab51a7553ca8319dd761 Author: Pranav Kant Date: Fri Feb 2 21:37:58 2018 +0530 loleaflet: Don't try to translate command names Command names are sent to loleaflet in already translated form when there are appropriate langpacks installed in the system. Only translate when we can. Change-Id: I92dc5865da85c76bd5a2529b0e6df994937c4c28 (cherry picked from commit 34aed93d839f99f46874ae744fa95c269f086d9e) Reviewed-on: https://gerrit.libreoffice.org/49157 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 47b3ef88..fc6cb8dc 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -1375,7 +1375,12 @@ function updateCommandValues() { data = data.concat({text: '\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true}); commands.forEach(function (command) { - data = data.concat({id: command.id, text: L.Styles.styleMappings[command.text].toLocaleString()}); + var translated = command.text; + if (L.Styles.styleMappings[command.text]) { + // if it's in English, translate it + translated = L.Styles.styleMappings[command.text].toLocaleString(); + } + data = data.concat({id: command.id, text: translated }); }, 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/dist/toolbar/toolbar.js | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) New commits: commit 178de645040524f54454d6c3ab9f32f9309c0bf4 Author: Henry Castro Date: Wed Jun 28 17:06:12 2017 -0400 loleaflet: .uno:DocumentRepair state is reported by LOKit Change-Id: I457c607055bfde8ec68c81cf3b9b2f5a80a4b345 Reviewed-on: https://gerrit.libreoffice.org/39376 Reviewed-by: Henry Castro Tested-by: Henry Castro Reviewed-on: https://gerrit.libreoffice.org/47916 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 683fa418..47b3ef88 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -1307,6 +1307,13 @@ map.on('commandstatechanged', function (e) { state = toLocalePattern('Slide %1 of %2', 'Slide (\\d+) of (\\d+)', state, '%1', '%2'); updateToolbarItem(statusbar, 'PageStatus', $('#PageStatus').html(state ? state : ' ').parent().html()); } + else if (commandName === '.uno:DocumentRepair') { + if (state === 'true') { + toolbar.enable('repair'); + } else { + toolbar.disable('repair'); + } + } var id = unoCmdToToolbarId(commandName); if (state === 'true') { @@ -1333,12 +1340,6 @@ map.on('commandstatechanged', function (e) { toolbarUpMore.disable(id); } } - - if (id === 'undo' || id === 'redo') { - if (!toolbar.get('undo').disabled || !toolbar.get('redo').disabled) { - toolbar.enable('repair'); - } - } }); map.on('search', function (e) { ___ 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/dist/loleaflet.css |5 + 1 file changed, 5 insertions(+) New commits: commit f3cb71180b5814eb36f0e0bfaac77f7f8b758841 Author: Pranav Kant Date: Fri Jan 12 18:19:50 2018 +0530 loleaflet: Don't allow selecting the dialog canvas Change-Id: I8c88183f0fbb29b5cd815240105153b71c5eb2ce Reviewed-on: https://gerrit.libreoffice.org/47808 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css index 79e04619..57185f0e 100644 --- a/loleaflet/dist/loleaflet.css +++ b/loleaflet/dist/loleaflet.css @@ -352,4 +352,9 @@ body { cursor: default; display: block; /* required to remove all borders around canvas element */ caret-color: transparent; /* firefox shows a caret otherwise on top-left of the canvas */ +user-select: none; +-moz-user-select: none; +-khtml-user-select: none; +-webkit-user-select: none; +-o-user-select: none; } ___ 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/dist/loleaflet.css |1 + 1 file changed, 1 insertion(+) New commits: commit 57621181fd3f1ca774129fb31a939114333f97f1 Author: Pranav Kant Date: Fri Jan 12 18:14:16 2018 +0530 loleaflet: hide the caret on dialog canvas Otherwise, on firefox, when the dialog canvas has the focus, a caret different from the one overlayed by LOK, is shown. Change-Id: Ie38aae59f01a3811becca0bcf50c9d7d240bfa9b Reviewed-on: https://gerrit.libreoffice.org/47807 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css index 38d9383e..79e04619 100644 --- a/loleaflet/dist/loleaflet.css +++ b/loleaflet/dist/loleaflet.css @@ -351,4 +351,5 @@ body { .lokdialog_canvas { cursor: default; display: block; /* required to remove all borders around canvas element */ +caret-color: transparent; /* firefox shows a caret otherwise on top-left of the canvas */ } ___ 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 Holesovsky Date: 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'}, - {uno: '.uno:ControlCodes'}, + {uno: '.uno:Co
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/unocommands.js
loleaflet/dist/l10n/uno/af.json |3 +++ loleaflet/dist/l10n/uno/am.json |3 +++ loleaflet/dist/l10n/uno/ar.json |3 +++ loleaflet/dist/l10n/uno/as.json |3 +++ loleaflet/dist/l10n/uno/ast.json |3 +++ loleaflet/dist/l10n/uno/be.json |1 + loleaflet/dist/l10n/uno/bg.json |3 +++ loleaflet/dist/l10n/uno/bn-IN.json |3 +++ loleaflet/dist/l10n/uno/bn.json |3 +++ loleaflet/dist/l10n/uno/bo.json |3 +++ loleaflet/dist/l10n/uno/br.json |3 +++ loleaflet/dist/l10n/uno/brx.json |3 +++ loleaflet/dist/l10n/uno/bs.json |3 +++ loleaflet/dist/l10n/uno/ca-valencia.json |3 +++ loleaflet/dist/l10n/uno/ca.json |3 +++ loleaflet/dist/l10n/uno/cs.json |3 +++ loleaflet/dist/l10n/uno/cy.json |3 +++ loleaflet/dist/l10n/uno/da.json |3 +++ loleaflet/dist/l10n/uno/de.json |3 +++ loleaflet/dist/l10n/uno/dgo.json |3 +++ loleaflet/dist/l10n/uno/dz.json |3 +++ loleaflet/dist/l10n/uno/el.json |3 +++ loleaflet/dist/l10n/uno/en-GB.json |3 +++ loleaflet/dist/l10n/uno/en-ZA.json |3 +++ loleaflet/dist/l10n/uno/eo.json |3 +++ loleaflet/dist/l10n/uno/es.json |3 +++ loleaflet/dist/l10n/uno/et.json |3 +++ loleaflet/dist/l10n/uno/eu.json |3 +++ loleaflet/dist/l10n/uno/fa.json |3 +++ loleaflet/dist/l10n/uno/fi.json |3 +++ loleaflet/dist/l10n/uno/fr.json |3 +++ loleaflet/dist/l10n/uno/ga.json |3 +++ loleaflet/dist/l10n/uno/gd.json |3 +++ loleaflet/dist/l10n/uno/gl.json |3 +++ loleaflet/dist/l10n/uno/gu.json |3 +++ loleaflet/dist/l10n/uno/gug.json |3 +++ loleaflet/dist/l10n/uno/he.json |3 +++ loleaflet/dist/l10n/uno/hi.json |3 +++ loleaflet/dist/l10n/uno/hr.json |3 +++ loleaflet/dist/l10n/uno/hu.json |3 +++ loleaflet/dist/l10n/uno/id.json |3 +++ loleaflet/dist/l10n/uno/is.json |3 +++ loleaflet/dist/l10n/uno/it.json |3 +++ loleaflet/dist/l10n/uno/ja.json |3 +++ loleaflet/dist/l10n/uno/ka.json |3 +++ loleaflet/dist/l10n/uno/kk.json |3 +++ loleaflet/dist/l10n/uno/km.json |3 +++ loleaflet/dist/l10n/uno/kmr-Latn.json|3 +++ loleaflet/dist/l10n/uno/kn.json |3 +++ loleaflet/dist/l10n/uno/ko.json |3 +++ loleaflet/dist/l10n/uno/kok.json |3 +++ loleaflet/dist/l10n/uno/ks.json |3 +++ loleaflet/dist/l10n/uno/lb.json |1 + loleaflet/dist/l10n/uno/lo.json |3 +++ loleaflet/dist/l10n/uno/lt.json |3 +++ loleaflet/dist/l10n/uno/lv.json |3 +++ loleaflet/dist/l10n/uno/mai.json |3 +++ loleaflet/dist/l10n/uno/mk.json |3 +++ loleaflet/dist/l10n/uno/ml.json |3 +++ loleaflet/dist/l10n/uno/mn.json |3 +++ loleaflet/dist/l10n/uno/mni.json |3 +++ loleaflet/dist/l10n/uno/mr.json |3 +++ loleaflet/dist/l10n/uno/my.json |3 +++ loleaflet/dist/l10n/uno/nb.json |3 +++ loleaflet/dist/l10n/uno/ne.json |3 +++ loleaflet/dist/l10n/uno/nl.json |3 +++ loleaflet/dist/l10n/uno/nn.json |3 +++ loleaflet/dist/l10n/uno/nr.json |1 + loleaflet/dist/l10n/uno/nso.json |3 +++ loleaflet/dist/l10n/uno/oc.json |3 +++ loleaflet/dist/l10n/uno/om.json |3 +++ loleaflet/dist/l10n/uno/or.json |3 +++ loleaflet/dist/l10n/uno/pa-IN.json |3 +++ loleaflet/dist/l10n/uno/pl.json |3 +++ loleaflet/dist/l10n/uno/pt-BR.json |3 +++ loleaflet/dist/l10n/uno/pt.json |3 +++ loleaflet/dist/l10n/uno/ro.json |3 +++ loleaflet/dist/l10n/uno/ru.json |3 +++ loleaflet/dist/l10n/uno/rw.json |3 +++ loleaflet/dist/l10n/uno/sa-IN.json |3 +++ loleaflet/dist/l10n/uno/sat.json |1 + loleaflet/dist/l10n/uno/sd.json |3 +++ loleaflet/dist/l10n/uno/si.json |3 +++ loleaflet/dist/l10n/uno/sid.json |3 +++ loleaflet/dist/l10n/uno/sk.json |3 +++ loleaflet/dist/l10n/uno/sl.json |3 +++ loleaflet/dist/l10n/uno/sq.json |3 +++ loleaflet/dist/l10n/uno/sr-Latn.json |3 +++ loleaflet/dist/l10n/uno/sr.json |3 +++ loleaflet/dist/l10n/uno/ss.json |1 + loleaflet/dist/l10n/uno/st.json |1 + loleaflet/dist/l10n/uno/sv.json |3 +++ loleaflet/dist/l10n/uno/sw-TZ.json |3 +++ loleaflet/dist/l10n/uno/ta.json |3 +++ loleaflet/dist/l10n/uno/te.j
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit 26f1889dc11d357bc980bd60ed83dd8a5f016479 Author: Andras Timar Date: Wed Dec 27 22:17:22 2017 +0100 localize StateTableCell status bar string (Sum, Average, Count, etc.) Change-Id: Ie4d6197115f8f8290f1d6f8608acf2e3e3642c79 Reviewed-on: https://gerrit.libreoffice.org/47109 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 35fc4f35..aae417c2 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -707,6 +707,20 @@ var userJoinedPopupMessage = '' + _('%user has joined') + ''; var userLeftPopupMessage = '' + _('%user has left') + ''; var userPopupTimeout = null; +function localizeStateTableCell (text) { + var stateArray = text.split(';'); + var stateArrayLength = stateArray.length; + var localizedText = ''; + for (var i = 0; i < stateArrayLength; i++) { + var labelValuePair = stateArray[i].split(':'); + localizedText += _(labelValuePair[0].trim()) + ':' + labelValuePair[1]; + if (stateArrayLength > 1 && i < stateArrayLength - 1) { + localizedText += '; '; + } + } + return localizedText; +} + function toLocalePattern (pattern, regex, text, sub1, sub2) { var matches = new RegExp(regex, 'g').exec(text); if (matches) { @@ -1275,7 +1289,7 @@ map.on('commandstatechanged', function (e) { updateToolbarItem(statusbar, 'StatusSelectionMode', $('#StatusSelectionMode').html(state ? L.Styles.selectionMode[state].toLocaleString() : ' ').parent().html()); } else if (commandName == '.uno:StateTableCell') { - updateToolbarItem(statusbar, 'StateTableCell', $('#StateTableCell').html(state ? state : ' ').parent().html()); + updateToolbarItem(statusbar, 'StateTableCell', $('#StateTableCell').html(state ? localizeStateTableCell(state) : ' ').parent().html()); } else if (commandName === '.uno:StatusBarFunc') { if (state) { ___ 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/po
loleaflet/dist/toolbar/toolbar.js |1 + loleaflet/po/styles/am.po |4 loleaflet/po/styles/ar.po |4 loleaflet/po/styles/bg.po |4 loleaflet/po/styles/br.po |4 loleaflet/po/styles/ca-valencia.po |4 loleaflet/po/styles/ca.po |4 loleaflet/po/styles/cs.po |4 loleaflet/po/styles/cy.po |4 loleaflet/po/styles/da.po |4 loleaflet/po/styles/de.po |4 loleaflet/po/styles/el.po |4 loleaflet/po/styles/eo.po |4 loleaflet/po/styles/es.po |4 loleaflet/po/styles/et.po |4 loleaflet/po/styles/eu.po |4 loleaflet/po/styles/fi.po |4 loleaflet/po/styles/fr.po |4 loleaflet/po/styles/gd.po |4 loleaflet/po/styles/gl.po |4 loleaflet/po/styles/gug.po |4 loleaflet/po/styles/hr.po |4 loleaflet/po/styles/hu.po |4 loleaflet/po/styles/id.po |4 loleaflet/po/styles/is.po |4 loleaflet/po/styles/it.po |4 loleaflet/po/styles/kk.po |4 loleaflet/po/styles/lt.po |4 loleaflet/po/styles/lv.po |4 loleaflet/po/styles/nb.po |4 loleaflet/po/styles/nl.po |4 loleaflet/po/styles/nn.po |4 loleaflet/po/styles/oc.po |4 loleaflet/po/styles/pl.po |4 loleaflet/po/styles/pt-BR.po |4 loleaflet/po/styles/pt.po |4 loleaflet/po/styles/ro.po |4 loleaflet/po/styles/ru.po |4 loleaflet/po/styles/sk.po |4 loleaflet/po/styles/sl.po |4 loleaflet/po/styles/sv.po |4 loleaflet/po/styles/ta.po |4 loleaflet/po/styles/tr.po |4 loleaflet/po/styles/ug.po |4 loleaflet/po/styles/uk.po |4 loleaflet/po/styles/zh-CN.po |4 loleaflet/po/styles/zh-TW.po |4 47 files changed, 185 insertions(+) New commits: commit ac1902b1907fa462220eb04bb204af64a5ea7725 Author: Andras Timar Date: Thu Dec 21 22:27:10 2017 +0100 Add translations for '$1 of $2 records found' in Calc status bar Change-Id: I75184f43d5135851757f622410c99cc9dad34c11 Reviewed-on: https://gerrit.libreoffice.org/46935 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index a475f67a..35fc4f35 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -1264,6 +1264,7 @@ map.on('commandstatechanged', function (e) { } else if (commandName === '.uno:RowColSelCount') { state = toLocalePattern('$1 rows, $2 columns selected', '(\\d+) rows, (\\d+) columns selected', state, '$1', '$2'); + state = toLocalePattern('$1 of $2 records found', '(\\d+) of (\\d+) records found', state, '$1', '$2'); updateToolbarItem(statusbar, 'RowColSelCount', $('#RowColSelCount').html(state ? state : ' ').parent().html()); } else if (commandName === '.uno:InsertMode') { diff --git a/loleaflet/po/styles/am.po b/loleaflet/po/styles/am.po index 699e369a..b3c11965 100644 --- a/loleaflet/po/styles/am.po +++ b/loleaflet/po/styles/am.po @@ -2055,3 +2055,7 @@ msgstr "áá¨áá³áá (ááªá¸áµ)" #: resource.src msgid "None (Do not check spelling)" msgstr "ááá (áá°áá á á³áá)" + +#: globstr.src +msgid "$1 of $2 records found" +msgstr "$1 ᨠ$2 áááá¦á½ á°ááá°áá" diff --git a/loleaflet/po/styles/ar.po b/loleaflet/po/styles/ar.po index 20bf108b..1f249204 100644 --- a/loleaflet/po/styles/ar.po +++ b/loleaflet/po/styles/ar.po @@ -3444,3 +3444,7 @@ msgstr "اÙÙرÙسÙØ© (Ù ÙرÙØ´ÙÙس)" #: resource.src msgid "None (Do not check spelling)" msgstr "بÙا (Ùا تدÙÙ٠اÙØ¥Ù Ùاء)" + +#: globstr.src +msgid "$1 of $2 records found" +msgstr "ÙÙجد $1 ٠٠أص٠$2 ٠٠اÙسجÙات" diff --git a/loleaflet/po/styles/bg.po b/loleaflet/po/styles/bg.po index 56de4d19..99759cae 100644 --- a/loleaflet/po/styles/bg.po +++ b/loleaflet/po/styles/bg.po @@ -3523,3 +3523,7 @@ msgstr "ÐнглийÑки (ÐалайзиÑ)" #: resource.src msgid "None (Do not check spelling)" msgstr "ÐÑма (без пÑовеÑка на пÑавопиÑа)" + +#: globstr.src +msgid "$1 of $2 records found" +msgstr "$1 Ð¾Ñ Ð½Ð°Ð¼ÐµÑени $2 запиÑа" diff --git a/loleaflet/po/styles/br.po b/loleaflet/po/styles/br.po index e1658af9..edcd5119 100644 --- a/loleaflet/po/styles/br.po +++ b/loleaflet/po/styles/br.po @@ -3296,3 +3296,7 @@ msgstr "Galleg (Enez Maoris)" #
[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 Kant Date: 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/dist/toolbar/toolbar.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 81dba5385cb2c779889dc1d7fbb204e8458b4b03 Author: Aditya Dewan Date: Mon Dec 11 01:48:58 2017 +0530 close user list pop up on checkbox click Change-Id: Ied483b0bb484e93a665ed1197f3e48c3fc6e6020 Reviewed-on: https://gerrit.libreoffice.org/46196 Reviewed-by: pranavk Tested-by: pranavk (cherry picked from commit f86bc2814eab51e40d577491fb8f8a464267f7d2) Reviewed-on: https://gerrit.libreoffice.org/46953 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 136e7655..a475f67a 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -1701,12 +1701,12 @@ function editorUpdate(e) { $('.selected-user').removeClass('selected-user'); if ($(userlistItem.html).find('.selected-user').length !== 0) userlistItem.html = $(userlistItem.html).find('.selected-user').removeClass('selected-user').parent().parent().parent()[0].outerHTML; - $('#tb_toolbar-down_item_userlist').w2overlay(''); } else { docLayer._followEditor = false; docLayer._followThis = -1; } + $('#tb_toolbar-down_item_userlist').w2overlay(''); } function selectUser(viewId) { ___ 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/dist/loleaflet.css | 23 --- 1 file changed, 23 deletions(-) New commits: commit 0aa18b3a263e9a9091e60804ec12d25ebb3915ec Author: Pranav Kant Date: Tue Dec 19 20:48:13 2017 +0530 Remove dialog bar custom styling Branding rules should be provided by separate files. This is basically a revert of 0bf56306caa3bf896d034bf9d074efb5a62d90a6 Change-Id: Iddecce7493f095fa94d604692aba0bb5a0527d81 Reviewed-on: https://gerrit.libreoffice.org/46799 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css index 75e2a33a..7c054c33 100644 --- a/loleaflet/dist/loleaflet.css +++ b/loleaflet/dist/loleaflet.css @@ -334,29 +334,6 @@ body { text-indent: 1px; } -.lokdialog_container .ui-dialog-titlebar.ui-widget-header { - background: #5c3dcc; - border: none; -} - -.lokdialog_container.ui-dialog .ui-dialog-title { - margin-bottom: 0; -} - -.lokdialog_container .ui-state-default .ui-icon { - background-image: url(../node_modules/jquery-ui/themes/ui-lightness/images/ui-icons_ff_256x240.png); - border: none; -} - -.lokdialog_container.ui-dialog .ui-state-default { - background: none; - border: none; -} - -.lokdialog_container.ui-dialog .ui-state-default.ui-state-hover { - border: 1px solid #fff; -} - .lokdialog_container.ui-dialog.ui-widget-content { padding: 0px; overflow: hidden; ___ 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/dist/l10n/uno/af.json |3 +++ loleaflet/dist/l10n/uno/am.json |5 + loleaflet/dist/l10n/uno/ar.json |5 + loleaflet/dist/l10n/uno/as.json |3 +++ loleaflet/dist/l10n/uno/ast.json |3 +++ loleaflet/dist/l10n/uno/be.json |3 +++ loleaflet/dist/l10n/uno/bg.json |5 + loleaflet/dist/l10n/uno/bn-IN.json |3 +++ loleaflet/dist/l10n/uno/bn.json |3 +++ loleaflet/dist/l10n/uno/bo.json |3 +++ loleaflet/dist/l10n/uno/br.json |5 + loleaflet/dist/l10n/uno/brx.json |3 +++ loleaflet/dist/l10n/uno/bs.json |3 +++ loleaflet/dist/l10n/uno/ca-valencia.json |4 loleaflet/dist/l10n/uno/ca.json |5 + loleaflet/dist/l10n/uno/cs.json |5 + loleaflet/dist/l10n/uno/cy.json |5 + loleaflet/dist/l10n/uno/da.json |5 + loleaflet/dist/l10n/uno/de.json |5 + loleaflet/dist/l10n/uno/dgo.json |3 +++ loleaflet/dist/l10n/uno/dz.json |3 +++ loleaflet/dist/l10n/uno/el.json |5 + loleaflet/dist/l10n/uno/en-GB.json |5 + loleaflet/dist/l10n/uno/en-ZA.json |3 +++ loleaflet/dist/l10n/uno/eo.json |5 + loleaflet/dist/l10n/uno/es.json |5 + loleaflet/dist/l10n/uno/et.json |5 + loleaflet/dist/l10n/uno/eu.json |5 + loleaflet/dist/l10n/uno/fa.json |3 +++ loleaflet/dist/l10n/uno/fi.json |5 + loleaflet/dist/l10n/uno/fr.json |5 + loleaflet/dist/l10n/uno/ga.json |3 +++ loleaflet/dist/l10n/uno/gd.json |5 + loleaflet/dist/l10n/uno/gl.json |5 + loleaflet/dist/l10n/uno/gu.json |3 +++ loleaflet/dist/l10n/uno/gug.json |4 loleaflet/dist/l10n/uno/he.json |4 loleaflet/dist/l10n/uno/hi.json |3 +++ loleaflet/dist/l10n/uno/hr.json |5 + loleaflet/dist/l10n/uno/hu.json |5 + loleaflet/dist/l10n/uno/id.json |5 + loleaflet/dist/l10n/uno/is.json |5 + loleaflet/dist/l10n/uno/it.json |5 + loleaflet/dist/l10n/uno/ja.json |5 + loleaflet/dist/l10n/uno/ka.json |3 +++ loleaflet/dist/l10n/uno/kk.json |5 + loleaflet/dist/l10n/uno/km.json |3 +++ loleaflet/dist/l10n/uno/kmr-Latn.json|3 +++ loleaflet/dist/l10n/uno/kn.json |3 +++ loleaflet/dist/l10n/uno/ko.json |3 +++ loleaflet/dist/l10n/uno/kok.json |3 +++ loleaflet/dist/l10n/uno/ks.json |3 +++ loleaflet/dist/l10n/uno/lb.json |1 + loleaflet/dist/l10n/uno/lo.json |3 +++ loleaflet/dist/l10n/uno/lt.json |5 + loleaflet/dist/l10n/uno/lv.json |5 + loleaflet/dist/l10n/uno/mai.json |3 +++ loleaflet/dist/l10n/uno/mk.json |3 +++ loleaflet/dist/l10n/uno/ml.json |3 +++ loleaflet/dist/l10n/uno/mn.json |3 +++ loleaflet/dist/l10n/uno/mni.json |3 +++ loleaflet/dist/l10n/uno/mr.json |3 +++ loleaflet/dist/l10n/uno/my.json |3 +++ loleaflet/dist/l10n/uno/nb.json |5 + loleaflet/dist/l10n/uno/ne.json |3 +++ loleaflet/dist/l10n/uno/nl.json |5 + loleaflet/dist/l10n/uno/nn.json |5 + loleaflet/dist/l10n/uno/nr.json |3 +++ loleaflet/dist/l10n/uno/nso.json |3 +++ loleaflet/dist/l10n/uno/oc.json |5 + loleaflet/dist/l10n/uno/om.json |3 +++ loleaflet/dist/l10n/uno/or.json |3 +++ loleaflet/dist/l10n/uno/pa-IN.json |3 +++ loleaflet/dist/l10n/uno/pl.json |5 + loleaflet/dist/l10n/uno/pt-BR.json |5 + loleaflet/dist/l10n/uno/pt.json |5 + loleaflet/dist/l10n/uno/ro.json |5 + loleaflet/dist/l10n/uno/ru.json |5 + loleaflet/dist/l10n/uno/rw.json |3 +++ loleaflet/dist/l10n/uno/sa-IN.json |3 +++ loleaflet/dist/l10n/uno/sat.json |1 + loleaflet/dist/l10n/uno/sd.json |3 +++ loleaflet/dist/l10n/uno/si.json |3 +++ loleaflet/dist/l10n/uno/sid.json |3 +++ loleaflet/dist/l10n/uno/sk.json |5 + loleaflet/dist/l10n/uno/sl.json |5 + loleaflet/dist/l10n/uno/sq.json |2 ++ loleaflet/dist/l10n/uno/sr-Latn.json |3 +++ loleaflet/dist/l10n/uno/sr.json |3 +++ loleaflet/dist/l10n/uno/ss.json |3 +++ loleaflet/dist/l10n/uno/st.json |3 +++ loleaflet/dist/l10n/uno/sv.json |5 + loleaflet/dist/l10n/uno/sw-TZ.json |
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/unocommands.js scripts/unocommands.py
loleaflet/dist/l10n/uno/af.json |6 ++ loleaflet/dist/l10n/uno/am.json | 30 + loleaflet/dist/l10n/uno/ar.json | 28 loleaflet/dist/l10n/uno/as.json |9 +++ loleaflet/dist/l10n/uno/ast.json |9 +++ loleaflet/dist/l10n/uno/be.json |4 + loleaflet/dist/l10n/uno/bg.json | 30 + loleaflet/dist/l10n/uno/bn-IN.json | 12 + loleaflet/dist/l10n/uno/bn.json |8 +++ loleaflet/dist/l10n/uno/bo.json |6 ++ loleaflet/dist/l10n/uno/br.json | 14 ++ loleaflet/dist/l10n/uno/brx.json |6 ++ loleaflet/dist/l10n/uno/bs.json |9 +++ loleaflet/dist/l10n/uno/ca-valencia.json | 13 + loleaflet/dist/l10n/uno/ca.json | 30 + loleaflet/dist/l10n/uno/cs.json | 30 + loleaflet/dist/l10n/uno/cy.json | 30 + loleaflet/dist/l10n/uno/da.json | 30 + loleaflet/dist/l10n/uno/de.json | 30 + loleaflet/dist/l10n/uno/dgo.json |9 +++ loleaflet/dist/l10n/uno/dz.json |6 ++ loleaflet/dist/l10n/uno/el.json | 30 + loleaflet/dist/l10n/uno/en-GB.json | 30 + loleaflet/dist/l10n/uno/en-ZA.json |8 +++ loleaflet/dist/l10n/uno/eo.json | 30 + loleaflet/dist/l10n/uno/es.json | 30 + loleaflet/dist/l10n/uno/et.json | 30 + loleaflet/dist/l10n/uno/eu.json | 30 + loleaflet/dist/l10n/uno/fa.json |6 ++ loleaflet/dist/l10n/uno/fi.json | 30 + loleaflet/dist/l10n/uno/fr.json | 30 + loleaflet/dist/l10n/uno/ga.json | 12 + loleaflet/dist/l10n/uno/gd.json | 30 + loleaflet/dist/l10n/uno/gl.json | 30 + loleaflet/dist/l10n/uno/gu.json |9 +++ loleaflet/dist/l10n/uno/gug.json | 21 + loleaflet/dist/l10n/uno/he.json | 13 + loleaflet/dist/l10n/uno/hi.json |9 +++ loleaflet/dist/l10n/uno/hr.json | 23 ++ loleaflet/dist/l10n/uno/hu.json | 30 + loleaflet/dist/l10n/uno/id.json | 22 + loleaflet/dist/l10n/uno/is.json | 30 + loleaflet/dist/l10n/uno/it.json | 30 + loleaflet/dist/l10n/uno/ja.json | 25 +++ loleaflet/dist/l10n/uno/ka.json |7 +++ loleaflet/dist/l10n/uno/kk.json | 30 + loleaflet/dist/l10n/uno/km.json |9 +++ loleaflet/dist/l10n/uno/kmr-Latn.json|6 ++ loleaflet/dist/l10n/uno/kn.json |9 +++ loleaflet/dist/l10n/uno/ko.json | 12 + loleaflet/dist/l10n/uno/kok.json |6 ++ loleaflet/dist/l10n/uno/ks.json |6 ++ loleaflet/dist/l10n/uno/lb.json |1 loleaflet/dist/l10n/uno/lo.json |6 ++ loleaflet/dist/l10n/uno/lt.json | 30 + loleaflet/dist/l10n/uno/lv.json | 30 + loleaflet/dist/l10n/uno/mai.json |6 ++ loleaflet/dist/l10n/uno/mk.json |6 ++ loleaflet/dist/l10n/uno/ml.json |9 +++ loleaflet/dist/l10n/uno/mn.json |6 ++ loleaflet/dist/l10n/uno/mni.json |6 ++ loleaflet/dist/l10n/uno/mr.json |9 +++ loleaflet/dist/l10n/uno/my.json |7 +++ loleaflet/dist/l10n/uno/nb.json | 30 + loleaflet/dist/l10n/uno/ne.json |7 +++ loleaflet/dist/l10n/uno/nl.json | 30 + loleaflet/dist/l10n/uno/nn.json | 30 + loleaflet/dist/l10n/uno/nr.json |1 loleaflet/dist/l10n/uno/nso.json |6 ++ loleaflet/dist/l10n/uno/oc.json | 21 + loleaflet/dist/l10n/uno/om.json |6 ++ loleaflet/dist/l10n/uno/or.json |9 +++ loleaflet/dist/l10n/uno/pa-IN.json |9 +++ loleaflet/dist/l10n/uno/pl.json | 30 + loleaflet/dist/l10n/uno/pt-BR.json | 30 + loleaflet/dist/l10n/uno/pt.json | 30 + loleaflet/dist/l10n/uno/ro.json | 22 + loleaflet/dist/l10n/uno/ru.json | 30 + loleaflet/dist/l10n/uno/rw.json |6 ++ loleaflet/dist/l10n/uno/sa-IN.json |6 ++ loleaflet/dist/l10n/uno/sat.json |7 +++ loleaflet/dist/l10n/uno/sd.json |8 +++ loleaflet/dist/l10n/uno/si.json |7 +++ loleaflet/dist/l10n/uno/sid.json |9 +++ loleaflet/dist/l10n/uno/sk.json | 30 + loleaflet/dist/l10n/uno/sl.json | 30 + loleaflet/dist/l10n/uno/sq.json | 14 ++ loleaflet/dist/l10n/uno/sr-L
[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 loleafle
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist
loleaflet/dist/loleaflet.css | 25 - 1 file changed, 24 insertions(+), 1 deletion(-) New commits: commit 0bf56306caa3bf896d034bf9d074efb5a62d90a6 Author: Pranav Kant Date: Thu Dec 14 15:50:18 2017 +0530 lokdialog: Change dialog header bar styling Change-Id: I39ee083b0d04326e9c8780e894d86fba3bbd Reviewed-on: https://gerrit.libreoffice.org/46443 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css index d97fc008..75e2a33a 100644 --- a/loleaflet/dist/loleaflet.css +++ b/loleaflet/dist/loleaflet.css @@ -334,8 +334,31 @@ body { text-indent: 1px; } +.lokdialog_container .ui-dialog-titlebar.ui-widget-header { + background: #5c3dcc; + border: none; +} + +.lokdialog_container.ui-dialog .ui-dialog-title { + margin-bottom: 0; +} + +.lokdialog_container .ui-state-default .ui-icon { + background-image: url(../node_modules/jquery-ui/themes/ui-lightness/images/ui-icons_ff_256x240.png); + border: none; +} + +.lokdialog_container.ui-dialog .ui-state-default { + background: none; + border: none; +} + +.lokdialog_container.ui-dialog .ui-state-default.ui-state-hover { + border: 1px solid #fff; +} + .lokdialog_container.ui-dialog.ui-widget-content { -padding: 0px; + padding: 0px; overflow: hidden; width: auto; height: auto; ___ 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 | 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 --- loleaflet/d
[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 Cecchetti Date: 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); + this._canvasContext = this._canvas.getContext('2d'); + this._se
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist
loleaflet/dist/loleaflet.html |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit afbb7959b70d1b9cd2a994eff00326cc2c52080f Author: Henry Castro Date: Thu Nov 23 20:53:08 2017 -0400 loleaflet: fix text selectable in version dialog Change-Id: Ia1f8aa5fc1a03d0ee39e663a7bbd865ba301b38c Reviewed-on: https://gerrit.libreoffice.org/45198 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html index f24f58e4..83c93898 100644 --- a/loleaflet/dist/loleaflet.html +++ b/loleaflet/dist/loleaflet.html @@ -75,7 +75,7 @@ - + LibreOffice Online ___ 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/dist/toolbar/toolbar.js |3 --- 1 file changed, 3 deletions(-) New commits: commit 193114b7c3f11dfb77a5d2953d03eb573a22ec6a Author: Henry Castro Date: Tue Nov 21 18:03:32 2017 -0400 loleaflet: clean up logs that no longer need it Change-Id: I26d47b1fc73748a3e7e0e824b1596da43e57555c Reviewed-on: https://gerrit.libreoffice.org/45118 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 25e7ccb9..cb0b51a7 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -706,9 +706,6 @@ $(function () { $('#search-input').off('keypress', onSearchKeyPress).on('keypress', onSearchKeyPress); } }); - if ($('#toolbar-up').children().length === 0) { - console.log('w2ui toolbar is not created'); - } }); var userJoinedPopupMessage = '' + _('%user has joined') + ''; ___ 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/dist/toolbar/toolbar.js | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) New commits: commit e1a8dfd728dc830601593be0d3ca599a05a09252 Author: Henry Castro Date: Thu Nov 16 22:29:39 2017 -0400 loleaflet: fix when the status bar items are refreshed The w2ui toolbar refreshes the html type of its data, not the element generated Change-Id: I9b53ac0b98195961accce8be554c7bbfff19c644 Reviewed-on: https://gerrit.libreoffice.org/45116 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 4a24a8ff..25e7ccb9 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -1253,36 +1253,36 @@ map.on('commandstatechanged', function (e) { } } else if (commandName === '.uno:LanguageStatus') { - updateToolbarItem(statusbar, 'LanguageStatus', $('#LanguageStatus').html(_(state)).html()); + updateToolbarItem(statusbar, 'LanguageStatus', $('#LanguageStatus').html(_(state)).parent().html()); } else if (commandName === '.uno:ModifiedStatus') { var modifiedStatus = e.state === 'true'; var html; if (modifiedStatus) { - html = $('#modifiedstatuslabel').html('').html(); + html = $('#modifiedstatuslabel').html('').parent().html(); } else { - html = $('#modifiedstatuslabel').html(_('Document saved')).html(); + html = $('#modifiedstatuslabel').html(_('Document saved')).parent().html(); } updateToolbarItem(statusbar, 'modifiedstatuslabel', html); } else if (commandName === '.uno:StatusDocPos') { state = toLocalePattern('Sheet %1 of %2', 'Sheet (\\d+) of (\\d+)', state, '%1', '%2'); - updateToolbarItem(statusbar, 'StatusDocPos', $('#StatusDocPos').html(state ? state : ' ').html()); + updateToolbarItem(statusbar, 'StatusDocPos', $('#StatusDocPos').html(state ? state : ' ').parent().html()); } else if (commandName === '.uno:RowColSelCount') { state = toLocalePattern('$1 rows, $2 columns selected', '(\\d+) rows, (\\d+) columns selected', state, '$1', '$2'); - updateToolbarItem(statusbar, 'RowColSelCount', $('#RowColSelCount').html(state ? state : ' ').html()); + updateToolbarItem(statusbar, 'RowColSelCount', $('#RowColSelCount').html(state ? state : ' ').parent().html()); } else if (commandName === '.uno:InsertMode') { - updateToolbarItem(statusbar, 'InsertMode', $('#InsertMode').html(state ? L.Styles.insertMode[state].toLocaleString() : ' ').html()); + updateToolbarItem(statusbar, 'InsertMode', $('#InsertMode').html(state ? L.Styles.insertMode[state].toLocaleString() : ' ').parent().html()); } else if (commandName === '.uno:StatusSelectionMode' || commandName === '.uno:SelectionMode') { - updateToolbarItem(statusbar, 'StatusSelectionMode', $('#StatusSelectionMode').html(state ? L.Styles.selectionMode[state].toLocaleString() : ' ').html()); + updateToolbarItem(statusbar, 'StatusSelectionMode', $('#StatusSelectionMode').html(state ? L.Styles.selectionMode[state].toLocaleString() : ' ').parent().html()); } else if (commandName == '.uno:StateTableCell') { - updateToolbarItem(statusbar, 'StateTableCell', $('#StateTableCell').html(state ? state : ' ').html()); + updateToolbarItem(statusbar, 'StateTableCell', $('#StateTableCell').html(state ? state : ' ').parent().html()); } else if (commandName === '.uno:StatusBarFunc') { if (state) { @@ -1291,15 +1291,15 @@ map.on('commandstatechanged', function (e) { } else if (commandName === '.uno:StatePageNumber') { state = toLocalePattern('Page %1 of %2', 'Page (\\d+) of (\\d+)', state, '%1', '%2'); - updateToolbarItem(statusbar, 'StatePageNumber', $('#StatePageNumber').html(state ? state : ' ').html()); + updateToolbarItem(statusbar, 'StatePageNumber', $('#StatePageNumber').html(state ? state : ' ').parent().html()); } else if (commandName === '.uno:StateWordCount') { state = toLocalePattern('%1 words, %2 characters', '([\\d,]+) words, ([\\d,]+) characters', state, '%1', '%2'); - updateToolbarItem(statusbar, 'StateWordCount', $('#StateWordCount').html(state ? state : ' ').html()); + updateToolbarItem(statusbar, 'StateWordCount', $('#StateWordCount').html(state ? state : ' ').parent().html()); } else if (command
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist
loleaflet/dist/images/lc_insertfootnote.svg |1 - loleaflet/dist/toolbar.css |1 - loleaflet/dist/toolbar/toolbar.js | 16 3 files changed, 18 deletions(-) New commits: commit b1750f04f8945e76801c5adfa3adc2c525849c72 Author: Andras Timar Date: Mon Mar 27 15:46:14 2017 +0200 Revert "Add footnote and text wrap functions" Change-Id: I59d374d3f8bdfa6a3b871bdec5389a53bb3a9da9 diff --git a/loleaflet/dist/images/lc_insertfootnote.svg b/loleaflet/dist/images/lc_insertfootnote.svg deleted file mode 100644 index 9907b8b3.. --- a/loleaflet/dist/images/lc_insertfootnote.svg +++ /dev/null @@ -1 +0,0 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css index 31d3d209..6564ae95 100644 --- a/loleaflet/dist/toolbar.css +++ b/loleaflet/dist/toolbar.css @@ -285,7 +285,6 @@ button.leaflet-control-search-next .w2ui-icon.save{ background: url('../images/lc_save.svg') no-repeat center !important; } .w2ui-icon.saveas{ background: url('../images/lc_saveas.svg') no-repeat center !important; } .w2ui-icon.strikeout{ background: url('../images/lc_strikeout.svg') no-repeat center !important; } -.w2ui-icon.insertfootnote{ background: url('../images/lc_insertfootnote.svg') no-repeat center !important; } .w2ui-icon.underline{ background: url('../images/lc_underline.svg') no-repeat center !important; } .w2ui-icon.undo{ background: url('../images/lc_undo.svg') no-repeat center !important; } .w2ui-icon.zoomin{ background: url('../images/plus.svg') no-repeat center !important; } diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 05091a9f..4a24a8ff 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -284,11 +284,6 @@ function onClick(id, item, subItem) { else if (id === 'lastrecord') { $('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth')); } - else if (id.startsWith('menu:wrap:wrap-')) - { - var wrapType = id.substring('menu:wrap:wrap-'.length); - map.toggleCommandState(wrapType); - } else if (id === 'insertgraphic') { L.DomUtil.get('insertgraphic').click(); } @@ -458,15 +453,6 @@ $(function () { name: 'toolbar-up', items: [ {type: 'html', id: 'left'}, - {type: 'menu', id: 'writer:menu:wrap', caption: _('Textwrap'), items: [ - { text: _('No wrap'), id: 'wrap-WrapOff' }, - { text: _('Page wrap'), id: 'wrap-WrapOn' }, - { text: _('Wrap anchor only'), id: 'wrap-WrapAnchorOnly' }, - { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' }, - { text: _('Left wrap'), id: 'wrap-WrapLeft' }, - { text: _('Right wrap'), id: 'wrap-WrapRight' }, - { text: _('Wrap through'), id: 'wrap-WrapThrough' } - ]}, {type: 'button', id: 'save', img: 'save', hint: _('Save')}, {type: 'break', id: 'savebreak'}, {type: 'button', id: 'undo', img: 'undo', hint: _('Undo'), uno: 'Undo', disabled: true}, @@ -482,8 +468,6 @@ $(function () { {type: 'button', id: 'underline', img: 'underline', hint: _('Underline'), uno: 'Underline', disabled: true}, {type: 'button', id: 'strikeout', img: 'strikeout', hint: _('Strikeout'), uno: 'Strikeout', disabled: true}, {type: 'break', id: 'formatbreak'}, - {type: 'button', id: 'insertfootnote', img: 'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' }, - {type: 'break' }, {type: 'html', id: 'fontcolor-html', html: ''}, {type: 'button', id: 'fontcolor', img: 'color', hint: _('Font color')}, {type: 'html', id: 'backcolor-html', html: ''}, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits