From 9d82bf3a18a5b63f927b25d870cc9ee8e6cc95ed Mon Sep 17 00:00:00 2001 From: rachel-fenichel Date: Wed, 30 Mar 2016 12:59:29 -0700 Subject: [PATCH] lint --- core/css.js | 6 ++--- core/flyout.js | 64 ++++++++++++++++++++++--------------------------- core/toolbox.js | 6 ++--- 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/core/css.js b/core/css.js index ac416dc7b..e9facc8d0 100644 --- a/core/css.js +++ b/core/css.js @@ -432,12 +432,12 @@ Blockly.Css.CONTENT = [ '.blocklyHorizontalTree {', 'float: left;', - 'margin: 1px 5px 8px 0px;', + 'margin: 1px 5px 8px 0;', '}', '.blocklyHorizontalTreeRtl {', 'float: right;', - 'margin: 1px 0px 8px 5px;', + 'margin: 1px 0 8px 5px;', '}', '.blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {', @@ -450,7 +450,7 @@ Blockly.Css.CONTENT = [ '.blocklyTreeSeparator {', 'border-bottom: solid #e5e5e5 1px;', - 'height: 0px;', + 'height: 0;', 'margin: 5px 0;', '}', diff --git a/core/flyout.js b/core/flyout.js index a665e3359..25cc41c89 100644 --- a/core/flyout.js +++ b/core/flyout.js @@ -240,7 +240,7 @@ Blockly.Flyout.prototype.getMetrics_ = function() { var optionBox = {height: 0, y: 0}; } - var absoluteTop = this.verticalOffset_ + this.SCROLLBAR_PADDING + var absoluteTop = this.verticalOffset_ + this.SCROLLBAR_PADDING; if (this.horizontalLayout_) { if (this.toolboxPosition_ == Blockly.TOOLBOX_AT_BOTTOM) { absoluteTop = 0; @@ -284,13 +284,9 @@ Blockly.Flyout.prototype.setMetrics_ = function(xyRatio) { this.workspace_.scrollY = -metrics.contentHeight * xyRatio.y - metrics.contentTop; } else if (this.horizontalLayout_ && goog.isNumber(xyRatio.x)) { - if (this.RTL) { - this.workspace_.scrollX = - -metrics.contentWidth * xyRatio.x + metrics.contentLeft; - } else { - this.workspace_.scrollX = - -metrics.contentWidth * xyRatio.x - metrics.contentLeft; - } + this.workspace_.scrollX = + -metrics.contentWidth * xyRatio.x + + (this.RTL ? metrics.contentLeft : -metrics.contentLeft); } var translateX = this.horizontalLayout_ && this.RTL ? metrics.absoluteLeft + metrics.viewWidth - this.workspace_.scrollX : @@ -382,7 +378,7 @@ Blockly.Flyout.prototype.setBackgroundPath_ = function(width, height) { * @private */ Blockly.Flyout.prototype.setBackgroundPathVertical_ = function(width, height) { - var atRight = this.toolboxPosition_ == Blockly.TOOLBOX_AT_RIGHT; + var atRight = this.toolboxPosition_ == Blockly.TOOLBOX_AT_RIGHT; // Decide whether to start on the left or right. var path = ['M ' + (atRight ? this.width_ : 0) + ',0']; // Top. @@ -414,35 +410,35 @@ Blockly.Flyout.prototype.setBackgroundPathVertical_ = function(width, height) { * @private */ Blockly.Flyout.prototype.setBackgroundPathHorizontal_ = function(width, height) { - var atTop = this.toolboxPosition_ == Blockly.TOOLBOX_AT_TOP; - // start at top left. + var atTop = this.toolboxPosition_ == Blockly.TOOLBOX_AT_TOP; + // Start at top left. var path = ['M 0,' + (atTop ? 0 : this.CORNER_RADIUS)]; if (atTop) { - // top + // Top. path.push('h', width + this.CORNER_RADIUS); - // right + // Right. path.push('v', height); - // bottom + // Bottom. path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1, -this.CORNER_RADIUS, this.CORNER_RADIUS); path.push('h', -1 * (width - this.CORNER_RADIUS)); - // left + // Left. path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1, -this.CORNER_RADIUS, -this.CORNER_RADIUS); path.push('z'); } else { - // top + // Top. path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1, this.CORNER_RADIUS, -this.CORNER_RADIUS); path.push('h', width - this.CORNER_RADIUS); - // right + // Right. path.push('a', this.CORNER_RADIUS, this.CORNER_RADIUS, 0, 0, 1, this.CORNER_RADIUS, this.CORNER_RADIUS); path.push('v', height - this.CORNER_RADIUS); - // bottom + // Bottom. path.push('h', -width - this.CORNER_RADIUS); - // left + // Left. path.push('z'); } this.svgBackground_.setAttribute('d', path.join(' ')); @@ -628,7 +624,7 @@ Blockly.Flyout.prototype.show = function(xmlList) { /** * Add listeners to a block that has been added to the flyout. - * @param {Element} root The root node of the SVG group the block is in. + * @param {!Element} root The root node of the SVG group the block is in. * @param {!Blockly.Block} block The block to add listeners for. * @param {!Element} rect The invisible rectangle under the block that acts as * a button for that block. @@ -707,7 +703,7 @@ Blockly.Flyout.prototype.onMouseDown_ = function(e) { }; /** - * Handle a mouse-move to vertically drag the flyout. + * Handle a mouse-move to drag the flyout. * @param {!Event} e Mouse move event. * @private */ @@ -717,16 +713,14 @@ Blockly.Flyout.prototype.onMouseMove_ = function(e) { this.startDragMouseX_ = e.clientX; var metrics = this.getMetrics_(); var x = metrics.viewLeft - dx; - x = Math.min(x, metrics.contentWidth - metrics.viewWidth); - x = Math.max(x, 0); + x = goog.math.clamp(x, 0, metrics.contentWidth - metrics.viewWidth); this.scrollbar_.set(x); } else { var dy = e.clientY - this.startDragMouseY_; this.startDragMouseY_ = e.clientY; var metrics = this.getMetrics_(); var y = metrics.viewTop - dy; - y = Math.min(y, metrics.contentHeight - metrics.viewHeight); - y = Math.max(y, 0); + y = goog.math.clamp(y, o, metrics.contentHeight - metrics.viewHeight); this.scrollbar_.set(y); } }; @@ -859,16 +853,15 @@ Blockly.Flyout.prototype.getClientRect = function() { if (this.toolboxPosition_ == Blockly.TOOLBOX_AT_TOP) { return new goog.math.Rect(-BIG_NUM, y - BIG_NUM, BIG_NUM * 2, - BIG_NUM + height); + BIG_NUM + height); } else if (this.toolboxPosition_ == Blockly.TOOLBOX_AT_BOTTOM) { return new goog.math.Rect(-BIG_NUM, y + this.verticalOffset_, BIG_NUM * 2, - BIG_NUM + height); + BIG_NUM + height); } else if (this.toolboxPosition_ == Blockly.TOOLBOX_AT_LEFT) { return new goog.math.Rect(x - BIG_NUM, -BIG_NUM, BIG_NUM + width, - BIG_NUM * 2); + BIG_NUM * 2); } else { // Right - return new goog.math.Rect(x, -BIG_NUM, BIG_NUM + width, - BIG_NUM * 2); + return new goog.math.Rect(x, -BIG_NUM, BIG_NUM + width, BIG_NUM * 2); } }; @@ -907,14 +900,13 @@ Blockly.Flyout.prototype.reflowHorizontal = function() { var flyoutHeight = 0; var margin = this.CORNER_RADIUS; var blocks = this.workspace_.getTopBlocks(false); - for (var x = 0, block; block = blocks[x]; x++) { - var height = block.getHeightWidth().height; - flyoutHeight = Math.max(flyoutHeight, height); + for (var i = 0, block; block = blocks[i]; i++) { + flyoutHeight = Math.max(flyoutHeight, block.getHeightWidth().height); } flyoutHeight *= this.workspace_.scale; flyoutHeight += margin * 1.5 + Blockly.Scrollbar.scrollbarThickness; if (this.height_ != flyoutHeight) { - for (var x = 0, block; block = blocks[x]; x++) { + for (var i = 0, block; block = blocks[i]; i++) { var blockHW = block.getHeightWidth(); if (block.flyoutRect_) { block.flyoutRect_.setAttribute('width', blockHW.width); @@ -941,7 +933,7 @@ Blockly.Flyout.prototype.reflowVertical = function() { var flyoutWidth = 0; var margin = this.CORNER_RADIUS; var blocks = this.workspace_.getTopBlocks(false); - for (var x = 0, block; block = blocks[x]; x++) { + for (var i = 0, block; block = blocks[i]; i++) { var width = block.getHeightWidth().width; if (block.outputConnection) { width -= Blockly.BlockSvg.TAB_WIDTH; @@ -952,7 +944,7 @@ Blockly.Flyout.prototype.reflowVertical = function() { flyoutWidth *= this.workspace_.scale; flyoutWidth += margin * 1.5 + Blockly.Scrollbar.scrollbarThickness; if (this.width_ != flyoutWidth) { - for (var x = 0, block; block = blocks[x]; x++) { + for (var i = 0, block; block = blocks[i]; i++) { var blockHW = block.getHeightWidth(); if (this.RTL) { // With the flyoutWidth known, right-align the blocks. diff --git a/core/toolbox.js b/core/toolbox.js index c3478a0bc..568b98b60 100644 --- a/core/toolbox.js +++ b/core/toolbox.js @@ -402,10 +402,10 @@ Blockly.Toolbox.prototype.getClientRect = function() { } else if (this.toolboxPosition == Blockly.TOOLBOX_AT_RIGHT) { return new goog.math.Rect(x, -BIG_NUM, BIG_NUM + width, 2 * BIG_NUM); } else if (this.toolboxPosition == Blockly.TOOLBOX_AT_TOP) { - return new goog.math.Rect(-BIG_NUM, -BIG_NUM, 2 * BIG_NUM, - BIG_NUM + y + height); + return new goog.math.Rect(-BIG_NUM, -BIG_NUM, 2 * BIG_NUM, + BIG_NUM + y + height); } else { // Bottom - return new goog.math.Rect(0, y, 2 * BIG_NUM, BIG_NUM + width); + return new goog.math.Rect(0, y, 2 * BIG_NUM, BIG_NUM + width); } };