mirror of
https://github.com/google/blockly.git
synced 2026-01-11 19:07:08 +01:00
* Adding new minimap demo * Basic code style changes. Adding a few more comments. Return early if disableScrollChange in onScrollChange listener. * Adding horizontal scrolling. Changed scroll change callbacks from onScroll_ to setHandlePosition. onScroll_ is not challed when workspace is dragged. * Registering mousemove and mouseup listener in mousedown event. Mousemove and Mouseup events are now listening over document. * Adding the remove variable modal and functionality to accessible Blockly. (#1011) * Minimap position bug fix for browsers other than chrome. Added touch support. * Adding an add variable modal to accessible Blockly. (#1015) * Adding the remove variable modal and functionality to accessible Blockly. * Adding the add variable modal for accessible Blockly. * Block browser context menu in the toolbox and flyout * Add links to the dev registration form and contributor guidelines * Miscellaneous comment cleanup * Adding the common modal class. (#1017) Centralizes accessible modal behavior. * - Changed error message referencing 'procedure' instead of 'function' (#1019) - Added iOS specific UI messages - Fixed bug with js_to_json.py script where it didn't recognize ' character * - Allows use of Blockly's messaging format for category name, colour,… (#1028) ...in toolbox XML. - Updated code editor demo to use this message format - Re-built blockly_compressed.js * Making text_count use a text color (like text_length, which also returns a number). (#1027) * Enable google/blockly with continuous build on travis ci (#1023) (#1035) * create .travis for ci job * initial checkin for blocky-web travis ci job * rename file to .travis.yaml for typo * remove after_script * added cache * rename .travis.yaml to .travis.yml * Update .travis.yml * include build script * fix yaml file format issue * debug install part * debug build issue * Update .travis.yml * remove cache for now * Update .travis.yml * Update .travis.yml * Update .travis.yml * more debug info * Update .travis.yml * Update .travis.yml * fix typo * installing chrome browser * remove chrome setting config * run build.py as part of npm install * Update .travis.yml * update karma dependency * use karma as test runner * fix typo * remove karma test for now * Update .travis.yml * Update package.json * add npm test target * add browserstack-runner depdendency * update browser support * fix typo for test target * fix chrome typo * added closure dependency * add google-closure-library * include blockly_uncompressed.js and core.js dependency * uncomment out core/*.js files * add kama job as part of install * remove browserstack add on for now * fix karma config typo * add karma-closure * add os support * remove typo config * include more closure files * change os back to linux * use closure-library from node_modules * change log level back to INFO * change npm test target to use open browser command instead of karma * change travis test target to use open command instead of karma * list current directory * find what's in current dir * typo command * Update .travis.yml * typo again * open right index.html * use right path for index.html * xdg-open to open default browser on travis * exit browser after 5s wait * change timeout to 1 min * exit after opening up browser * use browser only * use karma * remove un-needed dependency * clean up script section * fix typo * update build status on readme * initial commit for selenium integration tests * update selenium jar path * fix test_runner.js typo * add more debug info * check java version * add && instead of 9288 * fix java path * add logic to check if selenium is running or not * add some deugging info * initial commit to get chromedriver * add chromedriver flag * add get_chromedriver.sh to package.json and .travel * change browser to chrome for now * fix path issue * update chromdriver path * fix path issue again * more debugging * add debug msg * fix typo * minor fix for getting chromedriver * install latest chrome browser * clean up pakcage.json * use npm target for test run * remove removing trailing comma * fix another trailing comma * updated travis test target * clean up scripts * not sure nmp run preinstall * redirect selenium log to tmp file * revert writing console log to file * update test summary * more clean up * minor clean up before pull request * resolved closure-library conflict 1. add closure-library to dependencies instead of devDependencies. 2. add lint back in scripts block * fix typo (adding comma) in script section * Renames Blockly.workspaceDragSurface to Blockly.WorkspaceDragSurface. Fixes #880. * Ensure useDragSurface is a boolean. Fixed #988 * use pretest instead of preinstall in package.json (#1043) * cherry pick for pretest fix * put pretest target to test_setup.sh * fix conflict * cherry pick for get_chromedriver.sh * add some sleep to wait download to finish * use node.js stable * use npm test target * field_angle renders degree symbol consistently. Fixes #973 * bumpNeighbours_ function moved to block_svg. Fixed #1009 * Update RegEx in js-to-json to match windowi eol (#1050) The current regex only works with the "\n" line endings as it expects no characters after the optional ";" at the end of the line. In windows, if it adds the "\r" it counts as a characters and is not part of the line terminator so it doesn't match. * Fix French translation of "colour with rgb" block (#1053) "colorier", which is currently used, is a verb and proposed "couleur" is a noun: the block in question does not change colour of anything, it creates new colour instead, thus noun is more applicable. Also, noun is used in French translation of "random colour" block: "couleur aléatoire". * Enforcing non-empty names on value inputs and statement inputs. (#1054) * Correcting #1054 (#1056) single quotes. better logic. * Created a variable model with name, id, and type. Created a jsunit test file for variable model. * Change how blockly handles cursors. The old way was quite slow becau… (#1057) * Change how blockly handles cursors. The old way was quite slow because it changed the stylesheet directly. See issue #981 for more details on implementation and tradeoffs. This changes makes the following high level changes: deprecate Blockly.Css.setCursor, use built in open and closed hand cursor instead of custom .cur files, add css to draggable objects to set the open and closed hand cursors. * Rebuild blockly_uncompressed to pick up a testing change to make travis happy. Fix a build warning from a multi-line string in the process. (#1059) * Merge master into develop (#1063) - pick up translation changes - clean up trailing spaces * Rebuild for translations
402 lines
14 KiB
JavaScript
402 lines
14 KiB
JavaScript
/**
|
|
* @license
|
|
* Visual Blocks Editor
|
|
*
|
|
* Copyright 2012 Google Inc.
|
|
* https://developers.google.com/blockly/
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Object representing a mutator dialog. A mutator allows the
|
|
* user to change the shape of a block using a nested blocks editor.
|
|
* @author fraser@google.com (Neil Fraser)
|
|
*/
|
|
'use strict';
|
|
|
|
goog.provide('Blockly.Mutator');
|
|
|
|
goog.require('Blockly.Bubble');
|
|
goog.require('Blockly.Icon');
|
|
goog.require('Blockly.WorkspaceSvg');
|
|
goog.require('goog.Timer');
|
|
goog.require('goog.dom');
|
|
|
|
|
|
/**
|
|
* Class for a mutator dialog.
|
|
* @param {!Array.<string>} quarkNames List of names of sub-blocks for flyout.
|
|
* @extends {Blockly.Icon}
|
|
* @constructor
|
|
*/
|
|
Blockly.Mutator = function(quarkNames) {
|
|
Blockly.Mutator.superClass_.constructor.call(this, null);
|
|
this.quarkNames_ = quarkNames;
|
|
};
|
|
goog.inherits(Blockly.Mutator, Blockly.Icon);
|
|
|
|
/**
|
|
* Width of workspace.
|
|
* @private
|
|
*/
|
|
Blockly.Mutator.prototype.workspaceWidth_ = 0;
|
|
|
|
/**
|
|
* Height of workspace.
|
|
* @private
|
|
*/
|
|
Blockly.Mutator.prototype.workspaceHeight_ = 0;
|
|
|
|
/**
|
|
* Draw the mutator icon.
|
|
* @param {!Element} group The icon group.
|
|
* @private
|
|
*/
|
|
Blockly.Mutator.prototype.drawIcon_ = function(group) {
|
|
// Square with rounded corners.
|
|
Blockly.utils.createSvgElement('rect',
|
|
{'class': 'blocklyIconShape',
|
|
'rx': '4', 'ry': '4',
|
|
'height': '16', 'width': '16'},
|
|
group);
|
|
// Gear teeth.
|
|
Blockly.utils.createSvgElement('path',
|
|
{'class': 'blocklyIconSymbol',
|
|
'd': 'm4.203,7.296 0,1.368 -0.92,0.677 -0.11,0.41 0.9,1.559 0.41,0.11 1.043,-0.457 1.187,0.683 0.127,1.134 0.3,0.3 1.8,0 0.3,-0.299 0.127,-1.138 1.185,-0.682 1.046,0.458 0.409,-0.11 0.9,-1.559 -0.11,-0.41 -0.92,-0.677 0,-1.366 0.92,-0.677 0.11,-0.41 -0.9,-1.559 -0.409,-0.109 -1.046,0.458 -1.185,-0.682 -0.127,-1.138 -0.3,-0.299 -1.8,0 -0.3,0.3 -0.126,1.135 -1.187,0.682 -1.043,-0.457 -0.41,0.11 -0.899,1.559 0.108,0.409z'},
|
|
group);
|
|
// Axle hole.
|
|
Blockly.utils.createSvgElement('circle',
|
|
{'class': 'blocklyIconShape', 'r': '2.7', 'cx': '8', 'cy': '8'},
|
|
group);
|
|
};
|
|
|
|
/**
|
|
* Clicking on the icon toggles if the mutator bubble is visible.
|
|
* Disable if block is uneditable.
|
|
* @param {!Event} e Mouse click event.
|
|
* @private
|
|
* @override
|
|
*/
|
|
Blockly.Mutator.prototype.iconClick_ = function(e) {
|
|
if (this.block_.isEditable()) {
|
|
Blockly.Icon.prototype.iconClick_.call(this, e);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Create the editor for the mutator's bubble.
|
|
* @return {!Element} The top-level node of the editor.
|
|
* @private
|
|
*/
|
|
Blockly.Mutator.prototype.createEditor_ = function() {
|
|
/* Create the editor. Here's the markup that will be generated:
|
|
<svg>
|
|
[Workspace]
|
|
</svg>
|
|
*/
|
|
this.svgDialog_ = Blockly.utils.createSvgElement('svg',
|
|
{'x': Blockly.Bubble.BORDER_WIDTH, 'y': Blockly.Bubble.BORDER_WIDTH},
|
|
null);
|
|
// Convert the list of names into a list of XML objects for the flyout.
|
|
if (this.quarkNames_.length) {
|
|
var quarkXml = goog.dom.createDom('xml');
|
|
for (var i = 0, quarkName; quarkName = this.quarkNames_[i]; i++) {
|
|
quarkXml.appendChild(goog.dom.createDom('block', {'type': quarkName}));
|
|
}
|
|
} else {
|
|
var quarkXml = null;
|
|
}
|
|
var workspaceOptions = {
|
|
languageTree: quarkXml,
|
|
parentWorkspace: this.block_.workspace,
|
|
pathToMedia: this.block_.workspace.options.pathToMedia,
|
|
RTL: this.block_.RTL,
|
|
toolboxPosition: this.block_.RTL ? Blockly.TOOLBOX_AT_RIGHT :
|
|
Blockly.TOOLBOX_AT_LEFT,
|
|
horizontalLayout: false,
|
|
getMetrics: this.getFlyoutMetrics_.bind(this),
|
|
setMetrics: null
|
|
};
|
|
this.workspace_ = new Blockly.WorkspaceSvg(workspaceOptions);
|
|
this.workspace_.isMutator = true;
|
|
|
|
// Mutator flyouts go inside the mutator workspace's <g> rather than in
|
|
// 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 background = this.workspace_.createDom('blocklyMutatorBackground');
|
|
|
|
// Insert the flyout after the <rect> but before the block canvas so that
|
|
// the flyout is underneath in z-order. This makes blocks layering during
|
|
// dragging work properly.
|
|
background.insertBefore(flyoutSvg, this.workspace_.svgBlockCanvas_);
|
|
this.svgDialog_.appendChild(background);
|
|
|
|
return this.svgDialog_;
|
|
};
|
|
|
|
/**
|
|
* Add or remove the UI indicating if this icon may be clicked or not.
|
|
*/
|
|
Blockly.Mutator.prototype.updateEditable = function() {
|
|
if (!this.block_.isInFlyout) {
|
|
if (this.block_.isEditable()) {
|
|
if (this.iconGroup_) {
|
|
Blockly.utils.removeClass(/** @type {!Element} */ (this.iconGroup_),
|
|
'blocklyIconGroupReadonly');
|
|
}
|
|
} else {
|
|
// Close any mutator bubble. Icon is not clickable.
|
|
this.setVisible(false);
|
|
if (this.iconGroup_) {
|
|
Blockly.utils.addClass(/** @type {!Element} */ (this.iconGroup_),
|
|
'blocklyIconGroupReadonly');
|
|
}
|
|
}
|
|
}
|
|
// Default behaviour for an icon.
|
|
Blockly.Icon.prototype.updateEditable.call(this);
|
|
};
|
|
|
|
/**
|
|
* Callback function triggered when the bubble has resized.
|
|
* Resize the workspace accordingly.
|
|
* @private
|
|
*/
|
|
Blockly.Mutator.prototype.resizeBubble_ = function() {
|
|
var doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
|
|
var workspaceSize = this.workspace_.getCanvas().getBBox();
|
|
var width;
|
|
if (this.block_.RTL) {
|
|
width = -workspaceSize.x;
|
|
} else {
|
|
width = workspaceSize.width + workspaceSize.x;
|
|
}
|
|
var height = workspaceSize.height + doubleBorderWidth * 3;
|
|
if (this.workspace_.flyout_) {
|
|
var flyoutMetrics = this.workspace_.flyout_.getMetrics_();
|
|
height = Math.max(height, flyoutMetrics.contentHeight + 20);
|
|
}
|
|
width += doubleBorderWidth * 3;
|
|
// Only resize if the size difference is significant. Eliminates shuddering.
|
|
if (Math.abs(this.workspaceWidth_ - width) > doubleBorderWidth ||
|
|
Math.abs(this.workspaceHeight_ - height) > doubleBorderWidth) {
|
|
// Record some layout information for getFlyoutMetrics_.
|
|
this.workspaceWidth_ = width;
|
|
this.workspaceHeight_ = height;
|
|
// Resize the bubble.
|
|
this.bubble_.setBubbleSize(width + doubleBorderWidth,
|
|
height + doubleBorderWidth);
|
|
this.svgDialog_.setAttribute('width', this.workspaceWidth_);
|
|
this.svgDialog_.setAttribute('height', this.workspaceHeight_);
|
|
}
|
|
|
|
if (this.block_.RTL) {
|
|
// Scroll the workspace to always left-align.
|
|
var translation = 'translate(' + this.workspaceWidth_ + ',0)';
|
|
this.workspace_.getCanvas().setAttribute('transform', translation);
|
|
}
|
|
this.workspace_.resize();
|
|
};
|
|
|
|
/**
|
|
* Show or hide the mutator bubble.
|
|
* @param {boolean} visible True if the bubble should be visible.
|
|
*/
|
|
Blockly.Mutator.prototype.setVisible = function(visible) {
|
|
if (visible == this.isVisible()) {
|
|
// No change.
|
|
return;
|
|
}
|
|
Blockly.Events.fire(
|
|
new Blockly.Events.Ui(this.block_, 'mutatorOpen', !visible, visible));
|
|
if (visible) {
|
|
// Create the bubble.
|
|
this.bubble_ = new Blockly.Bubble(
|
|
/** @type {!Blockly.WorkspaceSvg} */ (this.block_.workspace),
|
|
this.createEditor_(), this.block_.svgPath_, this.iconXY_, null, null);
|
|
var tree = this.workspace_.options.languageTree;
|
|
if (tree) {
|
|
this.workspace_.flyout_.init(this.workspace_);
|
|
this.workspace_.flyout_.show(tree.childNodes);
|
|
}
|
|
|
|
this.rootBlock_ = this.block_.decompose(this.workspace_);
|
|
var blocks = this.rootBlock_.getDescendants();
|
|
for (var i = 0, child; child = blocks[i]; i++) {
|
|
child.render();
|
|
}
|
|
// The root block should not be dragable or deletable.
|
|
this.rootBlock_.setMovable(false);
|
|
this.rootBlock_.setDeletable(false);
|
|
if (this.workspace_.flyout_) {
|
|
var margin = this.workspace_.flyout_.CORNER_RADIUS * 2;
|
|
var x = this.workspace_.flyout_.width_ + margin;
|
|
} else {
|
|
var margin = 16;
|
|
var x = margin;
|
|
}
|
|
if (this.block_.RTL) {
|
|
x = -x;
|
|
}
|
|
this.rootBlock_.moveBy(x, margin);
|
|
// Save the initial connections, then listen for further changes.
|
|
if (this.block_.saveConnections) {
|
|
var thisMutator = this;
|
|
this.block_.saveConnections(this.rootBlock_);
|
|
this.sourceListener_ = function() {
|
|
thisMutator.block_.saveConnections(thisMutator.rootBlock_);
|
|
};
|
|
this.block_.workspace.addChangeListener(this.sourceListener_);
|
|
}
|
|
this.resizeBubble_();
|
|
// When the mutator's workspace changes, update the source block.
|
|
this.workspace_.addChangeListener(this.workspaceChanged_.bind(this));
|
|
this.updateColour();
|
|
} else {
|
|
// Dispose of the bubble.
|
|
this.svgDialog_ = null;
|
|
this.workspace_.dispose();
|
|
this.workspace_ = null;
|
|
this.rootBlock_ = null;
|
|
this.bubble_.dispose();
|
|
this.bubble_ = null;
|
|
this.workspaceWidth_ = 0;
|
|
this.workspaceHeight_ = 0;
|
|
if (this.sourceListener_) {
|
|
this.block_.workspace.removeChangeListener(this.sourceListener_);
|
|
this.sourceListener_ = null;
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Update the source block when the mutator's blocks are changed.
|
|
* Bump down any block that's too high.
|
|
* Fired whenever a change is made to the mutator's workspace.
|
|
* @private
|
|
*/
|
|
Blockly.Mutator.prototype.workspaceChanged_ = function() {
|
|
if (Blockly.dragMode_ == Blockly.DRAG_NONE) {
|
|
var blocks = this.workspace_.getTopBlocks(false);
|
|
var MARGIN = 20;
|
|
for (var b = 0, block; block = blocks[b]; b++) {
|
|
var blockXY = block.getRelativeToSurfaceXY();
|
|
var blockHW = block.getHeightWidth();
|
|
if (blockXY.y + blockHW.height < MARGIN) {
|
|
// Bump any block that's above the top back inside.
|
|
block.moveBy(0, MARGIN - blockHW.height - blockXY.y);
|
|
}
|
|
}
|
|
}
|
|
|
|
// When the mutator's workspace changes, update the source block.
|
|
if (this.rootBlock_.workspace == this.workspace_) {
|
|
Blockly.Events.setGroup(true);
|
|
var block = this.block_;
|
|
var oldMutationDom = block.mutationToDom();
|
|
var oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
|
|
// Switch off rendering while the source block is rebuilt.
|
|
var savedRendered = block.rendered;
|
|
block.rendered = false;
|
|
// Allow the source block to rebuild itself.
|
|
block.compose(this.rootBlock_);
|
|
// Restore rendering and show the changes.
|
|
block.rendered = savedRendered;
|
|
// Mutation may have added some elements that need initializing.
|
|
block.initSvg();
|
|
var newMutationDom = block.mutationToDom();
|
|
var newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
|
|
if (oldMutation != newMutation) {
|
|
Blockly.Events.fire(new Blockly.Events.Change(
|
|
block, 'mutation', null, oldMutation, newMutation));
|
|
// Ensure that any bump is part of this mutation's event group.
|
|
var group = Blockly.Events.getGroup();
|
|
setTimeout(function() {
|
|
Blockly.Events.setGroup(group);
|
|
block.bumpNeighbours_();
|
|
Blockly.Events.setGroup(false);
|
|
}, Blockly.BUMP_DELAY);
|
|
}
|
|
if (block.rendered) {
|
|
block.render();
|
|
}
|
|
this.resizeBubble_();
|
|
Blockly.Events.setGroup(false);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Return an object with all the metrics required to size scrollbars for the
|
|
* mutator flyout. The following properties are computed:
|
|
* .viewHeight: Height of the visible rectangle,
|
|
* .viewWidth: Width of the visible rectangle,
|
|
* .absoluteTop: Top-edge of view.
|
|
* .absoluteLeft: Left-edge of view.
|
|
* @return {!Object} Contains size and position metrics of mutator dialog's
|
|
* workspace.
|
|
* @private
|
|
*/
|
|
Blockly.Mutator.prototype.getFlyoutMetrics_ = function() {
|
|
return {
|
|
viewHeight: this.workspaceHeight_,
|
|
viewWidth: this.workspaceWidth_,
|
|
absoluteTop: 0,
|
|
absoluteLeft: 0
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Dispose of this mutator.
|
|
*/
|
|
Blockly.Mutator.prototype.dispose = function() {
|
|
this.block_.mutator = null;
|
|
Blockly.Icon.prototype.dispose.call(this);
|
|
};
|
|
|
|
/**
|
|
* Reconnect an block to a mutated input.
|
|
* @param {Blockly.Connection} connectionChild Connection on child block.
|
|
* @param {!Blockly.Block} block Parent block.
|
|
* @param {string} inputName Name of input on parent block.
|
|
* @return {boolean} True iff a reconnection was made, false otherwise.
|
|
*/
|
|
Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
|
|
if (!connectionChild || !connectionChild.getSourceBlock().workspace) {
|
|
return false; // No connection or block has been deleted.
|
|
}
|
|
var connectionParent = block.getInput(inputName).connection;
|
|
var currentParent = connectionChild.targetBlock();
|
|
if ((!currentParent || currentParent == block) &&
|
|
connectionParent.targetConnection != connectionChild) {
|
|
if (connectionParent.isConnected()) {
|
|
// There's already something connected here. Get rid of it.
|
|
connectionParent.disconnect();
|
|
}
|
|
connectionParent.connect(connectionChild);
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
// Export symbols that would otherwise be renamed by Closure compiler.
|
|
if (!goog.global['Blockly']) {
|
|
goog.global['Blockly'] = {};
|
|
}
|
|
if (!goog.global['Blockly']['Mutator']) {
|
|
goog.global['Blockly']['Mutator'] = {};
|
|
}
|
|
goog.global['Blockly']['Mutator']['reconnect'] = Blockly.Mutator.reconnect;
|