Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STY: Fix some linting issues #738

Merged
merged 1 commit into from
Oct 24, 2019
Merged

STY: Fix some linting issues #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion emperor/support_files/js/axes-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ define([
});
this.$viewTypeDiv.attr('title', 'Change the selected View Type');

var radioName = "emperor.viewType_" + this.identifier;
var radioName = 'emperor.viewType_' + this.identifier;
if (this.UIState['view.viewType'] === 'scatter') {


Expand Down
8 changes: 4 additions & 4 deletions emperor/support_files/js/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,16 +400,16 @@ DecompositionView.prototype._fastInitParallelPlot = function()
attribute vec3 color;
attribute float opacity;
attribute float visible;

varying vec3 vColor;
varying float vOpacity;
varying float vVisible;

void main() {
vColor = color;
vOpacity = opacity;
vVisible = visible;

gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
}
`;
Expand All @@ -419,7 +419,7 @@ DecompositionView.prototype._fastInitParallelPlot = function()
varying vec3 vColor;
varying float vOpacity;
varying float vVisible;

void main() {
if (vVisible <= 0.0 || vOpacity <= 0.0)
discard;
Expand Down