From 05200460dbc9fcb969b2f8183a27de08c552773c Mon Sep 17 00:00:00 2001
From: raskolnikov-rodion
<22417165+raskolnikov-rodion@users.noreply.github.com>
Date: Fri, 11 Aug 2023 14:35:00 +0100
Subject: [PATCH] fix: fix no-mixed-spaces-and-tabs error (#6728)
---
.eslintrc.json | 3 +-
interface/main/tabs/js/tabs_view_model.js | 8 ++---
.../public/assets/js/webpack-dev.config.js | 4 +--
.../public/assets/js/webpack.config.js | 4 +--
.../public/js/autosuggest/autosuggest.js | 4 +--
.../public/js/installer/action.js | 10 +++---
.../public/js/scripts/cancercare.js | 2 +-
.../public/js/scripts/file_uploader.js | 36 +++++++++----------
.../js/scripts/syndromicsurveillance.js | 2 +-
library/js/clickmap.js | 2 +-
10 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/.eslintrc.json b/.eslintrc.json
index f9a8cade08f..c8c14b646d8 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -19,8 +19,7 @@
"no-undef": "warn",
"no-unused-vars": "warn",
"no-redeclare": "warn",
- "no-useless-escape": "warn",
- "no-mixed-spaces-and-tabs": "warn"
+ "no-useless-escape": "warn"
},
"overrides": [
{
diff --git a/interface/main/tabs/js/tabs_view_model.js b/interface/main/tabs/js/tabs_view_model.js
index 1ff2223165a..366f00a0301 100644
--- a/interface/main/tabs/js/tabs_view_model.js
+++ b/interface/main/tabs/js/tabs_view_model.js
@@ -393,18 +393,14 @@ function clearPatient()
$.ajax({
type: "POST",
url: webroot_url+"/library/ajax/unset_session_ajax.php",
- data: {
+ data: {
func: "unset_pid",
csrf_token_form: csrf_token_js
},
- success:function( msg ) {
-
-
- }
+ success:function( msg ) { }
});
}
-
function clearTherapyGroup()
{
top.restoreSession();
diff --git a/interface/modules/custom_modules/oe-module-comlink-telehealth/public/assets/js/webpack-dev.config.js b/interface/modules/custom_modules/oe-module-comlink-telehealth/public/assets/js/webpack-dev.config.js
index 6fafad508b4..bb264d91564 100644
--- a/interface/modules/custom_modules/oe-module-comlink-telehealth/public/assets/js/webpack-dev.config.js
+++ b/interface/modules/custom_modules/oe-module-comlink-telehealth/public/assets/js/webpack-dev.config.js
@@ -4,7 +4,7 @@ module.exports = {
mode: 'development', // 'development', 'production', 'none'
entry: './src/telehealth.js',
output: {
- path: path.resolve(__dirname, 'dist')
- ,filename: 'telehealth.js',
+ path: path.resolve(__dirname, 'dist'),
+ filename: 'telehealth.js',
},
};
diff --git a/interface/modules/custom_modules/oe-module-comlink-telehealth/public/assets/js/webpack.config.js b/interface/modules/custom_modules/oe-module-comlink-telehealth/public/assets/js/webpack.config.js
index 80631fc6aaa..26577ae30c0 100644
--- a/interface/modules/custom_modules/oe-module-comlink-telehealth/public/assets/js/webpack.config.js
+++ b/interface/modules/custom_modules/oe-module-comlink-telehealth/public/assets/js/webpack.config.js
@@ -4,7 +4,7 @@ module.exports = {
mode: 'production', // 'development', 'production', 'none'
entry: './src/telehealth.js',
output: {
- path: path.resolve(__dirname, 'dist')
- ,filename: 'telehealth.min.js',
+ path: path.resolve(__dirname, 'dist'),
+ filename: 'telehealth.min.js',
},
};
diff --git a/interface/modules/zend_modules/public/js/autosuggest/autosuggest.js b/interface/modules/zend_modules/public/js/autosuggest/autosuggest.js
index 62c5e41b25d..c3c13bdd593 100644
--- a/interface/modules/zend_modules/public/js/autosuggest/autosuggest.js
+++ b/interface/modules/zend_modules/public/js/autosuggest/autosuggest.js
@@ -24,7 +24,7 @@ function PreventIt(evt) {
if (charCode == 38 || charCode == 40) {
if (evt.preventDefault) evt.preventDefault();
if (evt.stopPropagation) evt.stopPropagation();
- }
+ }
}
/**
@@ -75,7 +75,7 @@ function PreventIt(evt) {
newPath += '../';
}
/* eslint-disable-next-line no-unused-labels */
- dataType: "html",
+ dataType: "html",
$.post(newPath + "public/application/index/search", {
queryString : inputString,
leading : leading,
diff --git a/interface/modules/zend_modules/public/js/installer/action.js b/interface/modules/zend_modules/public/js/installer/action.js
index 61eff0e0994..97e13b33eba 100644
--- a/interface/modules/zend_modules/public/js/installer/action.js
+++ b/interface/modules/zend_modules/public/js/installer/action.js
@@ -15,14 +15,14 @@
function register(status,title,name,method,type){
$.post("./Installer/register", { st: status, mod_title: title, mod_name: name, mod_method:method,mtype:type},
- function(data) {
+ function(data) {
if(data == "Success") {
window.location.reload();
- } else {
- var resultTranslated = js_xl(data);
+ } else {
+ var resultTranslated = js_xl(data);
$('#err').html(resultTranslated.msg).fadeIn().delay(2000).fadeOut();
- }
- }
+ }
+ }
);
}
diff --git a/interface/modules/zend_modules/public/js/scripts/cancercare.js b/interface/modules/zend_modules/public/js/scripts/cancercare.js
index dc1ab8cbab1..f72b89397b4 100644
--- a/interface/modules/zend_modules/public/js/scripts/cancercare.js
+++ b/interface/modules/zend_modules/public/js/scripts/cancercare.js
@@ -55,7 +55,7 @@ function isNumber(evt)
evt = (evt) ? evt : window.event;
var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode > 31 && (charCode < 48 || charCode > 57) && charCode!= 13) {
- return false;
+ return false;
}
return true;
}
diff --git a/interface/modules/zend_modules/public/js/scripts/file_uploader.js b/interface/modules/zend_modules/public/js/scripts/file_uploader.js
index 0288ecd3a78..cee06ac790f 100644
--- a/interface/modules/zend_modules/public/js/scripts/file_uploader.js
+++ b/interface/modules/zend_modules/public/js/scripts/file_uploader.js
@@ -46,14 +46,14 @@ function AjaxFileUploader(settings) {
if($(".file-uploader-progress").length <1 && settings.progress_bar) {
var progress_div = "";
+ " style='width:"+progress_div_width+"px;height:"+progress_div_height+"px;'>"+
+ ""+
+ ""+
+ "";
$("body").append(progress_div);
}
if(settings.batch_upload){
@@ -251,16 +251,16 @@ function sendFileToServer(formData,status,progress_bar,success_function)
var rowCount=0;
function createStatusbar(obj)
{
- rowCount++;
- var row="odd";
- if(rowCount %2 ==0) row ="even";
- this.statusbar = $("");
- this.filename = $("").appendTo(this.statusbar);
- this.size = $("").appendTo(this.statusbar);
- this.progressBar = $("").appendTo(this.statusbar);
- var resultTranslated = js_xl('Abort');
- this.abort = $(""+resultTranslated.msg+"
").appendTo(this.statusbar);
- obj.after(this.statusbar);
+ rowCount++;
+ var row="odd";
+ if(rowCount %2 ==0) row ="even";
+ this.statusbar = $("");
+ this.filename = $("").appendTo(this.statusbar);
+ this.size = $("").appendTo(this.statusbar);
+ this.progressBar = $("").appendTo(this.statusbar);
+ var resultTranslated = js_xl('Abort');
+ this.abort = $(""+resultTranslated.msg+"
").appendTo(this.statusbar);
+ obj.after(this.statusbar);
this.setFileNameSize = function(name,size)
{
diff --git a/interface/modules/zend_modules/public/js/scripts/syndromicsurveillance.js b/interface/modules/zend_modules/public/js/scripts/syndromicsurveillance.js
index b37ad71325a..1a635de779c 100644
--- a/interface/modules/zend_modules/public/js/scripts/syndromicsurveillance.js
+++ b/interface/modules/zend_modules/public/js/scripts/syndromicsurveillance.js
@@ -57,7 +57,7 @@ function isNumber(evt)
evt = (evt) ? evt : window.event;
var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode > 31 && (charCode < 48 || charCode > 57) && charCode!= 13) {
- return false;
+ return false;
}
return true;
}
diff --git a/library/js/clickmap.js b/library/js/clickmap.js
index 49ea8e00ef6..79a28c98f62 100644
--- a/library/js/clickmap.js
+++ b/library/js/clickmap.js
@@ -48,7 +48,7 @@ var clickmap = function(args) {
const marker = fn_buildMarker(x, y, label, detail);
container.append(marker);
if (fn_isnumber(label)) {
- counter = parseInt(label);
+ counter = parseInt(label);
}
}
}