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 <ke...@collabora.com> 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 <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> 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:ControlCodes'} ] }, {name: _UNO('.uno:InsertMenu', 'text'), type: 'menu', menu: [ @@ -195,7 +195,7 @@ L.Control.Menubar = L.Control.extend({ {name: _UNO('.uno:SetLanguageParagraphMenu', 'text'), type: 'menu', menu: [ {name: _('None (Do not check spelling)'), id: 'noneparagraph', uno: '.uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE'}]}, {name: _UNO('.uno:SetLanguageAllTextMenu', 'text'), type: 'menu', menu: [ - {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}, + {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]} ]}, {uno: '.uno:WordCountDialog'} ]}, @@ -248,7 +248,7 @@ L.Control.Menubar = L.Control.extend({ {uno: '.uno:TransformDialog'}, {uno: '.uno:FormatLine'}, {uno: '.uno:FormatArea'} - ]}, + ]} ]}, {name: _UNO('.uno:TableMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [ {name: _UNO('.uno:TableInsertMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [ diff --git a/loleaflet/src/control/Control.RowHeader.js b/loleaflet/src/control/Control.RowHeader.js index e70a0904..468359ea 100644 --- a/loleaflet/src/control/Control.RowHeader.js +++ b/loleaflet/src/control/Control.RowHeader.js @@ -2,7 +2,7 @@ * L.Control.RowHeader */ -/* global $ _ */ +/* global $ _UNO */ L.Control.RowHeader = L.Control.Header.extend({ options: { cursor: 'row-resize' diff --git a/loleaflet/src/control/Control.Tabs.js b/loleaflet/src/control/Control.Tabs.js index 6429937e..a2095457 100644 --- a/loleaflet/src/control/Control.Tabs.js +++ b/loleaflet/src/control/Control.Tabs.js @@ -2,7 +2,7 @@ * L.Control.Tabs is used to switch sheets in Calc */ -/* global $ vex _ map */ +/* global $ vex _ _UNO map */ L.Control.Tabs = L.Control.extend({ onAdd: function(map) { map.on('updatepermission', this._onUpdatePermission, this); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits