f3c10d4eaa
* 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
307 linhas
11 KiB
JavaScript
307 linhas
11 KiB
JavaScript
/**
|
|
* Blockly Demos: Code
|
|
*
|
|
* Copyright 2017 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 JavaScript for Blockly's Minimap demo.
|
|
* @author karnpurohit@gmail.com (Karan Purohit)
|
|
*/
|
|
'use strict';
|
|
|
|
/**
|
|
* Creating a seperate namespace for minimap.
|
|
*/
|
|
var Minimap = {};
|
|
|
|
/**
|
|
* Initilize the workspace and minimap.
|
|
* @param {Workspace} workspace The main workspace of the user.
|
|
* @param {Workspace} minimap The workspace that will be used as a minimap.
|
|
*/
|
|
Minimap.init = function(workspace, minimap){
|
|
this.workspace = workspace;
|
|
this.minimap = minimap;
|
|
|
|
//Adding scroll callback functionlity to vScroll and hScroll just for this demo.
|
|
//IMPORTANT: This should be changed when there is proper UI event handling
|
|
// api available and should be handled by workspace's event listeners.
|
|
this.workspace.scrollbar.vScroll.setHandlePosition = function(newPosition){
|
|
this.handlePosition_ = newPosition;
|
|
this.svgHandle_.setAttribute(this.positionAttribute_, this.handlePosition_);
|
|
|
|
// Code above is same as the original setHandlePosition function in core/scrollbar.js.
|
|
// New code starts from here.
|
|
|
|
// Get the absolutePosition.
|
|
var absolutePosition = (this.handlePosition_ / this.ratio_);
|
|
|
|
// Firing the scroll change listener.
|
|
Minimap.onScrollChange(absolutePosition, this.horizontal_);
|
|
};
|
|
|
|
// Adding call back for horizontal scroll.
|
|
this.workspace.scrollbar.hScroll.setHandlePosition = function(newPosition){
|
|
this.handlePosition_ = newPosition;
|
|
this.svgHandle_.setAttribute(this.positionAttribute_, this.handlePosition_);
|
|
|
|
// Code above is same as the original setHandlePosition function in core/scrollbar.js.
|
|
// New code starts from here.
|
|
|
|
// Get the absolutePosition.
|
|
var absolutePosition = (this.handlePosition_ / this.ratio_);
|
|
|
|
// Firing the scroll change listener.
|
|
Minimap.onScrollChange(absolutePosition, this.horizontal_);
|
|
};
|
|
|
|
|
|
// Required to stop a positive feedback loop when user clicks minimap
|
|
// and the scroll changes, which inturn may change minimap.
|
|
this.disableScrollChange = false;
|
|
|
|
// Listen to events on the main workspace.
|
|
this.workspace.addChangeListener(Minimap.mirrorEvent);
|
|
|
|
//Get rectangle bounding the minimap div.
|
|
this.rect = document.getElementById('mapDiv').getBoundingClientRect();
|
|
|
|
// Create a svg overlay on the top of mapDiv for the minimap.
|
|
this.svg = Blockly.utils.createSvgElement('svg', {
|
|
'xmlns': 'http://www.w3.org/2000/svg',
|
|
'xmlns:html': 'http://www.w3.org/1999/xhtml',
|
|
'xmlns:xlink': 'http://www.w3.org/1999/xlink',
|
|
'version': '1.1',
|
|
'height': this.rect.bottom-this.rect.top,
|
|
'width': this.rect.right-this.rect.left,
|
|
'class': 'minimap',
|
|
}, document.getElementById('mapDiv'));
|
|
this.svg.style.top = this.rect.top + 'px';
|
|
this.svg.style.left = this.rect.left + 'px';
|
|
|
|
// Creating a rectangle in the minimap that represents current view.
|
|
Blockly.utils.createSvgElement('rect', {
|
|
'width':100,
|
|
'height':100,
|
|
'class':'mapDragger'
|
|
}, this.svg);
|
|
|
|
// Rectangle in the minimap that represents current view.
|
|
this.mapDragger = this.svg.childNodes[0];
|
|
|
|
// Adding mouse events to the rectangle, to make it Draggable.
|
|
// Using Blockly.bindEvent_ to attach mouse/touch listeners.
|
|
Blockly.bindEvent_(this.mapDragger, "mousedown", null, Minimap.mousedown);
|
|
|
|
//When the window change, we need to resize the minimap window.
|
|
window.addEventListener('resize', Minimap.repositionMinimap);
|
|
|
|
// Mouse up event for the minimap.
|
|
this.svg.addEventListener('mouseup', Minimap.updateMapDragger);
|
|
|
|
//Boolen to check whether I am dragging the surface or not.
|
|
this.isDragging = false;
|
|
};
|
|
|
|
Minimap.mousedown = function(e){
|
|
// Using Blockly.bindEvent_ to attach mouse/touch listeners.
|
|
Minimap.mouseMoveBindData = Blockly.bindEvent_(document,"mousemove", null, Minimap.mousemove);
|
|
Minimap.mouseUpBindData = Blockly.bindEvent_(document,"mouseup", null, Minimap.mouseup);
|
|
|
|
Minimap.isDragging=true;
|
|
e.stopPropagation();
|
|
};
|
|
|
|
Minimap.mouseup = function(e){
|
|
Minimap.isDragging = false;
|
|
// Removing listeners.
|
|
Blockly.unbindEvent_(Minimap.mouseUpBindData);
|
|
Blockly.unbindEvent_(Minimap.mouseMoveBindData);
|
|
Minimap.updateMapDragger(e);
|
|
e.stopPropagation();
|
|
};
|
|
|
|
Minimap.mousemove = function(e){
|
|
if(Minimap.isDragging){
|
|
Minimap.updateMapDragger(e);
|
|
e.stopPropagation();
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Initilize the workspace and minimap.
|
|
* @param {Event} event Event that triggered in the main workspace.
|
|
*/
|
|
Minimap.mirrorEvent = function(event){
|
|
if (event.type == Blockly.Events.UI) {
|
|
return; // Don't mirror UI events.
|
|
}
|
|
// Convert event to JSON. This could then be transmitted across the net.
|
|
var json = event.toJson();
|
|
// Convert JSON back into an event, then execute it.
|
|
var minimapEvent = Blockly.Events.fromJson(json, Minimap.minimap);
|
|
minimapEvent.run(true);
|
|
Minimap.scaleMinimap();
|
|
Minimap.setDraggerHeight();
|
|
Minimap.setDraggerWidth();
|
|
};
|
|
|
|
/**
|
|
* Called when window is resized. Repositions the minimap overlay.
|
|
*/
|
|
Minimap.repositionMinimap = function(){
|
|
Minimap.rect = document.getElementById('mapDiv').getBoundingClientRect();
|
|
Minimap.svg.style.top = Minimap.rect.top + 'px';
|
|
Minimap.svg.style.left = Minimap.rect.left + 'px';
|
|
};
|
|
|
|
/**
|
|
* Updates the rectangle's height .
|
|
*/
|
|
Minimap.setDraggerHeight = function(){
|
|
var workspaceMetrics = Minimap.workspace.getMetrics();
|
|
var draggerHeight = (workspaceMetrics.viewHeight / Minimap.workspace.scale) * Minimap.minimap.scale;
|
|
// It's zero when first block is placed.
|
|
if(draggerHeight == 0){
|
|
return;
|
|
}
|
|
Minimap.mapDragger.setAttribute("height", draggerHeight);
|
|
};
|
|
|
|
/**
|
|
* Updates the rectangle's width.
|
|
*/
|
|
Minimap.setDraggerWidth = function(){
|
|
var workspaceMetrics = Minimap.workspace.getMetrics();
|
|
var draggerWidth = (workspaceMetrics.viewWidth / Minimap.workspace.scale) * Minimap.minimap.scale;
|
|
// It's zero when first block is placed.
|
|
if(draggerWidth == 0){
|
|
return;
|
|
}
|
|
Minimap.mapDragger.setAttribute("width", draggerWidth);
|
|
};
|
|
|
|
|
|
/**
|
|
* Updates the overall position of the viewport of the minimap by appropriately
|
|
* using translate functions.
|
|
*/
|
|
Minimap.scaleMinimap = function(){
|
|
var minimapBoundingBox = Minimap.minimap.getBlocksBoundingBox();
|
|
var workspaceBoundingBox = Minimap.workspace.getBlocksBoundingBox();
|
|
var workspaceMetrics = Minimap.workspace.getMetrics();
|
|
var minimapMetrics = Minimap.minimap.getMetrics();
|
|
|
|
//Scaling the mimimap such that all the blocks can be seen in the viewport.
|
|
//This padding is default because this is how to scrollbar(in main workspace) is implemented.
|
|
var topPadding = (workspaceMetrics.viewHeight) * Minimap.minimap.scale / (2 * Minimap.workspace.scale);
|
|
var sidePadding = (workspaceMetrics.viewWidth) * Minimap.minimap.scale / (2 * Minimap.workspace.scale);
|
|
|
|
// If actual padding is more than half view ports height, change it to actual padding.
|
|
if((workspaceBoundingBox.y * Minimap.workspace.scale - workspaceMetrics.contentTop)
|
|
* Minimap.minimap.scale / Minimap.workspace.scale > topPadding){
|
|
topPadding = (workspaceBoundingBox.y * Minimap.workspace.scale - workspaceMetrics.contentTop)
|
|
* Minimap.minimap.scale / Minimap.workspace.scale;
|
|
}
|
|
|
|
// If actual padding is more than half view ports height, change it to actual padding.
|
|
if((workspaceBoundingBox.x * Minimap.workspace.scale - workspaceMetrics.contentLeft)
|
|
* Minimap.minimap.scale / Minimap.workspace.scale > sidePadding){
|
|
sidePadding = (workspaceBoundingBox.x * Minimap.workspace.scale - workspaceMetrics.contentLeft)
|
|
* Minimap.minimap.scale / Minimap.workspace.scale;
|
|
}
|
|
|
|
var scalex = (minimapMetrics.viewWidth - 2 * sidePadding) / minimapBoundingBox.width;
|
|
var scaley = (minimapMetrics.viewHeight - 2 * topPadding) / minimapBoundingBox.height;
|
|
Minimap.minimap.setScale(Math.min(scalex, scaley));
|
|
|
|
// Translating the minimap.
|
|
Minimap.minimap.translate( - minimapMetrics.contentLeft * Minimap.minimap.scale + sidePadding,
|
|
- minimapMetrics.contentTop * Minimap.minimap.scale + topPadding);
|
|
};
|
|
|
|
/**
|
|
* Handles the onclick event on the minimapBoundingBox. Changes mapDraggers position.
|
|
* @param {Event} e Event from the mouse click.
|
|
*/
|
|
Minimap.updateMapDragger = function(e){
|
|
var y = e.clientY;
|
|
var x = e.clientX;
|
|
var draggerHeight = Minimap.mapDragger.getAttribute("height");
|
|
var draggerWidth = Minimap.mapDragger.getAttribute("width");
|
|
|
|
var finalY = y - Minimap.rect.top - draggerHeight / 2;
|
|
var finalX = x - Minimap.rect.left - draggerWidth / 2;
|
|
|
|
var maxValidY = (Minimap.workspace.getMetrics().contentHeight - Minimap.workspace.getMetrics().viewHeight)
|
|
* Minimap.minimap.scale;
|
|
var maxValidX = (Minimap.workspace.getMetrics().contentWidth - Minimap.workspace.getMetrics().viewWidth)
|
|
* Minimap.minimap.scale;
|
|
|
|
if(y + draggerHeight / 2 > Minimap.rect.bottom){
|
|
finalY = Minimap.rect.bottom - Minimap.rect.top - draggerHeight;
|
|
}else if(y < Minimap.rect.top + draggerHeight / 2){
|
|
finalY = 0;
|
|
}
|
|
|
|
if(x + draggerWidth / 2 > Minimap.rect.right){
|
|
finalX = Minimap.rect.right - Minimap.rect.left - draggerWidth;
|
|
}else if(x < Minimap.rect.left + draggerWidth / 2){
|
|
finalX = 0;
|
|
}
|
|
|
|
// Do not go below lower bound of scrollbar.
|
|
if(finalY > maxValidY){
|
|
finalY = maxValidY;
|
|
}
|
|
|
|
if(finalX > maxValidX){
|
|
finalX = maxValidX;
|
|
}
|
|
Minimap.mapDragger.setAttribute("y", finalY);
|
|
Minimap.mapDragger.setAttribute("x", finalX);
|
|
// Required, otherwise creates a feedback loop.
|
|
Minimap.disableScrollChange = true;
|
|
Minimap.workspace.scrollbar.vScroll.set((finalY * Minimap.workspace.scale) / Minimap.minimap.scale);
|
|
Minimap.workspace.scrollbar.hScroll.set((finalX * Minimap.workspace.scale) / Minimap.minimap.scale);
|
|
Minimap.disableScrollChange = false;
|
|
};
|
|
|
|
/**
|
|
* Handles the onclick event on the minimapBoundingBox, paramaters are passed by
|
|
* the event handler.
|
|
* @param {Float} position This is the absolute postion of the scrollbar.
|
|
* @param {boolean} horizontal Informs if the change event if for horizontal(true)
|
|
* scrollbar or vertical(false) scrollbar.
|
|
*/
|
|
Minimap.onScrollChange = function(position, horizontal){
|
|
|
|
if(Minimap.disableScrollChange){
|
|
return;
|
|
}
|
|
|
|
var newDraggerPosition = (position * Minimap.minimap.scale / Minimap.workspace.scale);
|
|
if(horizontal){
|
|
// Change the horizontal position of dragger.
|
|
Minimap.mapDragger.setAttribute("x", newDraggerPosition);
|
|
}
|
|
else{
|
|
// Change the vertical position of dragger.
|
|
Minimap.mapDragger.setAttribute("y", newDraggerPosition);
|
|
}
|
|
};
|