Skip to content

Commit

Permalink
fix: fix no-mixed-spaces-and-tabs error (openemr#6728)
Browse files Browse the repository at this point in the history
  • Loading branch information
raskolnikov-rodion committed Aug 11, 2023
1 parent eb45d5a commit 0520046
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 40 deletions.
3 changes: 1 addition & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
8 changes: 2 additions & 6 deletions interface/main/tabs/js/tabs_view_model.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function PreventIt(evt) {
if (charCode == 38 || charCode == 40) {
if (evt.preventDefault) evt.preventDefault();
if (evt.stopPropagation) evt.stopPropagation();
}
}
}

/**
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions interface/modules/zend_modules/public/js/installer/action.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
}
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
36 changes: 18 additions & 18 deletions interface/modules/zend_modules/public/js/scripts/file_uploader.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ function AjaxFileUploader(settings) {

if($(".file-uploader-progress").length <1 && settings.progress_bar) {
var progress_div = "<div class='file-uploader-progress' "+
" style='width:"+progress_div_width+"px;height:"+progress_div_height+"px;'>"+
"<div class='file-uploader-progress-div_head'>"+
"<div class='file-uploader-progress-close'></div>"+
"<div class='file-uploader-progress-minimize'></div>"+
"<div class='file-uploader-progress-expand'></div>"+
"</div>"+
"<div class='file-uploader-progress-content'></div>"+
"</div>";
" style='width:"+progress_div_width+"px;height:"+progress_div_height+"px;'>"+
"<div class='file-uploader-progress-div_head'>"+
"<div class='file-uploader-progress-close'></div>"+
"<div class='file-uploader-progress-minimize'></div>"+
"<div class='file-uploader-progress-expand'></div>"+
"</div>"+
"<div class='file-uploader-progress-content'></div>"+
"</div>";
$("body").append(progress_div);
}
if(settings.batch_upload){
Expand Down Expand Up @@ -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 = $("<div class='statusbar "+row+"'></div>");
this.filename = $("<div class='filename'></div>").appendTo(this.statusbar);
this.size = $("<div class='filesize'></div>").appendTo(this.statusbar);
this.progressBar = $("<div class='progressBar'><div></div></div>").appendTo(this.statusbar);
var resultTranslated = js_xl('Abort');
this.abort = $("<div class='abort'>"+resultTranslated.msg+"</div>").appendTo(this.statusbar);
obj.after(this.statusbar);
rowCount++;
var row="odd";
if(rowCount %2 ==0) row ="even";
this.statusbar = $("<div class='statusbar "+row+"'></div>");
this.filename = $("<div class='filename'></div>").appendTo(this.statusbar);
this.size = $("<div class='filesize'></div>").appendTo(this.statusbar);
this.progressBar = $("<div class='progressBar'><div></div></div>").appendTo(this.statusbar);
var resultTranslated = js_xl('Abort');
this.abort = $("<div class='abort'>"+resultTranslated.msg+"</div>").appendTo(this.statusbar);
obj.after(this.statusbar);

this.setFileNameSize = function(name,size)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion library/js/clickmap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down

0 comments on commit 0520046

Please sign in to comment.