mirror of
https://github.com/google/blockly.git
synced 2026-01-21 07:47:09 +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
192 lines
6.2 KiB
JavaScript
192 lines
6.2 KiB
JavaScript
/**
|
|
* @license
|
|
* Visual Blocks Editor
|
|
*
|
|
* Copyright 2016 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 A class that manages a surface for dragging blocks. When a
|
|
* block drag is started, we move the block (and children) to a separate dom
|
|
* element that we move around using translate3d. At the end of the drag, the
|
|
* blocks are put back in into the svg they came from. This helps performance by
|
|
* avoiding repainting the entire svg on every mouse move while dragging blocks.
|
|
* @author picklesrus
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
goog.provide('Blockly.BlockDragSurfaceSvg');
|
|
goog.require('Blockly.utils');
|
|
goog.require('goog.asserts');
|
|
goog.require('goog.math.Coordinate');
|
|
|
|
|
|
/**
|
|
* Class for a drag surface for the currently dragged block. This is a separate
|
|
* SVG that contains only the currently moving block, or nothing.
|
|
* @param {!Element} container Containing element.
|
|
* @constructor
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg = function(container) {
|
|
/**
|
|
* @type {!Element}
|
|
* @private
|
|
*/
|
|
this.container_ = container;
|
|
this.createDom();
|
|
};
|
|
|
|
/**
|
|
* The SVG drag surface. Set once by Blockly.BlockDragSurfaceSvg.createDom.
|
|
* @type {Element}
|
|
* @private
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.SVG_ = null;
|
|
|
|
/**
|
|
* This is where blocks live while they are being dragged if the drag surface
|
|
* is enabled.
|
|
* @type {Element}
|
|
* @private
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.dragGroup_ = null;
|
|
|
|
/**
|
|
* Containing HTML element; parent of the workspace and the drag surface.
|
|
* @type {Element}
|
|
* @private
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.container_ = null;
|
|
|
|
/**
|
|
* Cached value for the scale of the drag surface.
|
|
* Used to set/get the correct translation during and after a drag.
|
|
* @type {number}
|
|
* @private
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.scale_ = 1;
|
|
|
|
/**
|
|
* Create the drag surface and inject it into the container.
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.createDom = function() {
|
|
if (this.SVG_) {
|
|
return; // Already created.
|
|
}
|
|
this.SVG_ = Blockly.utils.createSvgElement('svg', {
|
|
'xmlns': Blockly.SVG_NS,
|
|
'xmlns:html': Blockly.HTML_NS,
|
|
'xmlns:xlink': 'http://www.w3.org/1999/xlink',
|
|
'version': '1.1',
|
|
'class': 'blocklyBlockDragSurface'
|
|
}, this.container_);
|
|
this.dragGroup_ = Blockly.utils.createSvgElement('g', {}, this.SVG_);
|
|
};
|
|
|
|
/**
|
|
* Set the SVG blocks on the drag surface's group and show the surface.
|
|
* Only one block group should be on the drag surface at a time.
|
|
* @param {!Element} blocks Block or group of blocks to place on the drag
|
|
* surface.
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.setBlocksAndShow = function(blocks) {
|
|
goog.asserts.assert(this.dragGroup_.childNodes.length == 0,
|
|
'Already dragging a block.');
|
|
// appendChild removes the blocks from the previous parent
|
|
this.dragGroup_.appendChild(blocks);
|
|
this.SVG_.style.display = 'block';
|
|
};
|
|
|
|
/**
|
|
* Translate and scale the entire drag surface group to the given position, to
|
|
* keep in sync with the workspace.
|
|
* @param {number} x X translation in workspace coordinates.
|
|
* @param {number} y Y translation in workspace coordinates.
|
|
* @param {number} scale Scale of the group.
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.translateAndScaleGroup = function(x, y, scale) {
|
|
this.scale_ = scale;
|
|
// This is a work-around to prevent a the blocks from rendering
|
|
// fuzzy while they are being dragged on the drag surface.
|
|
x = x.toFixed(0);
|
|
y = y.toFixed(0);
|
|
this.dragGroup_.setAttribute('transform', 'translate('+ x + ','+ y + ')' +
|
|
' scale(' + scale + ')');
|
|
};
|
|
|
|
/**
|
|
* Translate the entire drag surface during a drag.
|
|
* We translate the drag surface instead of the blocks inside the surface
|
|
* so that the browser avoids repainting the SVG.
|
|
* Because of this, the drag coordinates must be adjusted by scale.
|
|
* @param {number} x X translation for the entire surface.
|
|
* @param {number} y Y translation for the entire surface.
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
|
|
x *= this.scale_;
|
|
y *= this.scale_;
|
|
// This is a work-around to prevent a the blocks from rendering
|
|
// fuzzy while they are being dragged on the drag surface.
|
|
x = x.toFixed(0);
|
|
y = y.toFixed(0);
|
|
this.SVG_.style.display = 'block';
|
|
Blockly.utils.setCssTransform(this.SVG_,
|
|
'translate3d(' + x + 'px, ' + y + 'px, 0px)');
|
|
};
|
|
|
|
/**
|
|
* Reports the surface translation in scaled workspace coordinates.
|
|
* Use this when finishing a drag to return blocks to the correct position.
|
|
* @return {!goog.math.Coordinate} Current translation of the surface.
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
|
|
var xy = Blockly.utils.getRelativeXY(this.SVG_);
|
|
return new goog.math.Coordinate(xy.x / this.scale_, xy.y / this.scale_);
|
|
};
|
|
|
|
/**
|
|
* Provide a reference to the drag group (primarily for
|
|
* BlockSvg.getRelativeToSurfaceXY).
|
|
* @return {Element} Drag surface group element.
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.getGroup = function() {
|
|
return this.dragGroup_;
|
|
};
|
|
|
|
/**
|
|
* Get the current blocks on the drag surface, if any (primarily
|
|
* for BlockSvg.getRelativeToSurfaceXY).
|
|
* @return {!Element|undefined} Drag surface block DOM element, or undefined
|
|
* if no blocks exist.
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.getCurrentBlock = function() {
|
|
return this.dragGroup_.firstChild;
|
|
};
|
|
|
|
/**
|
|
* Clear the group and hide the surface; move the blocks off onto the provided
|
|
* element.
|
|
* @param {!Element} newSurface Surface the dragging blocks should be moved to.
|
|
*/
|
|
Blockly.BlockDragSurfaceSvg.prototype.clearAndHide = function(newSurface) {
|
|
// appendChild removes the node from this.dragGroup_
|
|
newSurface.appendChild(this.getCurrentBlock());
|
|
this.SVG_.style.display = 'none';
|
|
goog.asserts.assert(this.dragGroup_.childNodes.length == 0,
|
|
'Drag group was not cleared.');
|
|
};
|