diff --git a/.eslintrc.json b/.eslintrc.json index 06a71cb16..84c38bbda 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -64,7 +64,8 @@ "_comment": "Closure style allows redeclarations", "no-redeclare": ["off"], "valid-jsdoc": ["error", {"requireReturn": false}], - "no-console": ["off"] + "no-console": ["off"], + "no-multi-spaces": ["error", { "ignoreEOLComments": true }] }, "env": { "browser": true diff --git a/core/block_render_svg.js b/core/block_render_svg.js index 05cf46e03..8b6ac81fb 100644 --- a/core/block_render_svg.js +++ b/core/block_render_svg.js @@ -372,7 +372,7 @@ Blockly.BlockSvg.prototype.renderFields_ = function(fieldList, } } if (this.RTL && - field instanceof Blockly.FieldImage && + field instanceof Blockly.FieldImage && field.getFlipRtl()) { scale = 'scale(-1 1)'; translateX += field.renderWidth; diff --git a/core/bubble.js b/core/bubble.js index fe72b2c64..516c4b208 100644 --- a/core/bubble.js +++ b/core/bubble.js @@ -523,7 +523,7 @@ Blockly.Bubble.prototype.getOptimalRelativeLeft_ = function(metrics) { if (this.workspace_.RTL) { // Bubble coordinates are flipped in RTL. - var bubbleRight = this.anchorXY_.x - relativeLeft; + var bubbleRight = this.anchorXY_.x - relativeLeft; var bubbleLeft = bubbleRight - this.width_; var workspaceRight = metrics.viewLeft + metrics.viewWidth; diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js index c8eed71d9..81286bed7 100644 --- a/core/bubble_dragger.js +++ b/core/bubble_dragger.js @@ -143,7 +143,7 @@ Blockly.BubbleDragger.prototype.dragBubble = function(e, currentDragDeltaXY) { this.draggingBubble_.moveDuringDrag(this.dragSurface_, newLoc); if (this.draggingBubble_.isDeletable()) { - this.deleteArea_ = this.workspace_.isDeleteArea(e); + this.deleteArea_ = this.workspace_.isDeleteArea(e); this.updateCursorDuringBubbleDrag_(); } }; diff --git a/core/field_variable.js b/core/field_variable.js index 74f57378e..dd6bed075 100644 --- a/core/field_variable.js +++ b/core/field_variable.js @@ -337,7 +337,7 @@ Blockly.FieldVariable.prototype.setTypes_ = function(opt_variableTypes, 'a FieldVariable'); } // Only update the field once all checks pass. - this.defaultType_ = defaultType; + this.defaultType_ = defaultType; this.variableTypes = variableTypes; }; diff --git a/core/flyout_base.js b/core/flyout_base.js index b92c6bcf8..f22b19637 100644 --- a/core/flyout_base.js +++ b/core/flyout_base.js @@ -253,7 +253,7 @@ Blockly.Flyout.prototype.init = function(targetWorkspace) { this.targetWorkspace_.getGesture.bind(this.targetWorkspace_); // Get variables from the main workspace rather than the target workspace. - this.workspace_.variableMap_ = this.targetWorkspace_.getVariableMap(); + this.workspace_.variableMap_ = this.targetWorkspace_.getVariableMap(); this.workspace_.createPotentialVariableMap(); }; diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js index 79b9b216e..a40b3b7ba 100644 --- a/core/insertion_marker_manager.js +++ b/core/insertion_marker_manager.js @@ -343,7 +343,7 @@ Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function( var yDiff = this.localConnection_.y_ + dxy.y - this.closestConnection_.y_; var curDistance = Math.sqrt(xDiff * xDiff + yDiff * yDiff); // Slightly prefer the existing preview over a new preview. - return !(candidateClosest && radius > curDistance - + return !(candidateClosest && radius > curDistance - Blockly.CURRENT_CONNECTION_PREFERENCE); } else if (!this.localConnection_ && !this.closestConnection_) { // We weren't showing a preview before, but we should now. diff --git a/core/keyboard_nav/cursor_svg.js b/core/keyboard_nav/cursor_svg.js index fc0f825ea..7214cd90d 100644 --- a/core/keyboard_nav/cursor_svg.js +++ b/core/keyboard_nav/cursor_svg.js @@ -258,8 +258,8 @@ Blockly.CursorSvg.prototype.showWithStack_ = function() { var height = heightWidth.height + Blockly.CursorSvg.STACK_PADDING; // Shift the rectangle slightly to upper left so padding is equal on all sides. - var x = -1 * Blockly.CursorSvg.STACK_PADDING / 2; - var y = -1 * Blockly.CursorSvg.STACK_PADDING / 2; + var x = -1 * Blockly.CursorSvg.STACK_PADDING / 2; + var y = -1 * Blockly.CursorSvg.STACK_PADDING / 2; // If the block has an output connection it needs more padding. if (block.outputConnection) { diff --git a/core/mutator.js b/core/mutator.js index f3aa9df16..b2a2f21f3 100644 --- a/core/mutator.js +++ b/core/mutator.js @@ -165,7 +165,7 @@ Blockly.Mutator.prototype.createEditor_ = function() { // a top level svg. Instead of handling scale themselves, mutators // inherit scale from the parent workspace. // To fix this, scale needs to be applied at a different level in the dom. - var flyoutSvg = this.workspace_.addFlyout_('g'); + var flyoutSvg = this.workspace_.addFlyout_('g'); var background = this.workspace_.createDom('blocklyMutatorBackground'); // Insert the flyout after the but before the block canvas so that diff --git a/core/utils.js b/core/utils.js index 7f184d507..a3a5bb97a 100644 --- a/core/utils.js +++ b/core/utils.js @@ -339,7 +339,7 @@ Blockly.utils.tokenizeInterpolation_ = function(message, state = 0; // and parse as string literal. } else if (c != '}') { buffer.push(c); - } else { + } else { var rawKey = buffer.join(''); if (/[A-Z]\w*/i.test(rawKey)) { // Strict matching // Found a valid string key. Attempt case insensitive match. diff --git a/core/xml.js b/core/xml.js index 50c377ed8..148ca3fd2 100644 --- a/core/xml.js +++ b/core/xml.js @@ -479,7 +479,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) { if (blockXY.y < newY) { newY = blockXY.y; } - if (blockXY.x < newX) { // if we align also on x + if (blockXY.x < newX) { // if we align also on x newX = blockXY.x; } } diff --git a/tests/mocha/field_number_test.js b/tests/mocha/field_number_test.js index 4915c8b7f..781cf9bfa 100644 --- a/tests/mocha/field_number_test.js +++ b/tests/mocha/field_number_test.js @@ -48,7 +48,7 @@ suite ('Number Fields', function() { { 'value': value, min: value, max: value, precision: value }); } function assertNumberFieldSameValues(numberField, value) { - assertNumberField(numberField, value, value, value, value); + assertNumberField(numberField, value, value, value, value); } suite('Constructor', function() { test('Empty', function() {