Skip to content

Commit

Permalink
Eslint operator spacing config (#1109)
Browse files Browse the repository at this point in the history 
* Eslint operator spacing config

* consistent spacing after comma

* comma styling config

* Trailing spaces config
  • Loading branch information
@aashna27 @jywarren
aashna27 authored and jywarren committed Jun 13, 2019
1 parent 9eac218 commit 440c3e0
Show file tree
Hide file tree
Showing 64 changed files with 400 additions and 396 deletions.
8 changes: 6 additions & 2 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = {
'indent': ['error',2],
'linebreak-style': ['error','unix'],
'quotes': ['error','single'],
'semi': ['error','always'],
'semi': ['error','always'], //
'no-undef': 0,
'no-console': 'off',
'no-unused-vars': 'off',
Expand All @@ -27,6 +27,10 @@ module.exports = {
'no-mixed-spaces-and-tabs':'off',
'no-self-assign':'off',
'no-constant-condition':'off',
'no-dupe-keys':'off'
'no-dupe-keys':'off',
'space-infix-ops': ['error', {'int32Hint': false}], // Enforce spaces around operators
'comma-spacing': ['error', { "before": false, "after": true }], // require spacing after a comma
'comma-style': ['error', 'last'], // requires comma after and on the same line
'no-trailing-spaces': ['error', { 'skipBlankLines': true }], // Disallows trailing whitespace on end of lines and empty lines
}
};
26 changes: 13 additions & 13 deletions examples/demo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ window.onload = function() {
$(':root').animate({scrollTop: 0});
}

$('#move-up').on('click',topFunction);
$('#move-up').on('click', topFunction);


// UI for each step:
Expand All @@ -63,14 +63,14 @@ window.onload = function() {
}

var resetSequence = function(){
var r=confirm('Do you want to reset the sequence?');
var r = confirm('Do you want to reset the sequence?');
if (r)
window.location = '/';
};

$('#addStep select').on('change', ui.selectNewStepUi);
$('#addStep #add-step-btn').on('click', ui.addStepUi);
$('#resetButton').on('click',resetSequence);
$('#resetButton').on('click', resetSequence);

//Module button radio selection
$('.radio-group .radio').on('click', function() {
Expand Down Expand Up @@ -113,7 +113,7 @@ window.onload = function() {

var button = event.target;
button.disabled = true;
button.innerHTML='<i class="fa fa-circle-o-notch fa-spin"></i>';
button.innerHTML = '<i class="fa fa-circle-o-notch fa-spin"></i>';

try {
// Select all images from previous steps
Expand Down Expand Up @@ -187,34 +187,34 @@ window.onload = function() {
onLoad: function onFileReaderLoad(progress) {
var reader = progress.target;
var step = sequencer.steps[0];
var util= intermediateHtmlStepUi(sequencer);
var util = intermediateHtmlStepUi(sequencer);
step.output.src = reader.result;
sequencer.run({ index: 0 });
if(typeof step.options !=='undefined')
if(typeof step.options !== 'undefined')
step.options.step.imgElement.src = reader.result;
else
step.imgElement.src = reader.result;
insertPreview.updatePreviews(reader.result,'#addStep');
insertPreview.updatePreviews(sequencer.steps[0].imgElement.src,'.insertDiv');
insertPreview.updatePreviews(reader.result, '#addStep');
insertPreview.updatePreviews(sequencer.steps[0].imgElement.src, '.insertDiv');
},
onTakePhoto: function (url) {
var step = sequencer.steps[0];
step.output.src = url;
sequencer.run({ index: 0 });
if(typeof step.options !=='undefined')
if(typeof step.options !== 'undefined')
step.options.step.imgElement.src = url;
else
step.imgElement.src = url;
insertPreview.updatePreviews(url,'#addStep');
insertPreview.updatePreviews(sequencer.steps[0].imgElement.src,'.insertDiv');
insertPreview.updatePreviews(url, '#addStep');
insertPreview.updatePreviews(sequencer.steps[0].imgElement.src, '.insertDiv');
}
});

setupCache();

if (urlHash.getUrlHashParameter('src')) {
insertPreview.updatePreviews(urlHash.getUrlHashParameter('src'),'#addStep');
insertPreview.updatePreviews(urlHash.getUrlHashParameter('src'), '#addStep');
} else {
insertPreview.updatePreviews('images/tulips.png','#addStep');
insertPreview.updatePreviews('images/tulips.png', '#addStep');
}
};
6 changes: 3 additions & 3 deletions examples/lib/defaultHtmlSequencerUi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function DefaultHtmlSequencerUi(_sequencer, options) {

function onLoad() {
importStepsFromUrlHash();
if ($('#selectStep').val()==='none')
if ($('#selectStep').val() === 'none')
$(addStepSel + ' #add-step-btn').prop('disabled', true);
handleSaveSequence();
}
Expand Down Expand Up @@ -73,8 +73,8 @@ function DefaultHtmlSequencerUi(_sequencer, options) {
}

function handleSaveSequence(){
var stepCount=sequencer.steps.length;
if(stepCount<2)
var stepCount = sequencer.steps.length;
if(stepCount < 2)
$(' #save-seq').prop('disabled', true);
else
$(' #save-seq').prop('disabled', false);
Expand Down
42 changes: 21 additions & 21 deletions examples/lib/defaultHtmlStepUi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ function DefaultHtmlStepUi(_sequencer, options) {
<div class="panel panel-default">\
<div class="panel-heading">\
<div class="trash-container pull-right"></div>\
<h3 class="panel-title">' +
'<span class="toggle">' +step.name + ' <span class="caret toggleIcon rotated"></span>\
<h3 class="panel-title">' +
'<span class="toggle">' + step.name + ' <span class="caret toggleIcon rotated"></span>\
<span class="load-spin pull-right" style="display:none;padding:1px 8px;"><i class="fa fa-circle-o-notch fa-spin"></i></span>\
</h3>\
</div>\
Expand Down Expand Up @@ -106,7 +106,7 @@ function DefaultHtmlStepUi(_sequencer, options) {
'"max="' +
inputDesc.max +
'"step="' +
(inputDesc.step ? inputDesc.step : 1)+ '">' + '<span>' + paramVal + '</span>';
(inputDesc.step ? inputDesc.step : 1) + '">' + '<span>' + paramVal + '</span>';

}
else html += '">';
Expand Down Expand Up @@ -138,7 +138,7 @@ function DefaultHtmlStepUi(_sequencer, options) {
<button class="pull-right btn btn-default btn-sm download-btn" style="margin-right:2px" >\
<i class="fa fa-download"></i>\
</button>'
);
);
}

if (step.name != 'load-image') {
Expand All @@ -147,14 +147,14 @@ function DefaultHtmlStepUi(_sequencer, options) {
.prepend(
parser.parseFromString(tools, 'text/html').querySelector('div')
);
$(step.ui.querySelectorAll('.remove')).on('click', function() {notify('Step Removed','remove-notification');});
$(step.ui.querySelectorAll('.insert-step')).on('click', function() { util.insertStep(step.ID); });
$(step.ui.querySelectorAll('.remove')).on('click', function() {notify('Step Removed', 'remove-notification');});
$(step.ui.querySelectorAll('.insert-step')).on('click', function() { util.insertStep(step.ID); });
// Insert the step's UI in the right place
if (stepOptions.index == _sequencer.steps.length) {
stepsEl.appendChild(step.ui);
$('#steps .step-container:nth-last-child(1) .insert-step').prop('disabled',true);
$('#steps .step-container:nth-last-child(1) .insert-step').prop('disabled', true);
if($('#steps .step-container:nth-last-child(2)'))
$('#steps .step-container:nth-last-child(2) .insert-step').prop('disabled',false);
$('#steps .step-container:nth-last-child(2) .insert-step').prop('disabled', false);
} else {
stepsEl.insertBefore(step.ui, $(stepsEl).children()[stepOptions.index]);
}
Expand Down Expand Up @@ -201,15 +201,15 @@ function DefaultHtmlStepUi(_sequencer, options) {
return inputChanged;
}

var
var
changedInputs = 0,
optionsChanged = false;
$(step.ui.querySelector('.input-form')).on('submit', saveOptions);
$(step.ui.querySelectorAll('.target')).each(function(i, input) {
$(input)
.data('initValue', $(input).val())
.data('hasChangedBefore', false)
.on('input change' , function() {
.on('input change', function() {
$(this)
.focus()
.data('hasChangedBefore',
Expand Down Expand Up @@ -253,7 +253,7 @@ function DefaultHtmlStepUi(_sequencer, options) {
return output.split('/')[1].split(';')[0];
}

$(step.ui.querySelectorAll('.download-btn')).on('click', () => {
$(step.ui.querySelectorAll('.download-btn')).on('click', () => {

for (let index = 0; index < step.linkElements.length; index++){

Expand Down Expand Up @@ -297,33 +297,33 @@ function DefaultHtmlStepUi(_sequencer, options) {

var img = $(step.imgElement);

img.mousemove(function(e) {
img.mousemove(function(e) {
var canvas = document.createElement('canvas');
canvas.width = img.width();
canvas.height = img.height();
var context = canvas.getContext('2d');
context.drawImage(this,0,0);
context.drawImage(this, 0, 0);

var offset = $(this).offset();
var xPos = e.pageX - offset.left;
var yPos = e.pageY - offset.top;
var myData = context.getImageData(xPos, yPos, 1, 1);
img[0].title = 'rgb: ' +myData.data[0]+','+ myData.data[1]+','+myData.data[2];//+ rgbdata;
});
img[0].title = 'rgb: ' + myData.data[0] + ',' + myData.data[1] + ',' + myData.data[2];//+ rgbdata;
});
}

function onRemove(step) {
step.ui.remove();
$('#steps .step-container:nth-last-child(1) .insert-step').prop('disabled',true);
$('#steps .step-container:nth-last-child(1) .insert-step').prop('disabled', true);
$('div[class*=imgareaselect-]').remove();
}

function getPreview() {
return step.imgElement;
}

function notify(msg,id){
if ($('#'+id).length == 0) {
function notify(msg, id){
if ($('#' + id).length == 0) {
var notification = document.createElement('span');
notification.innerHTML = ' <i class="fa fa-info-circle" aria-hidden="true"></i> ' + msg ;
notification.id = id;
Expand All @@ -332,7 +332,7 @@ function DefaultHtmlStepUi(_sequencer, options) {
$('body').append(notification);
}

$('#'+id).fadeIn(500).delay(200).fadeOut(500);
$('#' + id).fadeIn(500).delay(200).fadeOut(500);
}


Expand All @@ -341,14 +341,14 @@ function DefaultHtmlStepUi(_sequencer, options) {
onSetup: onSetup,
onComplete: onComplete,
onRemove: onRemove,
onDraw: onDraw,
onDraw: onDraw,
notify: notify,
imageHover: imageHover
};
}

if(typeof window === 'undefined'){
module.exports={
module.exports = {
DefaultHtmlStepUi: DefaultHtmlStepUi
};
}
Expand Down
2 changes: 1 addition & 1 deletion examples/lib/insertPreview.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function generatePreview(previewStepName, customValues, path, selector) {
}

function updatePreviews(src, selector) {
$(selector+' img').remove();
$(selector + ' img').remove();

var previewSequencerSteps = {
'resize': '125%',
Expand Down
2 changes: 1 addition & 1 deletion examples/sw.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ self.addEventListener('activate', function(e) {
})
);
})
);
);
});

self.addEventListener('fetch', function(event) {
Expand Down
2 changes: 1 addition & 1 deletion index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ else {
}
},
notify: function(msg) {
console.log('\x1b[36m%s\x1b[0m','🌟 '+msg);
console.log('\x1b[36m%s\x1b[0m', '🌟 ' + msg);
}
});

Expand Down
10 changes: 5 additions & 5 deletions spec/defaultHtmlSequencerUi.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ describe('Default sequencer HTML', function() {
beforeEach(()=>{
defaultHtmlSequencerUi = new DefaultHtmlSequencerUi(sequencer);

spyOn(defaultHtmlSequencerUi,'onLoad');
spyOn(defaultHtmlSequencerUi,'selectNewStepUi');
spyOn(defaultHtmlSequencerUi,'removeStepUi');
spyOn(defaultHtmlSequencerUi,'addStepUi');
spyOn(defaultHtmlSequencerUi,'importStepsFromUrlHash');
spyOn(defaultHtmlSequencerUi, 'onLoad');
spyOn(defaultHtmlSequencerUi, 'selectNewStepUi');
spyOn(defaultHtmlSequencerUi, 'removeStepUi');
spyOn(defaultHtmlSequencerUi, 'addStepUi');
spyOn(defaultHtmlSequencerUi, 'importStepsFromUrlHash');

defaultHtmlSequencerUi.onLoad();
defaultHtmlSequencerUi.selectNewStepUi();
Expand Down
20 changes: 10 additions & 10 deletions spec/defaultHtmlStepUi.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ describe('Sequencer step HTML', function() {
beforeEach(()=>{
defaultHtmlStepUi = new DefaultHtmlStepUi(sequencer);

spyOn(defaultHtmlStepUi,'getPreview');
spyOn(defaultHtmlStepUi,'onSetup');
spyOn(defaultHtmlStepUi,'onComplete');
spyOn(defaultHtmlStepUi,'onDraw');
spyOn(defaultHtmlStepUi,'onRemove');
spyOn(defaultHtmlStepUi,'notify');
spyOn(defaultHtmlStepUi, 'getPreview');
spyOn(defaultHtmlStepUi, 'onSetup');
spyOn(defaultHtmlStepUi, 'onComplete');
spyOn(defaultHtmlStepUi, 'onDraw');
spyOn(defaultHtmlStepUi, 'onRemove');
spyOn(defaultHtmlStepUi, 'notify');

defaultHtmlStepUi.getPreview();
defaultHtmlStepUi.onSetup(step,options);
defaultHtmlStepUi.onSetup(step, options);
defaultHtmlStepUi.onComplete(step);
defaultHtmlStepUi.onDraw(step);
defaultHtmlStepUi.onRemove(step);
defaultHtmlStepUi.notify('Step removed','remove-notification');
defaultHtmlStepUi.notify('Step removed', 'remove-notification');
});


Expand All @@ -39,7 +39,7 @@ describe('Sequencer step HTML', function() {
});

it('load initial setup ui', function() {
expect(defaultHtmlStepUi.onSetup).toHaveBeenCalledWith(step,options);
expect(defaultHtmlStepUi.onSetup).toHaveBeenCalledWith(step, options);
});

it('load completion ui', function() {
Expand All @@ -55,7 +55,7 @@ describe('Sequencer step HTML', function() {
});

it('notification ui', function() {
expect(defaultHtmlStepUi.notify).toHaveBeenCalledWith('Step removed','remove-notification');
expect(defaultHtmlStepUi.notify).toHaveBeenCalledWith('Step removed', 'remove-notification');
});

});
12 changes: 6 additions & 6 deletions spec/insertPreview.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ describe('Preview UI HTML', function() {
beforeEach(()=>{
insertPreview = InsertPreview;

spyOn(insertPreview,'generatePreview');
spyOn(insertPreview,'updatePreviews');
spyOn(insertPreview, 'generatePreview');
spyOn(insertPreview, 'updatePreviews');

insertPreview.generatePreview('brightness',options,'src','selector');
insertPreview.updatePreviews('src','selector');
insertPreview.generatePreview('brightness', options, 'src', 'selector');
insertPreview.updatePreviews('src', 'selector');
});

it('generate preview ui', function() {
expect(insertPreview.generatePreview).toHaveBeenCalledWith('brightness',options,'src','selector');
expect(insertPreview.generatePreview).toHaveBeenCalledWith('brightness', options, 'src', 'selector');
});

it('update preview ui', function() {
expect(insertPreview.updatePreviews).toHaveBeenCalledWith('src','selector');
expect(insertPreview.updatePreviews).toHaveBeenCalledWith('src', 'selector');
});

});
2 changes: 1 addition & 1 deletion spec/intermediateHtmlStepUi.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('Intermediate step HTML', function() {
beforeEach(()=>{
intermediateHtmlStepUi = new IntermediateHtmlStepUi(sequencer);

spyOn(intermediateHtmlStepUi,'insertStep');
spyOn(intermediateHtmlStepUi, 'insertStep');

intermediateHtmlStepUi.insertStep();
});
Expand Down
Loading

0 comments on commit 440c3e0

Please sign in to comment.