haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "eslint: introduce strict rules" 

It didn't work: prettier still used double quotes as a standard
so it was not possible to pass make check

This reverts commit 7c5c5bd47b.

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: Ic04f1591dc39bbfe522ed2b840c543ec42b3ffa3
private/skyler/prettier-plus-eslint
Szymon Kłos 2024-04-15 12:05:04 +02:00 committed by Szymon Kłos
parent 0b3b27cb72
commit a5e20a4943
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/.eslintrc
View File

@ -18,11 +18,6 @@
"no-debugger": 1, "no-debugger": 1,
"no-unreachable": 1, "no-unreachable": 1,
"no-unused-vars": 1, "no-unused-vars": 1,
"semi": 2,
"comma-style": 2,
"quotes": [2, "single"],
"space-before-blocks": 2,
"keyword-spacing": 2
}, },
"globals": { "globals": {
"L": true, "L": true,

2
browser/src/control/Control.MobileBottomBar.js
View File

@ -15,7 +15,7 @@
/* global JSDialog _ _UNO */ /* global JSDialog _ _UNO */
class MobileBottomBar extends JSDialog.Toolbar { class MobileBottomBar extends JSDialog.Toolbar {
constructor(map) { constructor(map) {
super(map, 'toolbar-down'); super(map, 'toolbar-down')
map.on('commandstatechanged', window.onCommandStateChanged); map.on('commandstatechanged', window.onCommandStateChanged);
map.on('updatetoolbarcommandvalues', window.onCommandStateChanged); map.on('updatetoolbarcommandvalues', window.onCommandStateChanged);

4
browser/src/control/Control.Toolbar.js
View File

@ -207,7 +207,7 @@ var sendInsertTableFunction = function(event) {
var col = $(event.target).index() + 1; var col = $(event.target).index() + 1;
var row = $(event.target).parent().index() + 1; var row = $(event.target).parent().index() + 1;
$('.col').removeClass('bright'); $('.col').removeClass('bright');
var status = $('#inserttable-status'); var status = $('#inserttable-status')
status.html('<br/>'); status.html('<br/>');
var msg = 'uno .uno:InsertTable {' + var msg = 'uno .uno:InsertTable {' +
' "Columns": { "type": "long","value": ' ' "Columns": { "type": "long","value": '
@ -225,7 +225,7 @@ var highlightTableFunction = function(event) {
$('.col').removeClass('bright'); $('.col').removeClass('bright');
$('.row:nth-child(-n+' + row + ') .col:nth-child(-n+' + col + ')') $('.row:nth-child(-n+' + row + ') .col:nth-child(-n+' + col + ')')
.addClass('bright'); .addClass('bright');
var status = $('#inserttable-status'); var status = $('#inserttable-status')
status.html(col + 'x' + row); status.html(col + 'x' + row);
}; };

2
browser/src/control/Control.UIManager.js
View File

@ -1711,7 +1711,7 @@ L.Control.UIManager = L.Control.extend({
var elem = $(element); var elem = $(element);
if (window.mode.isDesktop()) { if (window.mode.isDesktop()) {
elem.tooltip(); elem.tooltip();
elem.on('mousedown', function() { elem.on("mousedown", function() {
$('.ui-tooltip').fadeOut(function() { $('.ui-tooltip').fadeOut(function() {
$(this).remove(); $(this).remove();
}); });

4
browser/src/control/Control.UserList.ts
View File

@ -88,7 +88,7 @@ class UserList extends L.Control {
const user = this.users.get(viewId); const user = this.users.get(viewId);
if (user === undefined) { if (user === undefined) {
console.debug('User doesn\'t exist: ' + viewId); console.debug("User doesn't exist: " + viewId);
return; return;
} }
@ -372,7 +372,7 @@ class UserList extends L.Control {
const user = this.users.get(e.viewId); const user = this.users.get(e.viewId);
if (user === undefined) { if (user === undefined) {
console.debug('User doesn\'t exist: ' + e.viewId); console.debug("User doesn't exist: " + e.viewId);
return; return;
} }

2
browser/src/map/Clipboard.js
View File

@ -809,7 +809,7 @@ L.Clipboard = L.Class.extend({
'text/html': fetch(url) 'text/html': fetch(url)
.then(response => response.text()) .then(response => response.text())
.then(function(text) { .then(function(text) {
const type = 'text/html'; const type = "text/html";
const content = that.parseClipboard(text)['html']; const content = that.parseClipboard(text)['html'];
const blob = new Blob([content], { 'type': type }); const blob = new Blob([content], { 'type': type });
return blob; return blob;