- needed to position the dropdown content */
-.dropdown {
- display: inline-block;
-}
-
-/* Dropdown Content (Hidden by Default) */
-.dropdown-content {
- background-color: #fff;
- box-shadow: 0px 8px 16px 0px rgba(0,0,0,.2);
- display: none;
- min-width: 170px;
- opacity: 1;
- position: absolute;
- z-index: 101; /* On top of the modal Shadow. */
-}
-
-/* Links inside the dropdown */
-.dropdown-content a, .dropdown-content label {
- color: black;
- display: block;
- font-size: small;
- padding: 12px 16px;
- text-decoration: none;
-}
-
-/* Change color of dropdown links on hover. */
-.dropdown-content a:hover, .dropdown-content label:hover {
- background-color: #EEE;
-}
-
-/* Change color of dropdown links on selected. */
-.dropdown-content-selected {
- background-color: #DDD;
-}
-
-/* Show the dropdown menu */
-.show {
- display: block;
-}
-
-.shadowBlock>.blocklyPath {
- fill-opacity: .5;
- stroke-opacity: .5;
-}
-
-.shadowBlock>.blocklyPathLight,
-.shadowBlock>.blocklyPathDark {
- display: none;
-}
diff --git a/trunk/web/blockly/demos/blockfactory/factory.js b/trunk/web/blockly/demos/blockfactory/factory.js
deleted file mode 100644
index 974cd8a7ec5..00000000000
--- a/trunk/web/blockly/demos/blockfactory/factory.js
+++ /dev/null
@@ -1,276 +0,0 @@
-/**
- * @license
- * Blockly Demos: Block Factory
- *
- * 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 JavaScript for Blockly's Block Factory application through
- * which users can build blocks using a visual interface and dynamically
- * generate a preview block and starter code for the block (block definition and
- * generator stub. Uses the Block Factory namespace. Depends on the FactoryUtils
- * for its code generation functions.
- *
- * @author fraser@google.com (Neil Fraser), quachtina96 (Tina Quach)
- */
-'use strict';
-
-/**
- * Namespace for Block Factory.
- */
-goog.provide('BlockFactory');
-
-goog.require('FactoryUtils');
-goog.require('StandardCategories');
-
-
-/**
- * Workspace for user to build block.
- * @type {Blockly.Workspace}
- */
-BlockFactory.mainWorkspace = null;
-
-/**
- * Workspace for preview of block.
- * @type {Blockly.Workspace}
- */
-BlockFactory.previewWorkspace = null;
-
-/**
- * Name of block if not named.
- */
-BlockFactory.UNNAMED = 'unnamed';
-
-/**
- * Existing direction ('ltr' vs 'rtl') of preview.
- */
-BlockFactory.oldDir = null;
-
-/*
- * The starting XML for the Block Factory main workspace. Contains the
- * unmovable, undeletable factory_base block.
- */
-BlockFactory.STARTER_BLOCK_XML_TEXT = '' +
- '' +
- '' +
- ' ' +
- '' +
- '' +
- ' ' +
- '' +
- '' +
- '230 ' +
- ' } Field strings.
- * @private
- */
-FactoryUtils.getFieldsJs_ = function(block) {
- var fields = [];
- while (block) {
- if (!block.disabled && !block.getInheritedDisabled()) {
- switch (block.type) {
- case 'field_static':
- // Result: 'hello'
- fields.push(JSON.stringify(block.getFieldValue('TEXT')));
- break;
- case 'field_input':
- // Result: new Blockly.FieldTextInput('Hello'), 'GREET'
- fields.push('new Blockly.FieldTextInput(' +
- JSON.stringify(block.getFieldValue('TEXT')) + '), ' +
- JSON.stringify(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_number':
- // Result: new Blockly.FieldNumber(10, 0, 100, 1), 'NUMBER'
- var args = [
- Number(block.getFieldValue('VALUE')),
- Number(block.getFieldValue('MIN')),
- Number(block.getFieldValue('MAX')),
- Number(block.getFieldValue('PRECISION'))
- ];
- // Remove any trailing arguments that aren't needed.
- if (args[3] == 0) {
- args.pop();
- if (args[2] == Infinity) {
- args.pop();
- if (args[1] == -Infinity) {
- args.pop();
- }
- }
- }
- fields.push('new Blockly.FieldNumber(' + args.join(', ') + '), ' +
- JSON.stringify(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_angle':
- // Result: new Blockly.FieldAngle(90), 'ANGLE'
- fields.push('new Blockly.FieldAngle(' +
- parseFloat(block.getFieldValue('ANGLE')) + '), ' +
- JSON.stringify(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_checkbox':
- // Result: new Blockly.FieldCheckbox('TRUE'), 'CHECK'
- fields.push('new Blockly.FieldCheckbox(' +
- JSON.stringify(block.getFieldValue('CHECKED')) +
- '), ' +
- JSON.stringify(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_colour':
- // Result: new Blockly.FieldColour('#ff0000'), 'COLOUR'
- fields.push('new Blockly.FieldColour(' +
- JSON.stringify(block.getFieldValue('COLOUR')) +
- '), ' +
- JSON.stringify(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_date':
- // Result: new Blockly.FieldDate('2015-02-04'), 'DATE'
- fields.push('new Blockly.FieldDate(' +
- JSON.stringify(block.getFieldValue('DATE')) + '), ' +
- JSON.stringify(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_variable':
- // Result: new Blockly.FieldVariable('item'), 'VAR'
- var varname
- = JSON.stringify(block.getFieldValue('TEXT') || null);
- fields.push('new Blockly.FieldVariable(' + varname + '), ' +
- JSON.stringify(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_dropdown':
- // Result:
- // new Blockly.FieldDropdown([['yes', '1'], ['no', '0']]), 'TOGGLE'
- var options = [];
- for (var i = 0; i < block.optionList_.length; i++) {
- options[i] = JSON.stringify([block.getUserData(i),
- block.getFieldValue('CPU' + i)]);
- }
- if (options.length) {
- fields.push('new Blockly.FieldDropdown([' +
- options.join(', ') + ']), ' +
- JSON.stringify(block.getFieldValue('FIELDNAME')));
- }
- break;
- case 'field_image':
- // Result: new Blockly.FieldImage('http://...', 80, 60, '*')
- var src = JSON.stringify(block.getFieldValue('SRC'));
- var width = Number(block.getFieldValue('WIDTH'));
- var height = Number(block.getFieldValue('HEIGHT'));
- var alt = JSON.stringify(block.getFieldValue('ALT'));
- fields.push('new Blockly.FieldImage(' +
- src + ', ' + width + ', ' + height + ', ' + alt + ')');
- break;
- }
- }
- block = block.nextConnection && block.nextConnection.targetBlock();
- }
- return fields;
-};
-
-/**
- * Returns field strings and any config.
- * @param {!Blockly.Block} block Input block.
- * @return {!Array.} Array of static text and field configs.
- * @private
- */
-FactoryUtils.getFieldsJson_ = function(block) {
- var fields = [];
- while (block) {
- if (!block.disabled && !block.getInheritedDisabled()) {
- switch (block.type) {
- case 'field_static':
- // Result: 'hello'
- fields.push(block.getFieldValue('TEXT'));
- break;
- case 'field_input':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- text: block.getFieldValue('TEXT')
- });
- break;
- case 'field_number':
- var obj = {
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- value: parseFloat(block.getFieldValue('VALUE'))
- };
- var min = parseFloat(block.getFieldValue('MIN'));
- if (min > -Infinity) {
- obj.min = min;
- }
- var max = parseFloat(block.getFieldValue('MAX'));
- if (max < Infinity) {
- obj.max = max;
- }
- var precision = parseFloat(block.getFieldValue('PRECISION'));
- if (precision) {
- obj.precision = precision;
- }
- fields.push(obj);
- break;
- case 'field_angle':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- angle: Number(block.getFieldValue('ANGLE'))
- });
- break;
- case 'field_checkbox':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- checked: block.getFieldValue('CHECKED') == 'TRUE'
- });
- break;
- case 'field_colour':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- colour: block.getFieldValue('COLOUR')
- });
- break;
- case 'field_date':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- date: block.getFieldValue('DATE')
- });
- break;
- case 'field_variable':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- variable: block.getFieldValue('TEXT') || null
- });
- break;
- case 'field_dropdown':
- var options = [];
- for (var i = 0; i < block.optionList_.length; i++) {
- options[i] = [block.getUserData(i),
- block.getFieldValue('CPU' + i)];
- }
- if (options.length) {
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- options: options
- });
- }
- break;
- case 'field_image':
- fields.push({
- type: block.type,
- src: block.getFieldValue('SRC'),
- width: Number(block.getFieldValue('WIDTH')),
- height: Number(block.getFieldValue('HEIGHT')),
- alt: block.getFieldValue('ALT')
- });
- break;
- }
- }
- block = block.nextConnection && block.nextConnection.targetBlock();
- }
- return fields;
-};
-
-/**
- * Fetch the type(s) defined in the given input.
- * Format as a string for appending to the generated code.
- * @param {!Blockly.Block} block Block with input.
- * @param {string} name Name of the input.
- * @return {?string} String defining the types.
- */
-FactoryUtils.getOptTypesFrom = function(block, name) {
- var types = FactoryUtils.getTypesFrom_(block, name);
- if (types.length == 0) {
- return undefined;
- } else if (types.indexOf('null') != -1) {
- return 'null';
- } else if (types.length == 1) {
- return types[0];
- } else {
- return '[' + types.join(', ') + ']';
- }
-};
-
-
-/**
- * Fetch the type(s) defined in the given input.
- * @param {!Blockly.Block} block Block with input.
- * @param {string} name Name of the input.
- * @return {!Array.} List of types.
- * @private
- */
-FactoryUtils.getTypesFrom_ = function(block, name) {
- var typeBlock = block.getInputTargetBlock(name);
- var types;
- if (!typeBlock || typeBlock.disabled) {
- types = [];
- } else if (typeBlock.type == 'type_other') {
- types = [JSON.stringify(typeBlock.getFieldValue('TYPE'))];
- } else if (typeBlock.type == 'type_group') {
- types = [];
- for (var n = 0; n < typeBlock.typeCount_; n++) {
- types = types.concat(FactoryUtils.getTypesFrom_(typeBlock, 'TYPE' + n));
- }
- // Remove duplicates.
- var hash = Object.create(null);
- for (var n = types.length - 1; n >= 0; n--) {
- if (hash[types[n]]) {
- types.splice(n, 1);
- }
- hash[types[n]] = true;
- }
- } else {
- types = [JSON.stringify(typeBlock.valueType)];
- }
- return types;
-};
-
-/**
- * Return the uneditable container block that everything else attaches to in
- * given workspace.
- * @param {!Blockly.Workspace} workspace Where the root block lives.
- * @return {Blockly.Block} Root block.
- */
-FactoryUtils.getRootBlock = function(workspace) {
- var blocks = workspace.getTopBlocks(false);
- for (var i = 0, block; block = blocks[i]; i++) {
- if (block.type == 'factory_base') {
- return block;
- }
- }
- return null;
-};
-
-// TODO(quachtina96): Move hide, show, makeInvisible, and makeVisible to a new
-// AppView namespace.
-
-/**
- * Hides element so that it's invisible and doesn't take up space.
- * @param {string} elementID ID of element to hide.
- */
-FactoryUtils.hide = function(elementID) {
- document.getElementById(elementID).style.display = 'none';
-};
-
-/**
- * Un-hides an element.
- * @param {string} elementID ID of element to hide.
- */
-FactoryUtils.show = function(elementID) {
- document.getElementById(elementID).style.display = 'block';
-};
-
-/**
- * Hides element so that it's invisible but still takes up space.
- * @param {string} elementID ID of element to hide.
- */
-FactoryUtils.makeInvisible = function(elementID) {
- document.getElementById(elementID).visibility = 'hidden';
-};
-
-/**
- * Makes element visible.
- * @param {string} elementID ID of element to hide.
- */
-FactoryUtils.makeVisible = function(elementID) {
- document.getElementById(elementID).visibility = 'visible';
-};
-
-/**
- * Create a file with the given attributes and download it.
- * @param {string} contents The contents of the file.
- * @param {string} filename The name of the file to save to.
- * @param {string} fileType The type of the file to save.
- */
-FactoryUtils.createAndDownloadFile = function(contents, filename, fileType) {
- var data = new Blob([contents], {type: 'text/' + fileType});
- var clickEvent = new MouseEvent("click", {
- "view": window,
- "bubbles": true,
- "cancelable": false
- });
-
- var a = document.createElement('a');
- a.href = window.URL.createObjectURL(data);
- a.download = filename;
- a.textContent = 'Download file!';
- a.dispatchEvent(clickEvent);
-};
-
-/**
- * Get Blockly Block by rendering pre-defined block in workspace.
- * @param {!Element} blockType Type of block that has already been defined.
- * @param {!Blockly.Workspace} workspace Workspace on which to render
- * the block.
- * @return {!Blockly.Block} The Blockly.Block of desired type.
- */
-FactoryUtils.getDefinedBlock = function(blockType, workspace) {
- workspace.clear();
- return workspace.newBlock(blockType);
-};
-
-/**
- * Parses a block definition get the type of the block it defines.
- * @param {string} blockDef A single block definition.
- * @return {string} Type of block defined by the given definition.
- */
-FactoryUtils.getBlockTypeFromJsDefinition = function(blockDef) {
- var indexOfStartBracket = blockDef.indexOf('[\'');
- var indexOfEndBracket = blockDef.indexOf('\']');
- if (indexOfStartBracket != -1 && indexOfEndBracket != -1) {
- return blockDef.substring(indexOfStartBracket + 2, indexOfEndBracket);
- } else {
- throw new Error ('Could not parse block type out of JavaScript block ' +
- 'definition. Brackets normally enclosing block type not found.');
- }
-};
-
-/**
- * Generates a category containing blocks of the specified block types.
- * @param {!Array.} blocks Blocks to include in the category.
- * @param {string} categoryName Name to use for the generated category.
- * @return {!Element} Category XML containing the given block types.
- */
-FactoryUtils.generateCategoryXml = function(blocks, categoryName) {
- // Create category DOM element.
- var categoryElement = goog.dom.createDom('category');
- categoryElement.setAttribute('name', categoryName);
-
- // For each block, add block element to category.
- for (var i = 0, block; block = blocks[i]; i++) {
-
- // Get preview block XML.
- var blockXml = Blockly.Xml.blockToDom(block);
- blockXml.removeAttribute('id');
-
- // Add block to category and category to XML.
- categoryElement.appendChild(blockXml);
- }
- return categoryElement;
-};
-
-/**
- * Parses a string containing JavaScript block definition(s) to create an array
- * in which each element is a single block definition.
- * @param {string} blockDefsString JavaScript block definition(s).
- * @return {!Array.} Array of block definitions.
- */
-FactoryUtils.parseJsBlockDefinitions = function(blockDefsString) {
- var blockDefArray = [];
- var defStart = blockDefsString.indexOf('Blockly.Blocks');
-
- while (blockDefsString.indexOf('Blockly.Blocks', defStart) != -1) {
- var nextStart = blockDefsString.indexOf('Blockly.Blocks', defStart + 1);
- if (nextStart == -1) {
- // This is the last block definition.
- nextStart = blockDefsString.length;
- }
- var blockDef = blockDefsString.substring(defStart, nextStart);
- blockDefArray.push(blockDef);
- defStart = nextStart;
- }
- return blockDefArray;
-};
-
-/**
- * Parses a string containing JSON block definition(s) to create an array
- * in which each element is a single block definition. Expected input is
- * one or more block definitions in the form of concatenated, stringified
- * JSON objects.
- * @param {string} blockDefsString String containing JSON block
- * definition(s).
- * @return {!Array.} Array of block definitions.
- */
-FactoryUtils.parseJsonBlockDefinitions = function(blockDefsString) {
- var blockDefArray = [];
- var unbalancedBracketCount = 0;
- var defStart = 0;
- // Iterate through the blockDefs string. Keep track of whether brackets
- // are balanced.
- for (var i = 0; i < blockDefsString.length; i++) {
- var currentChar = blockDefsString[i];
- if (currentChar == '{') {
- unbalancedBracketCount++;
- }
- else if (currentChar == '}') {
- unbalancedBracketCount--;
- if (unbalancedBracketCount == 0 && i > 0) {
- // The brackets are balanced. We've got a complete block defintion.
- var blockDef = blockDefsString.substring(defStart, i + 1);
- blockDefArray.push(blockDef);
- defStart = i + 1;
- }
- }
- }
- return blockDefArray;
-};
-
-/**
- * Define blocks from imported block definitions.
- * @param {string} blockDefsString Block definition(s).
- * @param {string} format Block definition format ('JSON' or 'JavaScript').
- * @return {!Array.} Array of block types defined.
- */
-FactoryUtils.defineAndGetBlockTypes = function(blockDefsString, format) {
- var blockTypes = [];
-
- // Define blocks and get block types.
- if (format == 'JSON') {
- var blockDefArray = FactoryUtils.parseJsonBlockDefinitions(blockDefsString);
-
- // Populate array of blocktypes and define each block.
- for (var i = 0, blockDef; blockDef = blockDefArray[i]; i++) {
- var json = JSON.parse(blockDef);
- blockTypes.push(json.type);
-
- // Define the block.
- Blockly.Blocks[json.type] = {
- init: function() {
- this.jsonInit(json);
- }
- };
- }
- } else if (format == 'JavaScript') {
- var blockDefArray = FactoryUtils.parseJsBlockDefinitions(blockDefsString);
-
- // Populate array of block types.
- for (var i = 0, blockDef; blockDef = blockDefArray[i]; i++) {
- var blockType = FactoryUtils.getBlockTypeFromJsDefinition(blockDef);
- blockTypes.push(blockType);
- }
-
- // Define all blocks.
- eval(blockDefsString);
- }
-
- return blockTypes;
-};
-
-/**
- * Inject code into a pre tag, with syntax highlighting.
- * Safe from HTML/script injection.
- * @param {string} code Lines of code.
- * @param {string} id ID of
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 20 65 120 160 210 230 260 290 330
-
-
-
-
-
-
-
-
-
- 10
-
-
-
-
-
-
- 1
-
-
-
-
- 10
-
-
-
-
- 1
-
-
-
-
-
-
-
-
- 1
-
-
-
-
- 1
-
-
-
-
-
-
- 9
-
-
-
-
-
-
- 45
-
-
-
-
-
-
- 0
-
-
-
-
-
-
- 3.1
-
-
-
-
-
-
- 64
-
-
-
-
- 10
-
-
-
-
-
-
- 50
-
-
-
-
- 1
-
-
-
-
- 100
-
-
-
-
-
-
- 1
-
-
-
-
- 100
-
-
-
-
-
-
-
-
-
-
-
-
- abc
-
-
-
-
-
-
-
-
-
-
-
-
- text
-
-
-
-
- abc
-
-
-
-
-
-
- text
-
-
-
-
-
-
- text
-
-
-
-
-
-
- abc
-
-
-
-
-
-
- abc
-
-
-
-
-
-
- abc
-
-
-
-
-
-
- abc
-
-
-
-
-
-
-
-
-
-
- 5
-
-
-
-
-
-
- list
-
-
-
-
-
-
- list
-
-
-
-
-
-
- list
-
-
-
-
-
-
- list
-
-
-
-
-
-
- ,
-
-
-
-
-
-
-
-
- 100
-
-
-
-
- 50
-
-
-
-
- 0
-
-
-
-
-
-
- #ff0000
-
-
-
-
- #3333ff
-
-
-
-
- 0.5
-
-
-
-
-
-
-
-
diff --git a/trunk/web/blockly/demos/blockfactory/link.png b/trunk/web/blockly/demos/blockfactory/link.png
deleted file mode 100644
index 11dfd82845e..00000000000
Binary files a/trunk/web/blockly/demos/blockfactory/link.png and /dev/null differ
diff --git a/trunk/web/blockly/demos/blockfactory/standard_categories.js b/trunk/web/blockly/demos/blockfactory/standard_categories.js
deleted file mode 100644
index 6b4072680c5..00000000000
--- a/trunk/web/blockly/demos/blockfactory/standard_categories.js
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
- * @license
- * Blockly Demos: Block Factory
- *
- * 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 Contains a map of standard Blockly categories used to load
- * standard Blockly categories into the user's toolbox. The map is keyed by
- * the lower case name of the category, and contains the Category object for
- * that particular category. Also has a list of core block types provided
- * by Blockly.
- *
- * @author Emma Dauterman (evd2014)
- */
- 'use strict';
-
-/**
- * Namespace for StandardCategories
- */
-goog.provide('StandardCategories');
-
-
-// Map of standard category information necessary to add a standard category
-// to the toolbox.
-StandardCategories.categoryMap = Object.create(null);
-
-StandardCategories.categoryMap['logic'] =
- new ListElement(ListElement.TYPE_CATEGORY, 'Logic');
-StandardCategories.categoryMap['logic'].xml =
- Blockly.Xml.textToDom(
- '' +
- ' ');
-StandardCategories.categoryMap['logic'].color ='#5C81A6';
-
-StandardCategories.categoryMap['loops'] =
- new ListElement(ListElement.TYPE_CATEGORY, 'Loops');
-StandardCategories.categoryMap['loops'].xml =
- Blockly.Xml.textToDom(
- '' +
- '' +
- '' +
- '' +
- '10 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '1 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '10 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '1 ' +
- ' ' +
- ' ' +
- ' ' +
- ' ');
-StandardCategories.categoryMap['loops'].color = '#5CA65C';
-
-StandardCategories.categoryMap['math'] =
- new ListElement(ListElement.TYPE_CATEGORY, 'Math');
-StandardCategories.categoryMap['math'].xml =
- Blockly.Xml.textToDom(
- '' +
- '' +
- '' +
- '' +
- '1 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '1 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '9 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '45 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '0 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '3.1 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '64 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '10 '+
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '50 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '1 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '100 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '1 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '100 ' +
- ' ' +
- ' ' +
- ' ' +
- ' ');
-StandardCategories.categoryMap['math'].color = '#5C68A6';
-
-StandardCategories.categoryMap['text'] =
- new ListElement(ListElement.TYPE_CATEGORY, 'Text');
-StandardCategories.categoryMap['text'].xml =
- Blockly.Xml.textToDom(
- '' +
- '' +
- '' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'abc ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'text ' +
- ' ' +
- ' ' +
- '' +
- '' +
- 'abc ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'text ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'text ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'abc ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'abc ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'abc ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'abc ' +
- ' ' +
- ' ' +
- ' ' +
- ' ');
-StandardCategories.categoryMap['text'].color = '#5CA68D';
-
-StandardCategories.categoryMap['lists'] =
- new ListElement(ListElement.TYPE_CATEGORY, 'Lists');
-StandardCategories.categoryMap['lists'].xml =
- Blockly.Xml.textToDom(
- '' +
- '' +
- ' ' +
- '' +
- '' +
- '' +
- '5 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'list ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'list ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'list ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- 'list ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- ', ' +
- ' ' +
- ' ' +
- ' ' +
- ' ');
-StandardCategories.categoryMap['lists'].color = '#745CA6';
-
-StandardCategories.categoryMap['colour'] =
- new ListElement(ListElement.TYPE_CATEGORY, 'Colour');
-StandardCategories.categoryMap['colour'].xml =
- Blockly.Xml.textToDom(
- '' +
- '' +
- '' +
- '' +
- '100 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '50 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '0 ' +
- ' ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '' +
- '#ff0000 ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '#3333ff ' +
- ' ' +
- ' ' +
- '' +
- '' +
- '0.5 ' +
- ' ' +
- ' ' +
- ' ' +
- ' ');
-StandardCategories.categoryMap['colour'].color = '#A6745C';
-
-StandardCategories.categoryMap['functions'] =
- new ListElement(ListElement.TYPE_CATEGORY, 'Functions');
-StandardCategories.categoryMap['functions'].color = '#9A5CA6'
-StandardCategories.categoryMap['functions'].custom = 'PROCEDURE';
-
-StandardCategories.categoryMap['variables'] =
- new ListElement(ListElement.TYPE_CATEGORY, 'Variables');
-StandardCategories.categoryMap['variables'].color = '#A65C81';
-StandardCategories.categoryMap['variables'].custom = 'VARIABLE';
-
-// All standard block types in provided in Blockly core.
-StandardCategories.coreBlockTypes = ["controls_if", "logic_compare",
- "logic_operation", "logic_negate", "logic_boolean", "logic_null",
- "logic_ternary", "controls_repeat_ext", "controls_whileUntil",
- "controls_for", "controls_forEach", "controls_flow_statements",
- "math_number", "math_arithmetic", "math_single", "math_trig",
- "math_constant", "math_number_property", "math_change", "math_round",
- "math_on_list", "math_modulo", "math_constrain", "math_random_int",
- "math_random_float", "text", "text_join", "text_append", "text_length",
- "text_isEmpty", "text_indexOf", "variables_get", "text_charAt",
- "text_getSubstring", "text_changeCase", "text_trim", "text_print",
- "text_prompt_ext", "colour_picker", "colour_random", "colour_rgb",
- "colour_blend", "lists_create_with", "lists_repeat", "lists_length",
- "lists_isEmpty", "lists_indexOf", "lists_getIndex", "lists_setIndex",
- "lists_getSublist", "lists_split", "lists_sort", "variables_set",
- "procedures_defreturn", "procedures_ifreturn", "procedures_defnoreturn",
- "procedures_callreturn"];
diff --git a/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_controller.js b/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_controller.js
deleted file mode 100644
index 85b14d11bbe..00000000000
--- a/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_controller.js
+++ /dev/null
@@ -1,1330 +0,0 @@
-/**
- * @license
- * Blockly Demos: Block Factory
- *
- * 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 Contains the controller code for workspace factory. Depends
- * on the model and view objects (created as internal variables) and interacts
- * with previewWorkspace and toolboxWorkspace (internal references stored to
- * both). Also depends on standard_categories.js for standard Blockly
- * categories. Provides the functionality for the actions the user can initiate:
- * - adding and removing categories
- * - switching between categories
- * - printing and downloading configuration xml
- * - updating the preview workspace
- * - changing a category name
- * - moving the position of a category.
- *
- * @author Emma Dauterman (evd2014)
- */
-
- goog.require('FactoryUtils');
- goog.require('StandardCategories');
-
-
-/**
- * Class for a WorkspaceFactoryController
- * @param {string} toolboxName Name of workspace toolbox XML.
- * @param {string} toolboxDiv Name of div to inject toolbox workspace in.
- * @param {string} previewDiv Name of div to inject preview workspace in.
- * @constructor
- */
-WorkspaceFactoryController = function(toolboxName, toolboxDiv, previewDiv) {
- // Toolbox XML element for the editing workspace.
- this.toolbox = document.getElementById(toolboxName);
-
- // Workspace for user to drag blocks in for a certain category.
- this.toolboxWorkspace = Blockly.inject(toolboxDiv,
- {grid:
- {spacing: 25,
- length: 3,
- colour: '#ccc',
- snap: true},
- media: '../../media/',
- toolbox: this.toolbox
- });
-
- // Workspace for user to preview their changes.
- this.previewWorkspace = Blockly.inject(previewDiv,
- {grid:
- {spacing: 25,
- length: 3,
- colour: '#ccc',
- snap: true},
- media: '../../media/',
- toolbox: '} libBlockTypes Array of block types from the block
- * library.
- */
-WorkspaceFactoryController.prototype.setBlockLibCategory =
- function(categoryXml, libBlockTypes) {
- var blockLibCategory = document.getElementById('blockLibCategory');
-
- // Set category ID so that it can be easily replaced, and set a standard,
- // arbitrary block library color.
- categoryXml.setAttribute('id', 'blockLibCategory');
- categoryXml.setAttribute('colour', 260);
-
- // Update the toolbox and toolboxWorkspace.
- this.toolbox.replaceChild(categoryXml, blockLibCategory);
- this.toolboxWorkspace.toolbox_.clearSelection();
- this.toolboxWorkspace.updateToolbox(this.toolbox);
-
- // Update the block library types.
- this.model.updateLibBlockTypes(libBlockTypes);
-
- // Reload XML on page to account for blocks now defined or undefined in block
- // library.
- this.clearAndLoadXml_(Blockly.Xml.workspaceToDom(this.toolboxWorkspace));
-};
-
-/**
- * Return the block types used in the custom toolbox and pre-loaded workspace.
- * @return {!Array.} Block types used in the custom toolbox and
- * pre-loaded workspace.
- */
-WorkspaceFactoryController.prototype.getAllUsedBlockTypes = function() {
- return this.model.getAllUsedBlockTypes();
-};
-
-/**
- * Determines if a block loaded in the workspace has a definition (if it
- * is a standard block, is defined in the block library, or has a definition
- * imported).
- * @param {!Blockly.Block} block The block to examine.
- */
-WorkspaceFactoryController.prototype.isDefinedBlock = function(block) {
- return this.model.isDefinedBlockType(block.type);
-};
-
-/**
- * Sets a warning on blocks loaded to the workspace that are not defined.
- * @private
- */
-WorkspaceFactoryController.prototype.warnForUndefinedBlocks_ = function() {
- var blocks = this.toolboxWorkspace.getAllBlocks();
- for (var i = 0, block; block = blocks[i]; i++) {
- if (!this.isDefinedBlock(block)) {
- block.setWarningText(block.type + ' is not defined (it is not a standard '
- + 'block, \nin your block library, or an imported block)');
- }
- }
-};
-
-/*
- * Determines if a standard variable category is in the custom toolbox.
- * @return {boolean} True if a variables category is in use, false otherwise.
- */
-WorkspaceFactoryController.prototype.hasVariablesCategory = function() {
- return this.model.hasVariables();
-};
-
-/**
- * Determines if a standard procedures category is in the custom toolbox.
- * @return {boolean} True if a procedures category is in use, false otherwise.
- */
-WorkspaceFactoryController.prototype.hasProceduresCategory = function() {
- return this.model.hasProcedures();
-};
-
-/**
- * Determines if there are any unsaved changes in workspace factory.
- * @return {boolean} True if there are unsaved changes, false otherwise.
- */
-WorkspaceFactoryController.prototype.hasUnsavedChanges = function() {
- return this.hasUnsavedToolboxChanges || this.hasUnsavedPreloadChanges;
-};
diff --git a/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_generator.js b/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_generator.js
deleted file mode 100644
index 3b06ac282e1..00000000000
--- a/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_generator.js
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * @license
- * Blockly Demos: Block Factory
- *
- * 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 Generates the configuration XML used to update the preview
- * workspace or print to the console or download to a file. Leverages
- * Blockly.Xml and depends on information in the model (holds a reference).
- * Depends on a hidden workspace created in the generator to load saved XML in
- * order to generate toolbox XML.
- *
- * @author Emma Dauterman (evd2014)
- */
-
-goog.require('FactoryUtils');
-
-
-/**
- * Class for a WorkspaceFactoryGenerator
- * @constructor
- */
-WorkspaceFactoryGenerator = function(model) {
- // Model to share information about categories and shadow blocks.
- this.model = model;
- // Create hidden workspace to load saved XML to generate toolbox XML.
- var hiddenBlocks = document.createElement('div');
- // Generate a globally unique ID for the hidden div element to avoid
- // collisions.
- var hiddenBlocksId = Blockly.utils.genUid();
- hiddenBlocks.id = hiddenBlocksId;
- hiddenBlocks.style.display = 'none';
- document.body.appendChild(hiddenBlocks);
- this.hiddenWorkspace = Blockly.inject(hiddenBlocksId);
-};
-
-/**
- * Generates the XML for the toolbox or flyout with information from
- * toolboxWorkspace and the model. Uses the hiddenWorkspace to generate XML.
- * Save state of workspace in model (saveFromWorkspace) before calling if
- * changes might have been made to the selected category.
- * @param {!Blockly.workspace} toolboxWorkspace Toolbox editing workspace where
- * blocks are added by user to be part of the toolbox.
- * @return {!Element} XML element representing toolbox or flyout corresponding
- * to toolbox workspace.
- */
-WorkspaceFactoryGenerator.prototype.generateToolboxXml = function() {
- // Create DOM for XML.
- var xmlDom = goog.dom.createDom('xml',
- {
- 'id' : 'toolbox',
- 'style' : 'display:none'
- });
- if (!this.model.hasElements()) {
- // Toolbox has no categories. Use XML directly from workspace.
- this.loadToHiddenWorkspace_(this.model.getSelectedXml());
- this.appendHiddenWorkspaceToDom_(xmlDom);
- } else {
- // Toolbox has categories.
- // Assert that selected != null
- if (!this.model.getSelected()) {
- throw new Error('Selected is null when the toolbox is empty.');
- }
-
- var xml = this.model.getSelectedXml();
- var toolboxList = this.model.getToolboxList();
-
- // Iterate through each category to generate XML for each using the
- // hidden workspace. Load each category to the hidden workspace to make sure
- // that all the blocks that are not top blocks are also captured as block
- // groups in the flyout.
- for (var i = 0; i < toolboxList.length; i++) {
- var element = toolboxList[i];
- if (element.type == ListElement.TYPE_SEPARATOR) {
- // If the next element is a separator.
- var nextElement = goog.dom.createDom('sep');
- } else if (element.type == ListElement.TYPE_CATEGORY) {
- // If the next element is a category.
- var nextElement = goog.dom.createDom('category');
- nextElement.setAttribute('name', element.name);
- // Add a colour attribute if one exists.
- if (element.color != null) {
- nextElement.setAttribute('colour', element.color);
- }
- // Add a custom attribute if one exists.
- if (element.custom != null) {
- nextElement.setAttribute('custom', element.custom);
- }
- // Load that category to hidden workspace, setting user-generated shadow
- // blocks as real shadow blocks.
- this.loadToHiddenWorkspace_(element.xml);
- this.appendHiddenWorkspaceToDom_(nextElement);
- }
- xmlDom.appendChild(nextElement);
- }
- }
- return xmlDom;
- };
-
-
- /**
- * Generates XML for the workspace (different from generateConfigXml in that
- * it includes XY and ID attributes). Uses a workspace and converts user
- * generated shadow blocks to actual shadow blocks.
- * @return {!Element} XML element representing toolbox or flyout corresponding
- * to toolbox workspace.
- */
-WorkspaceFactoryGenerator.prototype.generateWorkspaceXml = function() {
- // Load workspace XML to hidden workspace with user-generated shadow blocks
- // as actual shadow blocks.
- this.hiddenWorkspace.clear();
- Blockly.Xml.domToWorkspace(this.model.getPreloadXml(), this.hiddenWorkspace);
- this.setShadowBlocksInHiddenWorkspace_();
-
- // Generate XML and set attributes.
- var generatedXml = Blockly.Xml.workspaceToDom(this.hiddenWorkspace);
- generatedXml.setAttribute('id', 'workspaceBlocks');
- generatedXml.setAttribute('style', 'display:none');
- return generatedXml;
-};
-
-/**
- * Generates a string representation of the options object for injecting the
- * workspace and starter code.
- * @return {string} String representation of starter code for injecting.
- */
-WorkspaceFactoryGenerator.prototype.generateInjectString = function() {
- var addAttributes = function(obj, tabChar) {
- if (!obj) {
- return '{}\n';
- }
- var str = '';
- for (var key in obj) {
- if (key == 'grid' || key == 'zoom') {
- var temp = tabChar + key + ' : {\n' + addAttributes(obj[key],
- tabChar + '\t') + tabChar + '}, \n';
- } else if (typeof obj[key] == 'string') {
- var temp = tabChar + key + ' : \'' + obj[key] + '\', \n';
- } else {
- var temp = tabChar + key + ' : ' + obj[key] + ', \n';
- }
- str += temp;
- }
- var lastCommaIndex = str.lastIndexOf(',');
- str = str.slice(0, lastCommaIndex) + '\n';
- return str;
- };
-
- var attributes = addAttributes(this.model.options, '\t');
- if (!this.model.options['readOnly']) {
- attributes = '\ttoolbox : toolbox, \n' +
- attributes;
- }
- var finalStr = '/* TODO: Change toolbox XML ID if necessary. Can export ' +
- 'toolbox XML from Workspace Factory. */\n' +
- 'var toolbox = document.getElementById("toolbox");\n\n';
- finalStr += 'var options = { \n' + attributes + '};';
- finalStr += '\n\n/* Inject your workspace */ \nvar workspace = Blockly.' +
- 'inject(/* TODO: Add ID of div to inject Blockly into */, options);';
- finalStr += '\n\n/* Load Workspace Blocks from XML to workspace. ' +
- 'Remove all code below if no blocks to load */\n\n' +
- '/* TODO: Change workspace blocks XML ID if necessary. Can export' +
- ' workspace blocks XML from Workspace Factory. */\n' +
- 'var workspaceBlocks = document.getElementById("workspaceBlocks"); \n\n' +
- '/* Load blocks to workspace. */\n' +
- 'Blockly.Xml.domToWorkspace(workspace, workspaceBlocks);';
- return finalStr;
-};
-
-/**
- * Loads the given XML to the hidden workspace and sets any user-generated
- * shadow blocks to be actual shadow blocks.
- * @param {!Element} xml The XML to be loaded to the hidden workspace.
- * @private
- */
-WorkspaceFactoryGenerator.prototype.loadToHiddenWorkspace_ = function(xml) {
- this.hiddenWorkspace.clear();
- Blockly.Xml.domToWorkspace(xml, this.hiddenWorkspace);
- this.setShadowBlocksInHiddenWorkspace_();
-};
-
-/**
- * Encodes blocks in the hidden workspace in a XML DOM element. Very
- * similar to workspaceToDom, but doesn't capture IDs. Uses the top-level
- * blocks loaded in hiddenWorkspace.
- * @private
- * @param {!Element} xmlDom Tree of XML elements to be appended to.
- */
-WorkspaceFactoryGenerator.prototype.appendHiddenWorkspaceToDom_ =
- function(xmlDom) {
- var blocks = this.hiddenWorkspace.getTopBlocks();
- for (var i = 0, block; block = blocks[i]; i++) {
- var blockChild = Blockly.Xml.blockToDom(block, /* opt_noId */ true);
- xmlDom.appendChild(blockChild);
- }
-};
-
-/**
- * Sets the user-generated shadow blocks loaded into hiddenWorkspace to be
- * actual shadow blocks. This is done so that blockToDom records them as
- * shadow blocks instead of regular blocks.
- * @private
- */
-WorkspaceFactoryGenerator.prototype.setShadowBlocksInHiddenWorkspace_ =
- function() {
- var blocks = this.hiddenWorkspace.getAllBlocks();
- for (var i = 0; i < blocks.length; i++) {
- if (this.model.isShadowBlock(blocks[i].id)) {
- blocks[i].setShadow(true);
- }
- }
-};
-
-/**
- * Given a set of block types, gets the Blockly.Block objects for each block
- * type.
- * @param {!Array.} blockTypes Array of blocks that have been defined.
- * @return {!Array.} Array of Blockly.Block objects corresponding
- * to the array of blockTypes.
- */
-WorkspaceFactoryGenerator.prototype.getDefinedBlocks = function(blockTypes) {
- var blocks = [];
- for (var i = 0; i < blockTypes.length ; i++) {
- blocks.push(FactoryUtils.getDefinedBlock(blockTypes[i],
- this.hiddenWorkspace));
- }
- return blocks;
-};
diff --git a/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_init.js b/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_init.js
deleted file mode 100644
index 31069b0c50d..00000000000
--- a/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_init.js
+++ /dev/null
@@ -1,604 +0,0 @@
-/**
- * @license
- * Blockly Demos: Block Factory
- *
- * 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 Contains the init functions for the workspace factory tab.
- * Adds click handlers to buttons and dropdowns, adds event listeners for
- * keydown events and Blockly events, and configures the initial setup of
- * the page.
- *
- * @author Emma Dauterman (evd2014)
- */
-
- goog.require('FactoryUtils');
-
-/**
- * Namespace for workspace factory initialization methods.
- * @namespace
- */
-WorkspaceFactoryInit = {};
-
-/**
- * Initialization for workspace factory tab.
- * @param {!FactoryController} controller The controller for the workspace
- * factory tab.
- */
-WorkspaceFactoryInit.initWorkspaceFactory = function(controller) {
- // Disable category editing buttons until categories are created.
- document.getElementById('button_remove').disabled = true;
- document.getElementById('button_up').disabled = true;
- document.getElementById('button_down').disabled = true;
- document.getElementById('button_editCategory').disabled = true;
-
- this.initColorPicker_(controller);
- this.addWorkspaceFactoryEventListeners_(controller);
- this.assignWorkspaceFactoryClickHandlers_(controller);
- this.addWorkspaceFactoryOptionsListeners_(controller);
-
- // Check standard options and apply the changes to update the view.
- controller.setStandardOptionsAndUpdate();
-};
-
-/**
- * Initialize the color picker in workspace factory.
- * @param {!FactoryController} controller The controller for the workspace
- * factory tab.
- * @private
- */
-WorkspaceFactoryInit.initColorPicker_ = function(controller) {
- // Array of Blockly category colours, consitent with the 15 degree default
- // of the block factory's colour wheel.
- var colours = [];
- for (var hue = 0; hue < 360; hue += 15) {
- colours.push(WorkspaceFactoryInit.hsvToHex_(hue,
- Blockly.HSV_SATURATION, Blockly.HSV_VALUE));
- }
-
- // Create color picker with specific set of Blockly colours.
- var colourPicker = new goog.ui.ColorPicker();
- colourPicker.setSize(6);
- colourPicker.setColors(colours);
-
- // Create and render the popup colour picker and attach to button.
- var popupPicker = new goog.ui.PopupColorPicker(null, colourPicker);
- popupPicker.render();
- popupPicker.attach(document.getElementById('dropdown_color'));
- popupPicker.setFocusable(true);
- goog.events.listen(popupPicker, 'change', function(e) {
- controller.changeSelectedCategoryColor(popupPicker.getSelectedColor());
- blocklyFactory.closeModal();
- });
-};
-
-/**
- * Converts from h,s,v values to a hex string
- * @param {number} h Hue, in [0, 360].
- * @param {number} s Saturation, in [0, 1].
- * @param {number} v Value, in [0, 1].
- * @return {string} hex representation of the color.
- * @private
- */
-WorkspaceFactoryInit.hsvToHex_ = function(h, s, v) {
- var brightness = v * 255;
- var red = 0;
- var green = 0;
- var blue = 0;
- if (s == 0) {
- red = brightness;
- green = brightness;
- blue = brightness;
- } else {
- var sextant = Math.floor(h / 60);
- var remainder = (h / 60) - sextant;
- var val1 = brightness * (1 - s);
- var val2 = brightness * (1 - (s * remainder));
- var val3 = brightness * (1 - (s * (1 - remainder)));
- switch (sextant) {
- case 1:
- red = val2;
- green = brightness;
- blue = val1;
- break;
- case 2:
- red = val1;
- green = brightness;
- blue = val3;
- break;
- case 3:
- red = val1;
- green = val2;
- blue = brightness;
- break;
- case 4:
- red = val3;
- green = val1;
- blue = brightness;
- break;
- case 5:
- red = brightness;
- green = val1;
- blue = val2;
- break;
- case 6:
- case 0:
- red = brightness;
- green = val3;
- blue = val1;
- break;
- }
- }
-
- var hexR = ('0' + Math.floor(red).toString(16)).slice(-2);
- var hexG = ('0' + Math.floor(green).toString(16)).slice(-2);
- var hexB = ('0' + Math.floor(blue).toString(16)).slice(-2);
- return '#' + hexR + hexG + hexB;
-};
-
-/**
- * Assign click handlers for workspace factory.
- * @param {!FactoryController} controller The controller for the workspace
- * factory tab.
- * @private
- */
-WorkspaceFactoryInit.assignWorkspaceFactoryClickHandlers_ =
- function(controller) {
-
- // Import Custom Blocks button.
- document.getElementById('button_importBlocks').addEventListener
- ('click',
- function() {
- blocklyFactory.openModal('dropdownDiv_importBlocks');
- });
- document.getElementById('input_importBlocksJson').addEventListener
- ('change',
- function() {
- controller.importBlocks(event.target.files[0], 'JSON');
- });
- document.getElementById('input_importBlocksJson').addEventListener
- ('click', function() {blocklyFactory.closeModal()});
- document.getElementById('input_importBlocksJs').addEventListener
- ('change',
- function() {
- controller.importBlocks(event.target.files[0], 'JavaScript');
- });
- document.getElementById('input_importBlocksJs').addEventListener
- ('click', function() {blocklyFactory.closeModal()});
-
- // Load to Edit button.
- document.getElementById('button_load').addEventListener
- ('click',
- function() {
- blocklyFactory.openModal('dropdownDiv_load');
- });
- document.getElementById('input_loadToolbox').addEventListener
- ('change',
- function() {
- controller.importFile(event.target.files[0],
- WorkspaceFactoryController.MODE_TOOLBOX);
- });
- document.getElementById('input_loadToolbox').addEventListener
- ('click', function() {blocklyFactory.closeModal()});
- document.getElementById('input_loadPreload').addEventListener
- ('change',
- function() {
- controller.importFile(event.target.files[0],
- WorkspaceFactoryController.MODE_PRELOAD);
- });
- document.getElementById('input_loadPreload').addEventListener
- ('click', function() {blocklyFactory.closeModal()});
-
- // Export button.
- document.getElementById('dropdown_exportOptions').addEventListener
- ('click',
- function() {
- controller.exportInjectFile();
- blocklyFactory.closeModal();
- });
- document.getElementById('dropdown_exportToolbox').addEventListener
- ('click',
- function() {
- controller.exportXmlFile(WorkspaceFactoryController.MODE_TOOLBOX);
- blocklyFactory.closeModal();
- });
- document.getElementById('dropdown_exportPreload').addEventListener
- ('click',
- function() {
- controller.exportXmlFile(WorkspaceFactoryController.MODE_PRELOAD);
- blocklyFactory.closeModal();
- });
- document.getElementById('dropdown_exportAll').addEventListener
- ('click',
- function() {
- controller.exportInjectFile();
- controller.exportXmlFile(WorkspaceFactoryController.MODE_TOOLBOX);
- controller.exportXmlFile(WorkspaceFactoryController.MODE_PRELOAD);
- blocklyFactory.closeModal();
- });
- document.getElementById('button_export').addEventListener
- ('click',
- function() {
- blocklyFactory.openModal('dropdownDiv_export');
- });
-
- // Clear button.
- document.getElementById('button_clear').addEventListener
- ('click',
- function() {
- controller.clearAll();
- });
-
- // Toolbox and Workspace tabs.
- document.getElementById('tab_toolbox').addEventListener
- ('click',
- function() {
- controller.setMode(WorkspaceFactoryController.MODE_TOOLBOX);
- });
- document.getElementById('tab_preload').addEventListener
- ('click',
- function() {
- controller.setMode(WorkspaceFactoryController.MODE_PRELOAD);
- });
-
- // '+' button.
- document.getElementById('button_add').addEventListener
- ('click',
- function() {
- blocklyFactory.openModal('dropdownDiv_add');
- });
- document.getElementById('dropdown_newCategory').addEventListener
- ('click',
- function() {
- controller.addCategory();
- blocklyFactory.closeModal();
- });
- document.getElementById('dropdown_loadCategory').addEventListener
- ('click',
- function() {
- controller.loadCategory();
- blocklyFactory.closeModal();
- });
- document.getElementById('dropdown_separator').addEventListener
- ('click',
- function() {
- controller.addSeparator();
- blocklyFactory.closeModal();
- });
- document.getElementById('dropdown_loadStandardToolbox').addEventListener
- ('click',
- function() {
- controller.loadStandardToolbox();
- blocklyFactory.closeModal();
- });
-
- // '-' button.
- document.getElementById('button_remove').addEventListener
- ('click',
- function() {
- controller.removeElement();
- });
-
- // Up/Down buttons.
- document.getElementById('button_up').addEventListener
- ('click',
- function() {
- controller.moveElement(-1);
- });
- document.getElementById('button_down').addEventListener
- ('click',
- function() {
- controller.moveElement(1);
- });
-
- // Edit Category button.
- document.getElementById('button_editCategory').addEventListener
- ('click',
- function() {
- blocklyFactory.openModal('dropdownDiv_editCategory');
- });
- document.getElementById('dropdown_name').addEventListener
- ('click',
- function() {
- controller.changeCategoryName();
- blocklyFactory.closeModal();
- });
-
- // Make/Remove Shadow buttons.
- document.getElementById('button_addShadow').addEventListener
- ('click',
- function() {
- controller.addShadow();
- WorkspaceFactoryInit.displayAddShadow_(false);
- WorkspaceFactoryInit.displayRemoveShadow_(true);
- });
- document.getElementById('button_removeShadow').addEventListener
- ('click',
- function() {
- controller.removeShadow();
- WorkspaceFactoryInit.displayAddShadow_(true);
- WorkspaceFactoryInit.displayRemoveShadow_(false);
-
- // Disable shadow editing button if turning invalid shadow block back
- // to normal block.
- if (!Blockly.selected.getSurroundParent()) {
- document.getElementById('button_addShadow').disabled = true;
- }
- });
-
- // Help button on workspace tab.
- document.getElementById('button_optionsHelp').addEventListener
- ('click', function() {
- open('https://developers.google.com/blockly/guides/get-started/web#configuration');
- });
-
- // Reset to Default button on workspace tab.
- document.getElementById('button_standardOptions').addEventListener
- ('click', function() {
- controller.setStandardOptionsAndUpdate();
- });
-};
-
-/**
- * Add event listeners for workspace factory.
- * @param {!FactoryController} controller The controller for the workspace
- * factory tab.
- * @private
- */
-WorkspaceFactoryInit.addWorkspaceFactoryEventListeners_ = function(controller) {
- // Use up and down arrow keys to move categories.
- window.addEventListener('keydown', function(e) {
- // Don't let arrow keys have any effect if not in Workspace Factory
- // editing the toolbox.
- if (!(controller.keyEventsEnabled && controller.selectedMode
- == WorkspaceFactoryController.MODE_TOOLBOX)) {
- return;
- }
-
- if (e.keyCode == 38) {
- // Arrow up.
- controller.moveElement(-1);
- } else if (e.keyCode == 40) {
- // Arrow down.
- controller.moveElement(1);
- }
- });
-
- // Determines if a block breaks shadow block placement rules.
- // Breaks rules if (1) a shadow block no longer has a valid
- // parent, or (2) a normal block is inside of a shadow block.
- var isInvalidBlockPlacement = function(block) {
- return ((controller.isUserGenShadowBlock(block.id) &&
- !block.getSurroundParent()) ||
- (!controller.isUserGenShadowBlock(block.id) &&
- block.getSurroundParent() &&
- controller.isUserGenShadowBlock(block.getSurroundParent().id)));
- };
-
- // Add change listeners for toolbox workspace in workspace factory.
- controller.toolboxWorkspace.addChangeListener(function(e) {
- // Listen for Blockly move and delete events to update preview.
- // Not listening for Blockly create events because causes the user to drop
- // blocks when dragging them into workspace. Could cause problems if ever
- // load blocks into workspace directly without calling updatePreview.
- if (e.type == Blockly.Events.MOVE || e.type == Blockly.Events.DELETE ||
- e.type == Blockly.Events.CHANGE) {
- controller.saveStateFromWorkspace();
- controller.updatePreview();
- }
-
- // Listen for Blockly UI events to correctly enable the "Edit Block" button.
- // Only enable "Edit Block" when a block is selected and it has a
- // surrounding parent, meaning it is nested in another block (blocks that
- // are not nested in parents cannot be shadow blocks).
- if (e.type == Blockly.Events.MOVE || (e.type == Blockly.Events.UI &&
- e.element == 'selected')) {
- var selected = Blockly.selected;
-
- // Show shadow button if a block is selected. Show "Add Shadow" if
- // a block is not a shadow block, show "Remove Shadow" if it is a
- // shadow block.
- if (selected) {
- var isShadow = controller.isUserGenShadowBlock(selected.id);
- WorkspaceFactoryInit.displayAddShadow_(!isShadow);
- WorkspaceFactoryInit.displayRemoveShadow_(isShadow);
- } else {
- WorkspaceFactoryInit.displayAddShadow_(false);
- WorkspaceFactoryInit.displayRemoveShadow_(false);
- }
-
- if (selected != null && selected.getSurroundParent() != null &&
- !controller.isUserGenShadowBlock(selected.getSurroundParent().id)) {
- // Selected block is a valid shadow block or could be a valid shadow
- // block.
-
- // Enable block editing and remove warnings if the block is not a
- // variable user-generated shadow block.
- document.getElementById('button_addShadow').disabled = false;
- document.getElementById('button_removeShadow').disabled = false;
-
- if (!FactoryUtils.hasVariableField(selected) &&
- controller.isDefinedBlock(selected)) {
- selected.setWarningText(null);
- }
- } else {
- // Selected block cannot be a valid shadow block.
-
- if (selected != null && isInvalidBlockPlacement(selected)) {
- // Selected block breaks shadow block rules.
- // Invalid shadow block if (1) a shadow block no longer has a valid
- // parent, or (2) a normal block is inside of a shadow block.
-
- if (!controller.isUserGenShadowBlock(selected.id)) {
- // Warn if a non-shadow block is nested inside a shadow block.
- selected.setWarningText('Only shadow blocks can be nested inside\n'
- + 'other shadow blocks.');
- } else if (!FactoryUtils.hasVariableField(selected)) {
- // Warn if a shadow block is invalid only if not replacing
- // warning for variables.
- selected.setWarningText('Shadow blocks must be nested inside other'
- + ' blocks.')
- }
-
- // Give editing options so that the user can make an invalid shadow
- // block a normal block.
- document.getElementById('button_removeShadow').disabled = false;
- document.getElementById('button_addShadow').disabled = true;
- } else {
- // Selected block does not break any shadow block rules, but cannot
- // be a shadow block.
-
- // Remove possible 'invalid shadow block placement' warning.
- if (selected != null && controller.isDefinedBlock(selected) &&
- (!FactoryUtils.hasVariableField(selected) ||
- !controller.isUserGenShadowBlock(selected.id))) {
- selected.setWarningText(null);
- }
-
- // No block selected that is a shadow block or could be a valid shadow
- // block. Disable block editing.
- document.getElementById('button_addShadow').disabled = true;
- document.getElementById('button_removeShadow').disabled = true;
- }
- }
- }
-
- // Convert actual shadow blocks added from the toolbox to user-generated
- // shadow blocks.
- if (e.type == Blockly.Events.CREATE) {
- controller.convertShadowBlocks();
-
- // Let the user create a Variables or Functions category if they use
- // blocks from either category.
-
- // Get all children of a block and add them to childList.
- var getAllChildren = function(block, childList) {
- childList.push(block);
- var children = block.getChildren();
- for (var i = 0, child; child = children[i]; i++) {
- getAllChildren(child, childList);
- }
- };
-
- var newBaseBlock = controller.toolboxWorkspace.getBlockById(e.blockId);
- var allNewBlocks = [];
- getAllChildren(newBaseBlock, allNewBlocks);
- var variableCreated = false;
- var procedureCreated = false;
-
- // Check if the newly created block or any of its children are variable
- // or procedure blocks.
- for (var i = 0, block; block = allNewBlocks[i]; i++) {
- if (FactoryUtils.hasVariableField(block)) {
- variableCreated = true;
- } else if (FactoryUtils.isProcedureBlock(block)) {
- procedureCreated = true;
- }
- }
-
- // If any of the newly created blocks are variable or procedure blocks,
- // prompt the user to create the corresponding standard category.
- if (variableCreated && !controller.hasVariablesCategory()) {
- if (confirm('Your new block has a variables field. To use this block '
- + 'fully, you will need a Variables category. Do you want to add '
- + 'a Variables category to your custom toolbox?')) {
- controller.setMode(WorkspaceFactoryController.MODE_TOOLBOX);
- controller.loadCategoryByName('variables');
- }
- }
-
- if (procedureCreated && !controller.hasProceduresCategory()) {
- if (confirm('Your new block is a function block. To use this block '
- + 'fully, you will need a Functions category. Do you want to add '
- + 'a Functions category to your custom toolbox?')) {
- controller.setMode(WorkspaceFactoryController.MODE_TOOLBOX);
- controller.loadCategoryByName('functions');
- }
- }
- }
- });
-};
-
-/**
- * Display or hide the add shadow button.
- * @param {boolean} show True if the add shadow button should be shown, false
- * otherwise.
- */
-WorkspaceFactoryInit.displayAddShadow_ = function(show) {
- document.getElementById('button_addShadow').style.display =
- show ? 'inline-block' : 'none';
-};
-
-/**
- * Display or hide the remove shadow button.
- * @param {boolean} show True if the remove shadow button should be shown, false
- * otherwise.
- */
-WorkspaceFactoryInit.displayRemoveShadow_ = function(show) {
- document.getElementById('button_removeShadow').style.display =
- show ? 'inline-block' : 'none';
-};
-
-/**
- * Add listeners for workspace factory options input elements.
- * @param {!FactoryController} controller The controller for the workspace
- * factory tab.
- * @private
- */
-WorkspaceFactoryInit.addWorkspaceFactoryOptionsListeners_ =
- function(controller) {
- // Checking the grid checkbox displays grid options.
- document.getElementById('option_grid_checkbox').addEventListener('change',
- function(e) {
- document.getElementById('grid_options').style.display =
- document.getElementById('option_grid_checkbox').checked ?
- 'block' : 'none';
- });
-
- // Checking the zoom checkbox displays zoom options.
- document.getElementById('option_zoom_checkbox').addEventListener('change',
- function(e) {
- document.getElementById('zoom_options').style.display =
- document.getElementById('option_zoom_checkbox').checked ?
- 'block' : 'none';
- });
-
- // Checking the readonly checkbox enables/disables other options.
- document.getElementById('option_readOnly_checkbox').addEventListener('change',
- function(e) {
- var checkbox = document.getElementById('option_readOnly_checkbox');
- blocklyFactory.ifCheckedEnable(!checkbox.checked,
- ['readonly1', 'readonly2']);
- });
-
- document.getElementById('option_infiniteBlocks_checkbox').addEventListener('change',
- function(e) {
- document.getElementById('maxBlockNumber_option').style.display =
- document.getElementById('option_infiniteBlocks_checkbox').checked ?
- 'none' : 'block';
- });
-
- // Generate new options every time an options input is updated.
- var div = document.getElementById('workspace_options');
- var options = div.getElementsByTagName('input');
- for (var i = 0, option; option = options[i]; i++) {
- option.addEventListener('change', function() {
- controller.generateNewOptions();
- });
- }
-};
diff --git a/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_model.js b/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_model.js
deleted file mode 100644
index 7b60810d38a..00000000000
--- a/trunk/web/blockly/demos/blockfactory/workspacefactory/wfactory_model.js
+++ /dev/null
@@ -1,563 +0,0 @@
-/**
- * @license
- * Blockly Demos: Block Factory
- *
- * 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 Stores and updates information about state and categories
- * in workspace factory. Each list element is either a separator or a category,
- * and each category stores its name, XML to load that category, color,
- * custom tags, and a unique ID making it possible to change category names and
- * move categories easily. Keeps track of the currently selected list
- * element. Also keeps track of all the user-created shadow blocks and
- * manipulates them as necessary.
- *
- * @author Emma Dauterman (evd2014)
- */
-
-/**
- * Class for a WorkspaceFactoryModel
- * @constructor
- */
-WorkspaceFactoryModel = function() {
- // Ordered list of ListElement objects. Empty if there is a single flyout.
- this.toolboxList = [];
- // ListElement for blocks in a single flyout. Null if a toolbox exists.
- this.flyout = new ListElement(ListElement.TYPE_FLYOUT);
- // Array of block IDs for all user created shadow blocks.
- this.shadowBlocks = [];
- // Reference to currently selected ListElement. Stored in this.toolboxList if
- // there are categories, or in this.flyout if blocks are displayed in a single
- // flyout.
- this.selected = this.flyout;
- // Boolean for if a Variable category has been added.
- this.hasVariableCategory = false;
- // Boolean for if a Procedure category has been added.
- this.hasProcedureCategory = false;
- // XML to be pre-loaded to workspace. Empty on default;
- this.preloadXml = Blockly.Xml.textToDom('} blocks Array of blocks currently loaded.
- * @return {!} Array of user-generated shadow blocks currently
- * loaded.
- */
-WorkspaceFactoryModel.prototype.getShadowBlocksInWorkspace =
- function(workspaceBlocks) {
- var shadowsInWorkspace = [];
- for (var i = 0; i < workspaceBlocks.length; i++) {
- if (this.isShadowBlock(workspaceBlocks[i].id)) {
- shadowsInWorkspace.push(workspaceBlocks[i]);
- }
- }
- return shadowsInWorkspace;
-};
-
-/**
- * Adds a custom tag to a category, updating state variables accordingly.
- * Only accepts 'VARIABLE' and 'PROCEDURE' tags.
- * @param {!ListElement} category The category to add the tag to.
- * @param {string} tag The custom tag to add to the category.
- */
-WorkspaceFactoryModel.prototype.addCustomTag = function(category, tag) {
- // Only update list elements that are categories.
- if (category.type != ListElement.TYPE_CATEGORY) {
- return;
- }
- // Only update the tag to be 'VARIABLE' or 'PROCEDURE'.
- if (tag == 'VARIABLE') {
- this.hasVariableCategory = true;
- category.custom = 'VARIABLE';
- } else if (tag == 'PROCEDURE') {
- this.hasProcedureCategory = true;
- category.custom = 'PROCEDURE';
- }
-};
-
-/**
- * Have basic pre-loaded workspace working
- * Saves XML as XML to be pre-loaded into the workspace.
- * @param {!Element} xml The XML to be saved.
- */
-WorkspaceFactoryModel.prototype.savePreloadXml = function(xml) {
- this.preloadXml = xml
-};
-
-/**
- * Gets the XML to be pre-loaded into the workspace.
- * @return {!Element} The XML for the workspace.
- */
-WorkspaceFactoryModel.prototype.getPreloadXml = function() {
- return this.preloadXml;
-};
-
-/**
- * Sets a new options object for injecting a Blockly workspace.
- * @param {Object} options Options object for injecting a Blockly workspace.
- */
-WorkspaceFactoryModel.prototype.setOptions = function(options) {
- this.options = options;
-};
-
-/*
- * Returns an array of all the block types currently being used in the toolbox
- * and the pre-loaded blocks. No duplicates.
- * TODO(evd2014): Move pushBlockTypesToList to FactoryUtils.
- * @return {!Array.} Array of block types currently being used.
- */
-WorkspaceFactoryModel.prototype.getAllUsedBlockTypes = function() {
- var blockTypeList = [];
-
- // Given XML for the workspace, adds all block types included in the XML
- // to the list, not including duplicates.
- var pushBlockTypesToList = function(xml, list) {
- // Get all block XML nodes.
- var blocks = xml.getElementsByTagName('block');
-
- // Add block types if not already in list.
- for (var i = 0; i < blocks.length; i++) {
- var type = blocks[i].getAttribute('type');
- if (list.indexOf(type) == -1) {
- list.push(type);
- }
- }
- };
-
- if (this.flyout) {
- // If has a single flyout, add block types for the single flyout.
- pushBlockTypesToList(this.getSelectedXml(), blockTypeList);
- } else {
- // If has categories, add block types for each category.
-
- for (var i = 0, category; category = this.toolboxList[i]; i++) {
- if (category.type == ListElement.TYPE_CATEGORY) {
- pushBlockTypesToList(category.xml, blockTypeList);
- }
- }
- }
-
- // Add the block types from any pre-loaded blocks.
- pushBlockTypesToList(this.getPreloadXml(), blockTypeList);
-
- return blockTypeList;
-};
-
-/**
- * Adds new imported block types to the list of current imported block types.
- * @param {!Array.} blockTypes Array of block types imported.
- */
-WorkspaceFactoryModel.prototype.addImportedBlockTypes = function(blockTypes) {
- this.importedBlockTypes = this.importedBlockTypes.concat(blockTypes);
-};
-
-/**
- * Updates block types in block library.
- * @param {!Array.} blockTypes Array of block types in block library.
- */
-WorkspaceFactoryModel.prototype.updateLibBlockTypes = function(blockTypes) {
- this.libBlockTypes = blockTypes;
-};
-
-/**
- * Determines if a block type is defined as a standard block, in the block
- * library, or as an imported block.
- * @param {string} blockType Block type to check.
- * @return {boolean} True if blockType is defined, false otherwise.
- */
-WorkspaceFactoryModel.prototype.isDefinedBlockType = function(blockType) {
- var isStandardBlock = StandardCategories.coreBlockTypes.indexOf(blockType)
- != -1;
- var isLibBlock = this.libBlockTypes.indexOf(blockType) != -1;
- var isImportedBlock = this.importedBlockTypes.indexOf(blockType) != -1;
- return (isStandardBlock || isLibBlock || isImportedBlock);
-};
-
-/**
- * Checks if any of the block types are already defined.
- * @param {!Array.} blockTypes Array of block types.
- * @return {boolean} True if a block type in the array is already defined,
- * false if none of the blocks are already defined.
- */
-WorkspaceFactoryModel.prototype.hasDefinedBlockTypes = function(blockTypes) {
- for (var i = 0, blockType; blockType = blockTypes[i]; i++) {
- if (this.isDefinedBlockType(blockType)) {
- return true;
- }
- }
- return false;
-};
-
-/**
- * Class for a ListElement.
- * @constructor
- */
-ListElement = function(type, opt_name) {
- this.type = type;
- // XML DOM element to load the element.
- this.xml = Blockly.Xml.textToDom('} Field strings.
- * @private
- */
-function getFieldsJs_(block) {
- var fields = [];
- while (block) {
- if (!block.disabled && !block.getInheritedDisabled()) {
- switch (block.type) {
- case 'field_static':
- // Result: 'hello'
- fields.push(escapeString(block.getFieldValue('TEXT')));
- break;
- case 'field_input':
- // Result: new Blockly.FieldTextInput('Hello'), 'GREET'
- fields.push('new Blockly.FieldTextInput(' +
- escapeString(block.getFieldValue('TEXT')) + '), ' +
- escapeString(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_number':
- // Result: new Blockly.FieldNumber(10, 0, 100, 1), 'NUMBER'
- var args = [
- Number(block.getFieldValue('VALUE')),
- Number(block.getFieldValue('MIN')),
- Number(block.getFieldValue('MAX')),
- Number(block.getFieldValue('PRECISION'))
- ];
- // Remove any trailing arguments that aren't needed.
- if (args[3] == 0) {
- args.pop();
- if (args[2] == Infinity) {
- args.pop();
- if (args[1] == -Infinity) {
- args.pop();
- }
- }
- }
- fields.push('new Blockly.FieldNumber(' + args.join(', ') + '), ' +
- escapeString(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_angle':
- // Result: new Blockly.FieldAngle(90), 'ANGLE'
- fields.push('new Blockly.FieldAngle(' +
- Number(block.getFieldValue('ANGLE')) + '), ' +
- escapeString(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_checkbox':
- // Result: new Blockly.FieldCheckbox('TRUE'), 'CHECK'
- fields.push('new Blockly.FieldCheckbox(' +
- escapeString(block.getFieldValue('CHECKED')) + '), ' +
- escapeString(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_colour':
- // Result: new Blockly.FieldColour('#ff0000'), 'COLOUR'
- fields.push('new Blockly.FieldColour(' +
- escapeString(block.getFieldValue('COLOUR')) + '), ' +
- escapeString(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_date':
- // Result: new Blockly.FieldDate('2015-02-04'), 'DATE'
- fields.push('new Blockly.FieldDate(' +
- escapeString(block.getFieldValue('DATE')) + '), ' +
- escapeString(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_variable':
- // Result: new Blockly.FieldVariable('item'), 'VAR'
- var varname = escapeString(block.getFieldValue('TEXT') || null);
- fields.push('new Blockly.FieldVariable(' + varname + '), ' +
- escapeString(block.getFieldValue('FIELDNAME')));
- break;
- case 'field_dropdown':
- // Result:
- // new Blockly.FieldDropdown([['yes', '1'], ['no', '0']]), 'TOGGLE'
- var options = [];
- for (var i = 0; i < block.optionCount_; i++) {
- options[i] = '[' + escapeString(block.getFieldValue('USER' + i)) +
- ', ' + escapeString(block.getFieldValue('CPU' + i)) + ']';
- }
- if (options.length) {
- fields.push('new Blockly.FieldDropdown([' +
- options.join(', ') + ']), ' +
- escapeString(block.getFieldValue('FIELDNAME')));
- }
- break;
- case 'field_image':
- // Result: new Blockly.FieldImage('http://...', 80, 60, '*')
- var src = escapeString(block.getFieldValue('SRC'));
- var width = Number(block.getFieldValue('WIDTH'));
- var height = Number(block.getFieldValue('HEIGHT'));
- var alt = escapeString(block.getFieldValue('ALT'));
- fields.push('new Blockly.FieldImage(' +
- src + ', ' + width + ', ' + height + ', ' + alt + ')');
- break;
- }
- }
- block = block.nextConnection && block.nextConnection.targetBlock();
- }
- return fields;
-}
-
-/**
- * Returns field strings and any config.
- * @param {!Blockly.Block} block Input block.
- * @return {!Array.} Array of static text and field configs.
- * @private
- */
-function getFieldsJson_(block) {
- var fields = [];
- while (block) {
- if (!block.disabled && !block.getInheritedDisabled()) {
- switch (block.type) {
- case 'field_static':
- // Result: 'hello'
- fields.push(block.getFieldValue('TEXT'));
- break;
- case 'field_input':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- text: block.getFieldValue('TEXT')
- });
- break;
- case 'field_number':
- var obj = {
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- value: parseFloat(block.getFieldValue('VALUE'))
- };
- var min = parseFloat(block.getFieldValue('MIN'));
- if (min > -Infinity) {
- obj.min = min;
- }
- var max = parseFloat(block.getFieldValue('MAX'));
- if (max < Infinity) {
- obj.max = max;
- }
- var precision = parseFloat(block.getFieldValue('PRECISION'));
- if (precision) {
- obj.precision = precision;
- }
- fields.push(obj);
- break;
- case 'field_angle':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- angle: Number(block.getFieldValue('ANGLE'))
- });
- break;
- case 'field_checkbox':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- checked: block.getFieldValue('CHECKED') == 'TRUE'
- });
- break;
- case 'field_colour':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- colour: block.getFieldValue('COLOUR')
- });
- break;
- case 'field_date':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- date: block.getFieldValue('DATE')
- });
- break;
- case 'field_variable':
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- variable: block.getFieldValue('TEXT') || null
- });
- break;
- case 'field_dropdown':
- var options = [];
- for (var i = 0; i < block.optionCount_; i++) {
- options[i] = [block.getFieldValue('USER' + i),
- block.getFieldValue('CPU' + i)];
- }
- if (options.length) {
- fields.push({
- type: block.type,
- name: block.getFieldValue('FIELDNAME'),
- options: options
- });
- }
- break;
- case 'field_image':
- fields.push({
- type: block.type,
- src: block.getFieldValue('SRC'),
- width: Number(block.getFieldValue('WIDTH')),
- height: Number(block.getFieldValue('HEIGHT')),
- alt: block.getFieldValue('ALT')
- });
- break;
- }
- }
- block = block.nextConnection && block.nextConnection.targetBlock();
- }
- return fields;
-}
-
-/**
- * Escape a string.
- * @param {string} string String to escape.
- * @return {string} Escaped string surrouned by quotes.
- */
-function escapeString(string) {
- return JSON.stringify(string);
-}
-
-/**
- * Fetch the type(s) defined in the given input.
- * Format as a string for appending to the generated code.
- * @param {!Blockly.Block} block Block with input.
- * @param {string} name Name of the input.
- * @return {?string} String defining the types.
- */
-function getOptTypesFrom(block, name) {
- var types = getTypesFrom_(block, name);
- if (types.length == 0) {
- return undefined;
- } else if (types.indexOf('null') != -1) {
- return 'null';
- } else if (types.length == 1) {
- return types[0];
- } else {
- return '[' + types.join(', ') + ']';
- }
-}
-
-/**
- * Fetch the type(s) defined in the given input.
- * @param {!Blockly.Block} block Block with input.
- * @param {string} name Name of the input.
- * @return {!Array.} List of types.
- * @private
- */
-function getTypesFrom_(block, name) {
- var typeBlock = block.getInputTargetBlock(name);
- var types;
- if (!typeBlock || typeBlock.disabled) {
- types = [];
- } else if (typeBlock.type == 'type_other') {
- types = [escapeString(typeBlock.getFieldValue('TYPE'))];
- } else if (typeBlock.type == 'type_group') {
- types = [];
- for (var i = 0; i < typeBlock.typeCount_; i++) {
- types = types.concat(getTypesFrom_(typeBlock, 'TYPE' + i));
- }
- // Remove duplicates.
- var hash = Object.create(null);
- for (var n = types.length - 1; n >= 0; n--) {
- if (hash[types[n]]) {
- types.splice(n, 1);
- }
- hash[types[n]] = true;
- }
- } else {
- types = [escapeString(typeBlock.valueType)];
- }
- return types;
-}
-
-/**
- * Update the generator code.
- * @param {!Blockly.Block} block Rendered block in preview workspace.
- */
-function updateGenerator(block) {
- function makeVar(root, name) {
- name = name.toLowerCase().replace(/\W/g, '_');
- return ' var ' + root + '_' + name;
- }
- var language = document.getElementById('language').value;
- var code = [];
- code.push("Blockly." + language + "['" + block.type +
- "'] = function(block) {");
-
- // Generate getters for any fields or inputs.
- for (var i = 0, input; input = block.inputList[i]; i++) {
- for (var j = 0, field; field = input.fieldRow[j]; j++) {
- var name = field.name;
- if (!name) {
- continue;
- }
- if (field instanceof Blockly.FieldVariable) {
- // Subclass of Blockly.FieldDropdown, must test first.
- code.push(makeVar('variable', name) +
- " = Blockly." + language +
- ".variableDB_.getName(block.getFieldValue('" + name +
- "'), Blockly.Variables.NAME_TYPE);");
- } else if (field instanceof Blockly.FieldAngle) {
- // Subclass of Blockly.FieldTextInput, must test first.
- code.push(makeVar('angle', name) +
- " = block.getFieldValue('" + name + "');");
- } else if (Blockly.FieldDate && field instanceof Blockly.FieldDate) {
- // Blockly.FieldDate may not be compiled into Blockly.
- code.push(makeVar('date', name) +
- " = block.getFieldValue('" + name + "');");
- } else if (field instanceof Blockly.FieldColour) {
- code.push(makeVar('colour', name) +
- " = block.getFieldValue('" + name + "');");
- } else if (field instanceof Blockly.FieldCheckbox) {
- code.push(makeVar('checkbox', name) +
- " = block.getFieldValue('" + name + "') == 'TRUE';");
- } else if (field instanceof Blockly.FieldDropdown) {
- code.push(makeVar('dropdown', name) +
- " = block.getFieldValue('" + name + "');");
- } else if (field instanceof Blockly.FieldNumber) {
- code.push(makeVar('number', name) +
- " = block.getFieldValue('" + name + "');");
- } else if (field instanceof Blockly.FieldTextInput) {
- code.push(makeVar('text', name) +
- " = block.getFieldValue('" + name + "');");
- }
- }
- var name = input.name;
- if (name) {
- if (input.type == Blockly.INPUT_VALUE) {
- code.push(makeVar('value', name) +
- " = Blockly." + language + ".valueToCode(block, '" + name +
- "', Blockly." + language + ".ORDER_ATOMIC);");
- } else if (input.type == Blockly.NEXT_STATEMENT) {
- code.push(makeVar('statements', name) +
- " = Blockly." + language + ".statementToCode(block, '" +
- name + "');");
- }
- }
- }
- // Most languages end lines with a semicolon. Python does not.
- var lineEnd = {
- 'JavaScript': ';',
- 'Python': '',
- 'PHP': ';',
- 'Dart': ';'
- };
- code.push(" // TODO: Assemble " + language + " into code variable.");
- if (block.outputConnection) {
- code.push(" var code = '...';");
- code.push(" // TODO: Change ORDER_NONE to the correct strength.");
- code.push(" return [code, Blockly." + language + ".ORDER_NONE];");
- } else {
- code.push(" var code = '..." + (lineEnd[language] || '') + "\\n';");
- code.push(" return code;");
- }
- code.push("};");
-
- injectCode(code.join('\n'), 'generatorPre');
-}
-
-/**
- * Existing direction ('ltr' vs 'rtl') of preview.
- */
-var oldDir = null;
-
-/**
- * Update the preview display.
- */
-function updatePreview() {
- // Toggle between LTR/RTL if needed (also used in first display).
- var newDir = document.getElementById('direction').value;
- if (oldDir != newDir) {
- if (previewWorkspace) {
- previewWorkspace.dispose();
- }
- var rtl = newDir == 'rtl';
- previewWorkspace = Blockly.inject('preview',
- {rtl: rtl,
- media: '../../media/',
- scrollbars: true});
- oldDir = newDir;
- }
- previewWorkspace.clear();
-
- // Fetch the code and determine its format (JSON or JavaScript).
- var format = document.getElementById('format').value;
- if (format == 'Manual') {
- var code = document.getElementById('languageTA').value;
- // If the code is JSON, it will parse, otherwise treat as JS.
- try {
- JSON.parse(code);
- format = 'JSON';
- } catch (e) {
- format = 'JavaScript';
- }
- } else {
- var code = document.getElementById('languagePre').textContent;
- }
- if (!code.trim()) {
- // Nothing to render. Happens while cloud storage is loading.
- return;
- }
-
- // Backup Blockly.Blocks object so that main workspace and preview don't
- // collide if user creates a 'factory_base' block, for instance.
- var backupBlocks = Blockly.Blocks;
- try {
- // Make a shallow copy.
- Blockly.Blocks = {};
- for (var prop in backupBlocks) {
- Blockly.Blocks[prop] = backupBlocks[prop];
- }
-
- if (format == 'JSON') {
- var json = JSON.parse(code);
- Blockly.Blocks[json.type || UNNAMED] = {
- init: function() {
- this.jsonInit(json);
- }
- };
- } else if (format == 'JavaScript') {
- eval(code);
- } else {
- throw 'Unknown format: ' + format;
- }
-
- // Look for a block on Blockly.Blocks that does not match the backup.
- var blockType = null;
- for (var type in Blockly.Blocks) {
- if (typeof Blockly.Blocks[type].init == 'function' &&
- Blockly.Blocks[type] != backupBlocks[type]) {
- blockType = type;
- break;
- }
- }
- if (!blockType) {
- return;
- }
-
- // Create the preview block.
- var previewBlock = previewWorkspace.newBlock(blockType);
- previewBlock.initSvg();
- previewBlock.render();
- previewBlock.setMovable(false);
- previewBlock.setDeletable(false);
- previewBlock.moveBy(15, 10);
- previewWorkspace.clearUndo();
-
- updateGenerator(previewBlock);
- } finally {
- Blockly.Blocks = backupBlocks;
- }
-}
-
-/**
- * Inject code into a pre tag, with syntax highlighting.
- * Safe from HTML/script injection.
- * @param {string} code Lines of code.
- * @param {string} id ID of
-
-
-
-
diff --git a/trunk/web/blockly/demos/blockfactory_old/link.png b/trunk/web/blockly/demos/blockfactory_old/link.png
deleted file mode 100644
index 11dfd82845e..00000000000
Binary files a/trunk/web/blockly/demos/blockfactory_old/link.png and /dev/null differ
diff --git a/trunk/web/blockly/demos/code/index.html b/trunk/web/blockly/demos/code/index.html
index 89571d2692f..e465efd3536 100644
--- a/trunk/web/blockly/demos/code/index.html
+++ b/trunk/web/blockly/demos/code/index.html
@@ -5,7 +5,7 @@
Blockly Demo:
-
+
diff --git a/trunk/web/blockly/demos/custom-dialogs/custom-dialog.js b/trunk/web/blockly/demos/custom-dialogs/custom-dialog.js
deleted file mode 100644
index 1892303a401..00000000000
--- a/trunk/web/blockly/demos/custom-dialogs/custom-dialog.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Blockly Demos: Custom Dialogs
- *
- * 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.
- */
-
-/**
- * An example implementation of how one might replace Blockly's browser
- * dialogs. This is just an example, and applications are not encouraged to use
- * it verbatim.
- *
- * @namespace
- */
-CustomDialog = {};
-
-/** Override Blockly.alert() with custom implementation. */
-Blockly.alert = function(message, callback) {
- console.log('Alert: ' + message);
- CustomDialog.show('Alert', message, {
- onCancel: callback
- });
-};
-
-/** Override Blockly.confirm() with custom implementation. */
-Blockly.confirm = function(message, callback) {
- console.log('Confirm: ' + message);
- CustomDialog.show('Confirm', message, {
- showOkay: true,
- onOkay: function() {
- callback(true)
- },
- showCancel: true,
- onCancel: function() {
- callback(false)
- }
- });
-};
-
-/** Override Blockly.prompt() with custom implementation. */
-Blockly.prompt = function(message, defaultValue, callback) {
- console.log('Prompt: ' + message);
- CustomDialog.show('Prompt', message, {
- showInput: true,
- showOkay: true,
- onOkay: function() {
- callback(CustomDialog.inputField.value)
- },
- showCancel: true,
- onCancel: function() {
- callback(null)
- }
- });
- CustomDialog.inputField.value = defaultValue;
-};
-
-/** Hides any currently visible dialog. */
-CustomDialog.hide = function() {
- if (CustomDialog.backdropDiv_) {
- CustomDialog.backdropDiv_.style.display = 'none'
- CustomDialog.dialogDiv_.style.display = 'none'
- }
-};
-
-/**
- * Shows the dialog.
- * Allowed options:
- * - showOkay: Whether to show the OK button.
- * - showCancel: Whether to show the Cancel button.
- * - showInput: Whether to show the text input field.
- * - onOkay: Callback to handle the okay button.
- * - onCancel: Callback to handle the cancel button and backdrop clicks.
- */
-CustomDialog.show = function(title, message, options) {
- var backdropDiv = CustomDialog.backdropDiv_;
- var dialogDiv = CustomDialog.dialogDiv_;
- if (!dialogDiv) {
- // Generate HTML
- backdropDiv = document.createElement('div');
- backdropDiv.id = 'customDialogBackdrop';
- backdropDiv.style.cssText =
- 'position: absolute;' +
- 'top: 0; left: 0; right: 0; bottom: 0;' +
- 'background-color: rgba(0, 0, 0, .7);';
- document.body.appendChild(backdropDiv);
-
- dialogDiv = document.createElement('div');
- dialogDiv.id = 'customDialog';
- dialogDiv.style.cssText =
- 'background-color: #fff;' +
- 'width: 400px;' +
- 'margin: 20px auto 0;' +
- 'padding: 10px;';
- backdropDiv.appendChild(dialogDiv);
-
- dialogDiv.onclick = function(event) {
- event.stopPropagation();
- };
-
- CustomDialog.backdropDiv_ = backdropDiv;
- CustomDialog.dialogDiv_ = dialogDiv;
- }
- backdropDiv.style.display = 'block';
- dialogDiv.style.display = 'block';
-
- dialogDiv.innerHTML =
- 'Blockly Demo: Custom Dialog
-
-
-
-
-
-
- Blockly Demo: Fixed Blockly
-
-
-
-
-
-
- Blockly Demo: Generating JavaScript
-
-
-
-
-
-
-
- Blockly Demo: Graph
-
-
-
-
-
-
-
-
-
-
-
- Blockly Demo: Headless
-
-
-
-
-
-
-
-
-
-
- a)++f;else if(47===a)if(a=k.charCodeAt(f+1),42===a){var a=n.onComment&&n.locations&&new e,b=f,d=k.indexOf("*/",f+=2);-1===d&&c(f-2,"Unterminated comment");
-f=d+2;if(n.locations){Y.lastIndex=b;for(var g=void 0;(g=Y.exec(k))&&g.index=a?a=P(!0):(++f,a=g(xa)),a;case 40:return++f,g(I);case 41:return++f,g(E);case 59:return++f,g(J);case 44:return++f,g(L);case 91:return++f,g(ja);
-case 93:return++f,g(ka);case 123:return++f,g(Z);case 125:return++f,g(T);case 58:return++f,g(aa);case 63:return++f,g(ya);case 48:if(a=k.charCodeAt(f+1),120===a||88===a)return f+=2,a=B(16),null==a&&c(x+2,"Expected hexadecimal number"),la(k.charCodeAt(f))&&c(f,"Identifier directly after number"),a=g(ba,a);case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:return P(!1);case 34:case 39:a:{f++;for(var b="";;){f>=S&&c(x,"Unterminated string constant");var d=k.charCodeAt(f);if(d===a){++f;
-a=g(da,b);break a}if(92===d){var d=k.charCodeAt(++f),e=/^[0-7]+/.exec(k.slice(f,f+3));for(e&&(e=e[0]);e&&255=S)return g(pa);var b=k.charCodeAt(f);if(la(b)||92===b)return Ya();a=m(b);if(!1===a){b=String.fromCharCode(b);if("\\"===b||Za.test(b))return Ya();c(f,"Unexpected character '"+b+"'")}return a}function t(a,b){var c=k.slice(f,f+b);f+=b;g(a,c)}function K(){for(var a,b,d=f;;){f>=S&&c(d,
-"Unterminated regular expression");var e=k.charAt(f);na.test(e)&&c(d,"Unterminated regular expression");if(a)a=!1;else{if("["===e)b=!0;else if("]"===e&&b)b=!1;else if("/"===e&&!b)break;a="\\"===e}++f}a=k.slice(d,f);++f;(b=$a())&&!/^[gmsiy]*$/.test(b)&&c(d,"Invalid regexp flag");return g(Ba,new RegExp(a,b))}function B(a,b){for(var c=f,d=0,e=0,g=null==b?Infinity:b;e=h?h-48:Infinity;if(h>=a)break;++f;d=d*a+h}return f===c||null!=b&&
-f-c!==b?null:d}function P(a){var b=f,d=!1,e=48===k.charCodeAt(f);a||null!==B(10)||c(b,"Invalid number");46===k.charCodeAt(f)&&(++f,B(10),d=!0);a=k.charCodeAt(f);if(69===a||101===a)a=k.charCodeAt(++f),43!==a&&45!==a||++f,null===B(10)&&c(b,"Invalid number"),d=!0;la(k.charCodeAt(f))&&c(f,"Identifier directly after number");a=k.slice(b,f);var h;d?h=parseFloat(a):e&&1!==a.length?/[89]/.test(a)||C?c(b,"Invalid number"):h=parseInt(a,8):h=parseInt(a,10);return g(ba,h)}function ma(a){a=B(16,a);null===a&&c(x,
-"Bad character escape sequence");return a}function $a(){ca=!1;for(var a,b=!0,d=f;;){var e=k.charCodeAt(f);if(ab(e))ca&&(a+=k.charAt(f)),++f;else if(92===e){ca||(a=k.slice(d,f));ca=!0;117!=k.charCodeAt(++f)&&c(f,"Expecting Unicode escape sequence \\uXXXX");++f;var e=ma(4),g=String.fromCharCode(e);g||c(f-1,"Invalid Unicode escape");(b?la(e):ab(e))||c(f-4,"Invalid Unicode escape");a+=g}else break;b=!1}return ca?a:k.slice(d,f)}function Ya(){var a=$a(),b=V;ca||(Lb(a)?b=Ca[a]:(n.forbidReserved&&(3===n.ecmaVersion?
-Mb:Nb)(a)||C&&bb(a))&&c(x,"The keyword '"+a+"' is reserved"));return g(b,a)}function r(){Da=x;M=X;Ea=ia;z()}function Fa(a){C=a;f=M;if(n.locations)for(;fb){var e=Q(a);e.left=a;e.operator=H;a=p;r();e.right=Ra(Sa(),d,c);d=q(e,a===Va||a===Wa?"LogicalExpression":"BinaryExpression");return Ra(d,b,c)}return a}function Sa(){if(p.prefix){var a=y(),b=p.isUpdate;a.operator=H;R=a.prefix=!0;r();a.argument=
-Sa();b?ra(a.argument):C&&"delete"===a.operator&&"Identifier"===a.argument.type&&c(a.start,"Deleting local variable in strict mode");return q(a,b?"UpdateExpression":"UnaryExpression")}for(b=ha(ua());p.postfix&&!qa();)a=Q(b),a.operator=H,a.prefix=!1,a.argument=b,ra(b),r(),b=q(a,"UpdateExpression");return b}function ha(a,b){if(u(xa)){var c=Q(a);c.object=a;c.property=O(!0);c.computed=!1;return ha(q(c,"MemberExpression"),b)}return u(ja)?(c=Q(a),c.object=a,c.property=A(),c.computed=!0,v(ka),ha(q(c,"MemberExpression"),
-b)):!b&&u(I)?(c=Q(a),c.callee=a,c.arguments=Ta(E,!1),ha(q(c,"CallExpression"),b)):a}function ua(){switch(p){case ub:var a=y();r();return q(a,"ThisExpression");case V:return O();case ba:case da:case Ba:return a=y(),a.value=H,a.raw=k.slice(x,X),r(),q(a,"Literal");case vb:case wb:case xb:return a=y(),a.value=p.atomValue,a.raw=p.keyword,r(),q(a,"Literal");case I:var a=oa,b=x;r();var d=A();d.start=b;d.end=X;n.locations&&(d.loc.start=a,d.loc.end=ia);n.ranges&&(d.range=[b,X]);v(E);return d;case ja:return a=
-y(),r(),a.elements=Ta(ka,!0,!0),q(a,"ArrayExpression");case Z:a=y();b=!0;d=!1;a.properties=[];for(r();!u(T);){if(b)b=!1;else if(v(L),n.allowTrailingCommas&&u(T))break;var e={key:p===ba||p===da?ua():O(!0)},g=!1,h;u(aa)?(e.value=A(!0),h=e.kind="init"):5<=n.ecmaVersion&&"Identifier"===e.key.type&&("get"===e.key.name||"set"===e.key.name)?(g=d=!0,h=e.kind=e.key.name,e.key=p===ba||p===da?ua():O(!0),p!==I&&N(),e.value=Na(y(),!1)):N();if("Identifier"===e.key.type&&(C||d))for(var f=0;fd?a.id:a.params[d],(bb(e.name)||sa(e.name))&&c(e.start,"Defining '"+e.name+"' in strict mode"),0<=d)for(var g=0;ga?36===a:91>a?!0:97>a?95===a:123>a?!0:170<=a&&Za.test(String.fromCharCode(a))},ab=a.isIdentifierChar=function(a){return 48>a?36===a:58>a?!0:65>a?!1:91>a?!0:97>a?95===a:123>a?!0:170<=a&&Pb.test(String.fromCharCode(a))},ca,Ia={kind:"loop"},Ob={kind:"switch"}};
-"object"==typeof exports&&"object"==typeof module?mod$$inline_58(exports):"function"==typeof define&&define.amd?define(["exports"],mod$$inline_58):mod$$inline_58(this.acorn||(this.acorn={}));
-// JS-Interpreter: Copyright 2013 Google Inc, Apache 2.0
-var Interpreter=function(a,b){"string"==typeof a&&(a=acorn.parse(a,Interpreter.PARSE_OPTIONS));this.ast=a;this.initFunc_=b;this.paused_=!1;this.polyfills_=[];this.UNDEFINED=new Interpreter.Primitive(void 0,this);this.NULL=new Interpreter.Primitive(null,this);this.NAN=new Interpreter.Primitive(NaN,this);this.TRUE=new Interpreter.Primitive(!0,this);this.FALSE=new Interpreter.Primitive(!1,this);this.NUMBER_ZERO=new Interpreter.Primitive(0,this);this.NUMBER_ONE=new Interpreter.Primitive(1,this);this.STRING_EMPTY=
-new Interpreter.Primitive("",this);b=this.createScope(this.ast,null);this.NAN.parent=this.NUMBER;this.TRUE.parent=this.BOOLEAN;this.FALSE.parent=this.BOOLEAN;this.NUMBER_ZERO.parent=this.NUMBER;this.NUMBER_ONE.parent=this.NUMBER;this.STRING_EMPTY.parent=this.STRING;this.ast=acorn.parse(this.polyfills_.join("\n"),Interpreter.PARSE_OPTIONS);this.polyfills_=void 0;this.stripLocations_(this.ast);this.stateStack=[{node:this.ast,scope:b,thisExpression:b,done:!1}];this.run();this.value=this.UNDEFINED;this.ast=
-a;this.stateStack=[{node:this.ast,scope:b,thisExpression:b,done:!1}]};Interpreter.PARSE_OPTIONS={ecmaVersion:5};Interpreter.READONLY_DESCRIPTOR={configurable:!0,enumerable:!0,writable:!1};Interpreter.NONENUMERABLE_DESCRIPTOR={configurable:!0,enumerable:!1,writable:!0};Interpreter.READONLY_NONENUMERABLE_DESCRIPTOR={configurable:!0,enumerable:!1,writable:!1};
-Interpreter.prototype.appendCode=function(a){var b=this.stateStack[this.stateStack.length-1];if(!b||"Program"!=b.node.type)throw Error("Expecting original AST to start with a Program node.");"string"==typeof a&&(a=acorn.parse(a,Interpreter.PARSE_OPTIONS));if(!a||"Program"!=a.type)throw Error("Expecting new AST to start with a Program node.");this.populateScope_(a,b.scope);for(var c=0,d;d=a.body[c];c++)b.node.body.push(d);b.done=!1};
-Interpreter.prototype.step=function(){var a=this.stateStack[0];if(!a||"Program"==a.node.type&&a.done)return!1;if(this.paused_)return!0;this["step"+a.node.type]();return a.node.end?!0:this.step()};Interpreter.prototype.run=function(){for(;!this.paused_&&this.step(););return this.paused_};
-Interpreter.prototype.initGlobalScope=function(a){this.setProperty(a,"Infinity",this.createPrimitive(Infinity),Interpreter.READONLY_DESCRIPTOR);this.setProperty(a,"NaN",this.NAN,Interpreter.READONLY_DESCRIPTOR);this.setProperty(a,"undefined",this.UNDEFINED,Interpreter.READONLY_DESCRIPTOR);this.setProperty(a,"window",a,Interpreter.READONLY_DESCRIPTOR);this.setProperty(a,"self",a);this.initFunction(a);this.initObject(a);a.parent=this.OBJECT;this.initArray(a);this.initNumber(a);this.initString(a);this.initBoolean(a);
-this.initDate(a);this.initMath(a);this.initRegExp(a);this.initJSON(a);this.initError(a);var b=this,c;c=function(a){a=a||b.UNDEFINED;return b.createPrimitive(isNaN(a.toNumber()))};this.setProperty(a,"isNaN",this.createNativeFunction(c));c=function(a){a=a||b.UNDEFINED;return b.createPrimitive(isFinite(a.toNumber()))};this.setProperty(a,"isFinite",this.createNativeFunction(c));this.setProperty(a,"parseFloat",this.getProperty(this.NUMBER,"parseFloat"));this.setProperty(a,"parseInt",this.getProperty(this.NUMBER,
-"parseInt"));c=this.createObject(this.FUNCTION);c.eval=!0;this.setProperty(c,"length",this.NUMBER_ONE,Interpreter.READONLY_DESCRIPTOR);this.setProperty(a,"eval",c);for(var d=[[escape,"escape"],[unescape,"unescape"],[decodeURI,"decodeURI"],[decodeURIComponent,"decodeURIComponent"],[encodeURI,"encodeURI"],[encodeURIComponent,"encodeURIComponent"]],h=0;ha?Math.max(this.length+a,0):Math.min(a,this.length);d=c(d,Infinity);d=Math.min(d,this.length-a);for(var g=b.createObject(b.ARRAY),h=a;h=a;h--)this.properties[h+arguments.length-2]=this.properties[h];this.length+=arguments.length-2;for(h=2;hh&&(h=this.length+h);h=Math.max(0,Math.min(h,this.length));
-d=c(d,this.length);0>d&&(d=this.length+d);d=Math.max(0,Math.min(d,this.length));for(a=0;hd&&(d=this.length+d);for(d=Math.max(0,d);dd&&(d=this.length+d);for(d=Math.min(d,this.length-1);0<=d;d--){var h=b.getProperty(this,d);if(h.isPrimitive&&a.isPrimitive?h.data===a.data:h===a)return b.createPrimitive(d)}return b.createPrimitive(-1)};this.setNativeFunctionPrototype(this.ARRAY,"lastIndexOf",d);this.polyfills_.push("Object.defineProperty(Array.prototype, 'every', {configurable: true, value:","function(callbackfn, thisArg) {",
-"if (this == null || typeof callbackfn !== 'function') throw new TypeError;","var T, k;","var O = Object(this);","var len = O.length >>> 0;","if (arguments.length > 1) T = thisArg;","k = 0;","while (k < len) {","if (k in O && !callbackfn.call(T, O[k], k, O)) return false;","k++;","}","return true;","}","});","Object.defineProperty(Array.prototype, 'filter', {configurable: true, value:","function(fun/*, thisArg*/) {","if (this === void 0 || this === null || typeof fun !== 'function') throw new TypeError;",
-"var t = Object(this);","var len = t.length >>> 0;","var res = [];","var thisArg = arguments.length >= 2 ? arguments[1] : void 0;","for (var i = 0; i < len; i++) {","if (i in t) {","var val = t[i];","if (fun.call(thisArg, val, i, t)) res.push(val);","}","}","return res;","}","});","Object.defineProperty(Array.prototype, 'forEach', {configurable: true, value:","function(callback, thisArg) {","if (this == null || typeof callback !== 'function') throw new TypeError;","var T, k;","var O = Object(this);",
-"var len = O.length >>> 0;","if (arguments.length > 1) T = thisArg;","k = 0;","while (k < len) {","if (k in O) callback.call(T, O[k], k, O);","k++;","}","}","});","Object.defineProperty(Array.prototype, 'map', {configurable: true, value:","function(callback, thisArg) {","if (this == null || typeof callback !== 'function') new TypeError;","var T, A, k;","var O = Object(this);","var len = O.length >>> 0;","if (arguments.length > 1) T = thisArg;","A = new Array(len);","k = 0;","while (k < len) {","if (k in O) A[k] = callback.call(T, O[k], k, O);",
-"k++;","}","return A;","}","});","Object.defineProperty(Array.prototype, 'reduce', {configurable: true, value:","function(callback /*, initialValue*/) {","if (this == null || typeof callback !== 'function') throw new TypeError;","var t = Object(this), len = t.length >>> 0, k = 0, value;","if (arguments.length == 2) {","value = arguments[1];","} else {","while (k < len && !(k in t)) k++;","if (k >= len) {","throw new TypeError('Reduce of empty array with no initial value');","}","value = t[k++];",
-"}","for (; k < len; k++) {","if (k in t) value = callback(value, t[k], k, t);","}","return value;","}","});","Object.defineProperty(Array.prototype, 'reduceRight', {configurable: true, value:","function(callback /*, initialValue*/) {","if (null === this || 'undefined' === typeof this || 'function' !== typeof callback) throw new TypeError;","var t = Object(this), len = t.length >>> 0, k = len - 1, value;","if (arguments.length >= 2) {","value = arguments[1];","} else {","while (k >= 0 && !(k in t)) k--;",
-"if (k < 0) {","throw new TypeError('Reduce of empty array with no initial value');","}","value = t[k--];","}","for (; k >= 0; k--) {","if (k in t) value = callback(value, t[k], k, t);","}","return value;","}","});","Object.defineProperty(Array.prototype, 'some', {configurable: true, value:","function(fun/*, thisArg*/) {","if (this == null || typeof fun !== 'function') throw new TypeError;","var t = Object(this);","var len = t.length >>> 0;","var thisArg = arguments.length >= 2 ? arguments[1] : void 0;",
-"for (var i = 0; i < len; i++) {","if (i in t && fun.call(thisArg, t[i], i, t)) {","return true;","}","}","return false;","}","});","Object.defineProperty(Array.prototype, 'sort', {configurable: true, value:","function(opt_comp) {","for (var i = 0; i < this.length; i++) {","var changes = 0;","for (var j = 0; j < this.length - i - 1; j++) {","if (opt_comp ?opt_comp(this[j], this[j + 1]) > 0 : this[j] > this[j + 1]) {","var swap = this[j];","this[j] = this[j + 1];","this[j + 1] = swap;","changes++;",
-"}","}","if (changes <= 1) break;","}","return this;","}","});","Object.defineProperty(Array.prototype, 'toLocaleString', {configurable: true, value:","function() {","var out = [];","for (var i = 0; i < this.length; i++) {","out[i] = (this[i] === null || this[i] === undefined) ? '' : this[i].toLocaleString();","}","return out.join(',');","}","});","")};
-Interpreter.prototype.initNumber=function(a){var b=this,c;c=function(a){a=a?a.toNumber():0;if(this.parent!=b.NUMBER)return b.createPrimitive(a);this.data=a;return this};this.NUMBER=this.createNativeFunction(c);this.setProperty(a,"Number",this.NUMBER);a=["MAX_VALUE","MIN_VALUE","NaN","NEGATIVE_INFINITY","POSITIVE_INFINITY"];for(c=0;cb?1:0};Interpreter.prototype.arrayIndex=function(a){a=Number(a);return!isFinite(a)||a!=Math.floor(a)||0>a?NaN:a};
-Interpreter.Primitive=function(a,b){var c=typeof a;this.data=a;this.type=c;"number"==c?this.parent=b.NUMBER:"string"==c?this.parent=b.STRING:"boolean"==c&&(this.parent=b.BOOLEAN)};Interpreter.Primitive.prototype.data=void 0;Interpreter.Primitive.prototype.type="undefined";Interpreter.Primitive.prototype.parent=null;Interpreter.Primitive.prototype.isPrimitive=!0;Interpreter.Primitive.prototype.toBoolean=function(){return!!this.data};Interpreter.Primitive.prototype.toNumber=function(){return Number(this.data)};
-Interpreter.Primitive.prototype.toString=function(){return String(this.data)};Interpreter.Primitive.prototype.valueOf=function(){return this.data};Interpreter.prototype.createPrimitive=function(a){return void 0===a?this.UNDEFINED:null===a?this.NULL:!0===a?this.TRUE:!1===a?this.FALSE:0===a?this.NUMBER_ZERO:1===a?this.NUMBER_ONE:""===a?this.STRING_EMPTY:a instanceof RegExp?this.populateRegExp_(this.createObject(this.REGEXP),a):new Interpreter.Primitive(a,this)};
-Interpreter.Object=function(a){this.notConfigurable=Object.create(null);this.notEnumerable=Object.create(null);this.notWritable=Object.create(null);this.getter=Object.create(null);this.setter=Object.create(null);this.properties=Object.create(null);this.parent=a};Interpreter.Object.prototype.type="object";Interpreter.Object.prototype.parent=null;Interpreter.Object.prototype.isPrimitive=!1;Interpreter.Object.prototype.data=void 0;Interpreter.Object.prototype.toBoolean=function(){return!0};
-Interpreter.Object.prototype.toNumber=function(){return Number(void 0===this.data?this.toString():this.data)};Interpreter.Object.prototype.toString=function(){return void 0===this.data?"["+this.type+"]":String(this.data)};Interpreter.Object.prototype.valueOf=function(){return void 0===this.data?this:this.data};
-Interpreter.prototype.createObject=function(a){a=new Interpreter.Object(a);this.isa(a,this.FUNCTION)&&(a.type="function",this.setProperty(a,"prototype",this.createObject(this.OBJECT||null)));this.isa(a,this.ARRAY)&&(a.length=0,a.toString=function(){for(var a=[],c=0;c>="==b.operator)b=d>>h;else if(">>>="==b.operator)b=d>>>h;else if("&="==b.operator)b=d&h;else if("^="==b.operator)b=d^h;else if("|="==b.operator)b=d|h;else throw SyntaxError("Unknown assignment expression: "+b.operator);b=this.createPrimitive(b)}(c=this.setValue(a.leftSide,b))?(a.doneSetter_=b,this.stateStack.unshift({node:{type:"CallExpression"},doneCallee_:!0,funcThis_:a.leftSide[0],func_:c,doneArgs_:!0,arguments:[b]})):
-(this.stateStack.shift(),this.stateStack[0].value=b)}else{a.leftSide||(a.leftSide=a.value);a.doneGetter_&&(a.leftValue=a.value);if(!a.doneGetter_&&"="!=b.operator&&(a.leftValue=this.getValue(a.leftSide),a.leftValue.isGetter)){a.leftValue.isGetter=!1;a.doneGetter_=!0;this.stateStack.unshift({node:{type:"CallExpression"},doneCallee_:!0,funcThis_:a.leftSide[0],func_:a.leftValue,doneArgs_:!0,arguments:[]});return}a.doneRight=!0;this.stateStack.unshift({node:b.right})}else a.doneLeft=!0,this.stateStack.unshift({node:b.left,
-components:!0})};
-Interpreter.prototype.stepBinaryExpression=function(){var a=this.stateStack[0],b=a.node;if(a.doneLeft)if(a.doneRight){this.stateStack.shift();var c=a.leftValue,a=a.value,d=this.comp(c,a);if("=="==b.operator||"!="==b.operator)c=c.isPrimitive&&a.isPrimitive?c.data==a.data:0===d,"!="==b.operator&&(c=!c);else if("==="==b.operator||"!=="==b.operator)c=c.isPrimitive&&a.isPrimitive?c.data===a.data:c===a,"!=="==b.operator&&(c=!c);else if(">"==b.operator)c=1==d;else if(">="==b.operator)c=1==d||0===d;else if("<"==
-b.operator)c=-1==d;else if("<="==b.operator)c=-1==d||0===d;else if("+"==b.operator)c=c.isPrimitive?c.data:c.toString(),a=a.isPrimitive?a.data:a.toString(),c+=a;else if("in"==b.operator)c=this.hasProperty(a,c);else if("instanceof"==b.operator)this.isa(a,this.FUNCTION)||this.throwException(this.TYPE_ERROR,"Expecting a function in instanceof check"),c=this.isa(c,a);else if(c=c.toNumber(),a=a.toNumber(),"-"==b.operator)c-=a;else if("*"==b.operator)c*=a;else if("/"==b.operator)c/=a;else if("%"==b.operator)c%=
-a;else if("&"==b.operator)c&=a;else if("|"==b.operator)c|=a;else if("^"==b.operator)c^=a;else if("<<"==b.operator)c<<=a;else if(">>"==b.operator)c>>=a;else if(">>>"==b.operator)c>>>=a;else throw SyntaxError("Unknown binary operator: "+b.operator);this.stateStack[0].value=this.createPrimitive(c)}else a.doneRight=!0,a.leftValue=a.value,this.stateStack.unshift({node:b.right});else a.doneLeft=!0,this.stateStack.unshift({node:b.left})};
-Interpreter.prototype.stepBlockStatement=function(){var a=this.stateStack[0],b=a.node,c=a.n_||0;b.body[c]?(a.done=!1,a.n_=c+1,this.stateStack.unshift({node:b.body[c]})):(a.done=!0,"Program"!=a.node.type&&this.stateStack.shift())};
-Interpreter.prototype.stepBreakStatement=function(){var a=this.stateStack.shift(),a=a.node,b=null;a.label&&(b=a.label.name);for(a=this.stateStack.shift();a&&"CallExpression"!=a.node.type&&"NewExpression"!=a.node.type;){if(b?b==a.label:a.isLoop||a.isSwitch)return;a=this.stateStack.shift()}throw SyntaxError("Illegal break statement");};
-Interpreter.prototype.stepCallExpression=function(){var a=this.stateStack[0],b=a.node;if(a.doneCallee_){if(!a.func_){if("function"==a.value.type)a.func_=a.value;else{a.value.length&&(a.member_=a.value[0]);a.func_=this.getValue(a.value);if(!a.func_)return;if("function"!=a.func_.type){this.throwException(this.TYPE_ERROR,(a.value&&a.value.type)+" is not a function");return}}"NewExpression"==a.node.type?(a.funcThis_=this.createObject(a.func_),a.isConstructor_=!0):a.funcThis_=a.func_.boundThis_?a.func_.boundThis_:
-a.value.length?a.value[0]:this.stateStack[this.stateStack.length-1].thisExpression;a.arguments=a.func_.boundArgs_?a.func_.boundArgs_.concat():[];a.n_=0}if(!a.doneArgs_){0!=a.n_&&a.arguments.push(a.value);if(b.arguments[a.n_]){this.stateStack.unshift({node:b.arguments[a.n_]});a.n_++;return}a.doneArgs_=!0}if(a.doneExec_)this.stateStack.shift(),this.stateStack[0].value=a.isConstructor_&&"object"!==a.value.type?a.funcThis_:a.value;else if(a.doneExec_=!0,a.func_.node){for(var b=this.createScope(a.func_.node.body,
-a.func_.parentScope),c=0;cc?a.arguments[c]:this.UNDEFINED;this.setProperty(b,d,h)}d=this.createObject(this.ARRAY);for(c=0;c
-
-
-
- Blockly Demo: JS Interpreter
-
-
-
-
-
-
-
-
- Blockly Demo: Maximum Block Limit
-
-
-
-
-
-
- Blockly Demo: Mirrored Blockly
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/trunk/web/blockly/demos/plane/README.txt b/trunk/web/blockly/demos/plane/README.txt
deleted file mode 100644
index 6da3fa65d6a..00000000000
--- a/trunk/web/blockly/demos/plane/README.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-This Blockly demo uses Closure Templates to create a multilingual application.
-Any changes to the template.soy file require a recompile. Here is the command
-to generate a quick English version for debugging:
-
-java -jar soy/SoyToJsSrcCompiler.jar --outputPathFormat generated/en.js --srcs template.soy
-
-To generate a full set of language translations, first extract all the strings
-from template.soy using this command:
-
-java -jar soy/SoyMsgExtractor.jar --outputFile xlf/extracted_msgs.xlf template.soy
-
-This generates xlf/extracted_msgs.xlf, which may then be used by any
-XLIFF-compatible translation console to generate a set of files with the
-translated strings. These should be placed in the xlf directory.
-
-Finally, generate all the language versions wih this command:
-
-java -jar soy/SoyToJsSrcCompiler.jar --locales ar,be-tarask,br,ca,da,de,el,en,es,fa,fr,he,hrx,hu,ia,is,it,ja,ko,ms,nb,nl,pl,pms,pt-br,ro,ru,sc,sv,th,tr,uk,vi,zh-hans,zh-hant --messageFilePathFormat xlf/translated_msgs_{LOCALE}.xlf --outputPathFormat "generated/{LOCALE}.js" template.soy
-
-This is the process that Google uses for maintaining Blockly Games in 40+
-languages. The XLIFF fromat is simple enough that it is trival to write a
-Python script to reformat it into some other format (such as JSON) for
-compatability with other translation consoles.
-
-For more information, see message translation for Closure Templates:
-https://developers.google.com/closure/templates/docs/translation
diff --git a/trunk/web/blockly/demos/plane/blocks.js b/trunk/web/blockly/demos/plane/blocks.js
deleted file mode 100644
index 18be29c5dd8..00000000000
--- a/trunk/web/blockly/demos/plane/blocks.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Blockly Demos: Plane Seat Calculator Blocks
- *
- * Copyright 2013 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 Blocks for Blockly's Plane Seat Calculator application.
- * @author fraser@google.com (Neil Fraser)
- */
-'use strict';
-
-Blockly.Blocks['plane_set_seats'] = {
- // Block seat variable setter.
- init: function() {
- this.setHelpUrl(Blockly.Msg.VARIABLES_SET_HELPURL);
- this.setColour(330);
- this.appendValueInput('VALUE')
- .appendField(Plane.getMsg('Plane_setSeats'));
- this.setTooltip(Blockly.Msg.VARIABLES_SET_TOOLTIP);
- this.setDeletable(false);
- }
-};
-
-Blockly.JavaScript['plane_set_seats'] = function(block) {
- // Generate JavaScript for seat variable setter.
- var argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
- Blockly.JavaScript.ORDER_ASSIGNMENT) || 'NaN';
- return argument0 + ';';
-};
-
-Blockly.Blocks['plane_get_rows'] = {
- // Block for row variable getter.
- init: function() {
- this.setHelpUrl(Blockly.Msg.VARIABLES_GET_HELPURL);
- this.setColour(330);
- this.appendDummyInput()
- .appendField(Plane.getMsg('Plane_getRows'), 'title');
- this.setOutput(true, 'Number');
- },
- customUpdate: function() {
- this.setFieldValue(
- Plane.getMsg('Plane_getRows').replace('%1', Plane.rows1st), 'title');
- }
-};
-
-Blockly.JavaScript['plane_get_rows'] = function(block) {
- // Generate JavaScript for row variable getter.
- return ['Plane.rows1st', Blockly.JavaScript.ORDER_MEMBER];
-};
-
-Blockly.Blocks['plane_get_rows1st'] = {
- // Block for first class row variable getter.
- init: function() {
- this.setHelpUrl(Blockly.Msg.VARIABLES_GET_HELPURL);
- this.setColour(330);
- this.appendDummyInput()
- .appendField(Plane.getMsg('Plane_getRows1'), 'title');
- this.setOutput(true, 'Number');
- },
- customUpdate: function() {
- this.setFieldValue(
- Plane.getMsg('Plane_getRows1').replace('%1', Plane.rows1st), 'title');
- }
-};
-
-Blockly.JavaScript['plane_get_rows1st'] = function(block) {
- // Generate JavaScript for first class row variable getter.
- return ['Plane.rows1st', Blockly.JavaScript.ORDER_MEMBER];
-};
-
-Blockly.Blocks['plane_get_rows2nd'] = {
- // Block for second class row variable getter.
- init: function() {
- this.setHelpUrl(Blockly.Msg.VARIABLES_GET_HELPURL);
- this.setColour(330);
- this.appendDummyInput()
- .appendField(Plane.getMsg('Plane_getRows2'), 'title');
- this.setOutput(true, 'Number');
- },
- customUpdate: function() {
- this.setFieldValue(
- Plane.getMsg('Plane_getRows2').replace('%1', Plane.rows2nd), 'title');
- }
-};
-
-Blockly.JavaScript['plane_get_rows2nd'] = function(block) {
- // Generate JavaScript for second class row variable getter.
- return ['Plane.rows2nd', Blockly.JavaScript.ORDER_MEMBER];
-};
diff --git a/trunk/web/blockly/demos/plane/generated/ar.js b/trunk/web/blockly/demos/plane/generated/ar.js
deleted file mode 100644
index 13109490495..00000000000
--- a/trunk/web/blockly/demos/plane/generated/ar.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// This file was automatically generated from template.soy.
-// Please don't edit this file by hand.
-
-if (typeof planepage == 'undefined') { var planepage = {}; }
-
-
-planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
- return '';
-};
-
-
-planepage.start = function(opt_data, opt_ignored, opt_ijData) {
- var output = planepage.messages(null, null, opt_ijData) + '
-
-
-
-
-
-
element to inject into.
- */
-FactoryUtils.injectCode = function(code, id) {
- var pre = document.getElementById(id);
- pre.textContent = code;
- code = pre.textContent;
- code = prettyPrintOne(code, 'js');
- pre.innerHTML = code;
-};
-
-/**
- * Returns whether or not two blocks are the same based on their XML. Expects
- * XML with a single child node that is a factory_base block, the XML found on
- * Block Factory's main workspace.
- * @param {!Element} blockXml1 An XML element with a single child node that
- * is a factory_base block.
- * @param {!Element} blockXml2 An XML element with a single child node that
- * is a factory_base block.
- * @return {boolean} Whether or not two blocks are the same based on their XML.
- */
-FactoryUtils.sameBlockXml = function(blockXml1, blockXml2) {
- // Each XML element should contain a single child element with a 'block' tag
- if (blockXml1.tagName.toLowerCase() != 'xml' ||
- blockXml2.tagName.toLowerCase() != 'xml') {
- throw new Error('Expected two XML elements, recieved elements with tag ' +
- 'names: ' + blockXml1.tagName + ' and ' + blockXml2.tagName + '.');
- }
-
- // Compare the block elements directly. The XML tags may include other meta
- // information we want to igrore.
- var blockElement1 = blockXml1.getElementsByTagName('block')[0];
- var blockElement2 = blockXml2.getElementsByTagName('block')[0];
-
- if (!(blockElement1 && blockElement2)) {
- throw new Error('Could not get find block element in XML.');
- }
-
- var blockXmlText1 = Blockly.Xml.domToText(blockElement1);
- var blockXmlText2 = Blockly.Xml.domToText(blockElement2);
-
- // Strip white space.
- blockXmlText1 = blockXmlText1.replace(/\s+/g, '');
- blockXmlText2 = blockXmlText2.replace(/\s+/g, '');
-
- // Return whether or not changes have been saved.
- return blockXmlText1 == blockXmlText2;
-};
-
-/*
- * Checks if a block has a variable field. Blocks with variable fields cannot
- * be shadow blocks.
- * @param {Blockly.Block} block The block to check if a variable field exists.
- * @return {boolean} True if the block has a variable field, false otherwise.
- */
-FactoryUtils.hasVariableField = function(block) {
- if (!block) {
- return false;
- }
- return block.getVars().length > 0;
-};
-
-/**
- * Checks if a block is a procedures block. If procedures block names are
- * ever updated or expanded, this function should be updated as well (no
- * other known markers for procedure blocks beyond name).
- * @param {Blockly.Block} block The block to check.
- * @return {boolean} True if the block is a procedure block, false otherwise.
- */
-FactoryUtils.isProcedureBlock = function(block) {
- return block &&
- (block.type == 'procedures_defnoreturn' ||
- block.type == 'procedures_defreturn' ||
- block.type == 'procedures_callnoreturn' ||
- block.type == 'procedures_callreturn' ||
- block.type == 'procedures_ifreturn');
-};
-
-/**
- * Returns whether or not a modified block's changes has been saved to the
- * Block Library.
- * TODO(quachtina96): move into the Block Factory Controller once made.
- * @param {!BlockLibraryController} blockLibraryController Block Library
- * Controller storing custom blocks.
- * @return {boolean} True if all changes made to the block have been saved to
- * the given Block Library.
- */
-FactoryUtils.savedBlockChanges = function(blockLibraryController) {
- if (BlockFactory.isStarterBlock()) {
- return true;
- }
- var blockType = blockLibraryController.getCurrentBlockType();
- var currentXml = Blockly.Xml.workspaceToDom(BlockFactory.mainWorkspace);
-
- if (blockLibraryController.has(blockType)) {
- // Block is saved in block library.
- var savedXml = blockLibraryController.getBlockXml(blockType);
- return FactoryUtils.sameBlockXml(savedXml, currentXml);
- }
- return false;
-};
-
-/**
- * Given the root block of the factory, return the tooltip specified by the user
- * or the empty string if no tooltip is found.
- * @param {!Blockly.Block} rootBlock Factory_base block.
- * @return {string} The tooltip for the generated block, or the empty string.
- */
-FactoryUtils.getTooltipFromRootBlock_ = function(rootBlock) {
- var tooltipBlock = rootBlock.getInputTargetBlock('TOOLTIP');
- if (tooltipBlock && !tooltipBlock.disabled) {
- return tooltipBlock.getFieldValue('TEXT');
- }
- return '';
-};
-
-/**
- * Given the root block of the factory, return the help url specified by the
- * user or the empty string if no tooltip is found.
- * @param {!Blockly.Block} rootBlock Factory_base block.
- * @return {string} The help url for the generated block, or the empty string.
- */
-FactoryUtils.getHelpUrlFromRootBlock_ = function(rootBlock) {
- var helpUrlBlock = rootBlock.getInputTargetBlock('HELPURL');
- if (helpUrlBlock && !helpUrlBlock.disabled) {
- return helpUrlBlock.getFieldValue('TEXT');
- }
- return '';
-};
diff --git a/trunk/web/blockly/demos/blockfactory/icon.png b/trunk/web/blockly/demos/blockfactory/icon.png
deleted file mode 100644
index 2fcb25ed7fb..00000000000
Binary files a/trunk/web/blockly/demos/blockfactory/icon.png and /dev/null differ
diff --git a/trunk/web/blockly/demos/blockfactory/index.html b/trunk/web/blockly/demos/blockfactory/index.html
deleted file mode 100644
index 4a4423a82a1..00000000000
--- a/trunk/web/blockly/demos/blockfactory/index.html
+++ /dev/null
@@ -1,746 +0,0 @@
-
-
-
-
-
- Blockly Demo: Blockly Developer Tools
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Blockly >
- Demos > Blockly Developer Tools
-
-
-
- Block Factory
- Block Exporter
- Workspace Factory
-
-
-
-
-
-
- First, select blocks from your block library by clicking on them. Then, use the Export Settings form to download starter code for selected blocks.
-
-
-
-
-
-
- Export Settings
-
-
-
-
-
- Export Preview
-
- Block Definitions:
-
-
-
- Generator Stubs:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Edit
- Drag blocks into the workspace to configure the toolbox in your custom workspace.
-
-
-
- Toolbox
- Workspace
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
-
-
|
- |||||
| - - - | -
-
|
-
element to inject into.
- */
-function injectCode(code, id) {
- var pre = document.getElementById(id);
- pre.textContent = code;
- code = pre.textContent;
- code = prettyPrintOne(code, 'js');
- pre.innerHTML = code;
-}
-
-/**
- * Return the uneditable container block that everything else attaches to.
- * @return {Blockly.Block}
- */
-function getRootBlock() {
- var blocks = mainWorkspace.getTopBlocks(false);
- for (var i = 0, block; block = blocks[i]; i++) {
- if (block.type == 'factory_base') {
- return block;
- }
- }
- return null;
-}
-
-/**
- * Disable the link button if the format is 'Manual', enable otherwise.
- */
-function disableEnableLink() {
- var linkButton = document.getElementById('linkButton');
- linkButton.disabled = document.getElementById('format').value == 'Manual';
-}
-
-/**
- * Initialize Blockly and layout. Called on page load.
- */
-function init() {
- if ('BlocklyStorage' in window) {
- BlocklyStorage.HTTPREQUEST_ERROR =
- 'There was a problem with the request.\n';
- BlocklyStorage.LINK_ALERT =
- 'Share your blocks with this link:\n\n%1';
- BlocklyStorage.HASH_ERROR =
- 'Sorry, "%1" doesn\'t correspond with any saved Blockly file.';
- BlocklyStorage.XML_ERROR = 'Could not load your saved file.\n'+
- 'Perhaps it was created with a different version of Blockly?';
- var linkButton = document.getElementById('linkButton');
- linkButton.style.display = 'inline-block';
- linkButton.addEventListener('click',
- function() {BlocklyStorage.link(mainWorkspace);});
- disableEnableLink();
- }
-
- document.getElementById('helpButton').addEventListener('click',
- function() {
- open('https://developers.google.com/blockly/guides/create-custom-blocks/block-factory',
- 'BlockFactoryHelp');
- });
-
- var expandList = [
- document.getElementById('blockly'),
- document.getElementById('blocklyMask'),
- document.getElementById('preview'),
- document.getElementById('languagePre'),
- document.getElementById('languageTA'),
- document.getElementById('generatorPre')
- ];
- var onresize = function(e) {
- for (var i = 0, expand; expand = expandList[i]; i++) {
- expand.style.width = (expand.parentNode.offsetWidth - 2) + 'px';
- expand.style.height = (expand.parentNode.offsetHeight - 2) + 'px';
- }
- };
- onresize();
- window.addEventListener('resize', onresize);
-
- var toolbox = document.getElementById('toolbox');
- mainWorkspace = Blockly.inject('blockly',
- {collapse: false,
- toolbox: toolbox,
- media: '../../media/'});
-
- // Create the root block.
- if ('BlocklyStorage' in window && window.location.hash.length > 1) {
- BlocklyStorage.retrieveXml(window.location.hash.substring(1),
- mainWorkspace);
- } else {
- var xml = 'Blockly Demo: Block Factory
-
-
-
-
-
-
-
-
-
-
-
- Blockly > - Demos > Block Factory- |
-
-
|
- |||||
| - - - | -
-
|
-
' +
- (options.showCancel ? '': '') +
- (options.showOkay ? '': '') +
- '
';
- dialogDiv.getElementsByClassName('customDialogTitle')[0]
- .appendChild(document.createTextNode(title));
- dialogDiv.getElementsByClassName('customDialogMessage')[0]
- .appendChild(document.createTextNode(message));
-
- var onOkay = function(event) {
- CustomDialog.hide();
- options.onOkay && options.onOkay();
- event && event.stopPropagation();
- };
- var onCancel = function(event) {
- CustomDialog.hide();
- options.onCancel && options.onCancel();
- event && event.stopPropagation();
- };
-
- var dialogInput = document.getElementById('customDialogInput');
- CustomDialog.inputField = dialogInput;
- if (dialogInput) {
- dialogInput.focus();
-
- dialogInput.onkeyup = function(event) {
- if (event.keyCode == 13) {
- // Process as OK when user hits enter.
- onOkay();
- return false;
- } else if (event.keyCode == 27) {
- // Process as cancel when user hits esc.
- onCancel();
- return false;
- }
- };
- } else {
- var okay = document.getElementById('customDialogOkay');
- okay && okay.focus();
- }
-
- if (options.showOkay) {
- document.getElementById('customDialogOkay')
- .addEventListener('click', onOkay);
- }
- if (options.showCancel) {
- document.getElementById('customDialogCancel')
- .addEventListener('click', onCancel);
- }
-
- backdropDiv.onclick = onCancel;
-};
diff --git a/trunk/web/blockly/demos/custom-dialogs/index.html b/trunk/web/blockly/demos/custom-dialogs/index.html
deleted file mode 100644
index 42cba547758..00000000000
--- a/trunk/web/blockly/demos/custom-dialogs/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
- Blockly > - Demos > Custom Dialog
- -This is a simple demo of replacing modal browser dialogs with HTML.
- -Try creating new variables, creating variables with names already in - use, or deleting multiple blocks on the workspace. -
- - - - - - - - - - diff --git a/trunk/web/blockly/demos/fixed/icon.png b/trunk/web/blockly/demos/fixed/icon.png deleted file mode 100644 index 1158acf0176..00000000000 Binary files a/trunk/web/blockly/demos/fixed/icon.png and /dev/null differ diff --git a/trunk/web/blockly/demos/fixed/index.html b/trunk/web/blockly/demos/fixed/index.html deleted file mode 100644 index 680fa7691cf..00000000000 --- a/trunk/web/blockly/demos/fixed/index.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - -Blockly > - Demos > Fixed Blockly
- -This is a simple demo of injecting Blockly into a fixed-sized 'div' element.
- -→ More info on injecting fixed-sized Blockly…
- - - - - - - - - diff --git a/trunk/web/blockly/demos/generator/icon.png b/trunk/web/blockly/demos/generator/icon.png deleted file mode 100644 index 132016e3f23..00000000000 Binary files a/trunk/web/blockly/demos/generator/icon.png and /dev/null differ diff --git a/trunk/web/blockly/demos/generator/index.html b/trunk/web/blockly/demos/generator/index.html deleted file mode 100644 index 7bc48385524..00000000000 --- a/trunk/web/blockly/demos/generator/index.html +++ /dev/null @@ -1,145 +0,0 @@ - - - - -Blockly > - Demos > Generating JavaScript
- -This is a simple demo of generating code from blocks.
- -→ More info on Code Generators…
- -- - -
- - - - - - - - - - - diff --git a/trunk/web/blockly/demos/graph/icon.png b/trunk/web/blockly/demos/graph/icon.png deleted file mode 100644 index ad8b582f69d..00000000000 Binary files a/trunk/web/blockly/demos/graph/icon.png and /dev/null differ diff --git a/trunk/web/blockly/demos/graph/index.html b/trunk/web/blockly/demos/graph/index.html deleted file mode 100644 index 4732070d977..00000000000 --- a/trunk/web/blockly/demos/graph/index.html +++ /dev/null @@ -1,358 +0,0 @@ - - - - -Blockly > - Demos > Graph
- -This is a demo of giving instant feedback as blocks are changed.
- -→ More info on Realtime generation…
- -| - - | -- - | -
- 
- ...
-
-
-
-
-
-
-
-
-
-
diff --git a/trunk/web/blockly/demos/headless/icon.png b/trunk/web/blockly/demos/headless/icon.png
deleted file mode 100644
index af9ebe71422..00000000000
Binary files a/trunk/web/blockly/demos/headless/icon.png and /dev/null differ
diff --git a/trunk/web/blockly/demos/headless/index.html b/trunk/web/blockly/demos/headless/index.html
deleted file mode 100644
index 62d49fdfac1..00000000000
--- a/trunk/web/blockly/demos/headless/index.html
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
- ...
- Blockly > - Demos > Headless
- -This is a simple demo of generating Python code from XML with no graphics. - This might be useful for server-side code generation.
- -| - - | -- | -- - | -
-
-
-
-
-
-
-
diff --git a/trunk/web/blockly/demos/interpreter/acorn_interpreter.js b/trunk/web/blockly/demos/interpreter/acorn_interpreter.js
deleted file mode 100644
index 05fd7397c1b..00000000000
--- a/trunk/web/blockly/demos/interpreter/acorn_interpreter.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// Acorn: Copyright 2012 Marijn Haverbeke, MIT License
-var mod$$inline_58=function(a){function b(a){n=a||{};for(var b in Ua)Object.prototype.hasOwnProperty.call(n,b)||(n[b]=Ua[b]);wa=n.sourceFile||null}function c(a,b){var c=Ab(k,a);b+=" ("+c.line+":"+c.column+")";var d=new SyntaxError(b);d.pos=a;d.loc=c;d.raisedAt=f;throw d;}function d(a){function b(a){if(1==a.length)return c+="return str === "+JSON.stringify(a[0])+";";c+="switch(str){";for(var va=0;vaBlockly > - Demos > JS Interpreter
- -This is a simple demo of executing code with a sandboxed JavaScript interpreter.
- -→ More info on JS Interpreter…
- -- - -
- - - - - - - - - - - diff --git a/trunk/web/blockly/demos/maxBlocks/icon.png b/trunk/web/blockly/demos/maxBlocks/icon.png deleted file mode 100644 index 13bf65a9c8f..00000000000 Binary files a/trunk/web/blockly/demos/maxBlocks/icon.png and /dev/null differ diff --git a/trunk/web/blockly/demos/maxBlocks/index.html b/trunk/web/blockly/demos/maxBlocks/index.html deleted file mode 100644 index 17a967339cd..00000000000 --- a/trunk/web/blockly/demos/maxBlocks/index.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - -Blockly > - Demos > Maximum Block Limit
- -This is a demo of Blockly which has been restricted to a maximum of - five blocks.
- -You have block(s) left.
- - - - - - - - - diff --git a/trunk/web/blockly/demos/mirror/icon.png b/trunk/web/blockly/demos/mirror/icon.png deleted file mode 100644 index 45e2a9a290c..00000000000 Binary files a/trunk/web/blockly/demos/mirror/icon.png and /dev/null differ diff --git a/trunk/web/blockly/demos/mirror/index.html b/trunk/web/blockly/demos/mirror/index.html deleted file mode 100644 index ea029e38d63..00000000000 --- a/trunk/web/blockly/demos/mirror/index.html +++ /dev/null @@ -1,79 +0,0 @@ - - - - -Blockly > - Demos > Mirrored Blockly
- -This is a simple demo of a master Blockly that controls a slave Blockly. - Open the JavaScript console to see the event passing.
- -→ More info on events…
- -| - - | -- - | -
Blockly > Demos > آلة حاسبة لمقعد الطائرة '; - var iLimit37 = opt_ijData.maxLevel + 1; - for (var i37 = 1; i37 < iLimit37; i37++) { - output += ' ' + ((i37 == opt_ijData.level) ? '' + soy.$$escapeHtml(i37) + '' : (i37 < opt_ijData.level) ? '' + soy.$$escapeHtml(i37) + '' : '' + soy.$$escapeHtml(i37) + ''); - } - output += ' |