CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-04 15:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reverse deprecated argument order to womtoblock in accessible.

Browse Source
This commit is contained in:
Neil Fraser
2018-04-17 11:34:32 -07:00
committed by Neil Fraser
parent b2cb96b5b1
commit b4450b7dee
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/block-connection.service.js
View File

@@ -101,7 +101,7 @@ blocklyApp.BlockConnectionService = ng.core.Class({
},
attachToMarkedConnection: function(block) {
var xml = Blockly.Xml.blockToDom(block);
var reconstitutedBlock = Blockly.Xml.domToBlock(blocklyApp.workspace, xml);
var reconstitutedBlock = Blockly.Xml.domToBlock(xml, blocklyApp.workspace);
var targetConnection = null;
if (this.markedConnection_.targetBlock() &&

2
accessible/field-segment.component.js
View File

@@ -182,7 +182,7 @@ blocklyApp.FieldSegmentComponent = ng.core.Component({
},
// Sets the value on a dropdown input.
setDropdownValue: function(optionValue) {
this.optionValue = optionValue
this.optionValue = optionValue;
if (this.optionValue == 'NO_ACTION') {
return;
}

2
accessible/media/accessible.css
View File

@@ -26,7 +26,7 @@
}
.blocklySidebarButton[disabled] {
border: 1px solid #ccc;
opacity: 0.5;
opacity: .5;
}
.blocklyAriaLiveStatus {

6
accessible/toolbox-modal.service.js
View File

@@ -71,7 +71,7 @@ blocklyApp.ToolboxModalService = ng.core.Class({
this.allToolboxCategories = Array.from(toolboxCategoryElts).map(
function(categoryElt) {
var tmpWorkspace = new Blockly.Workspace();
var custom = categoryElt.attributes.custom
var custom = categoryElt.attributes.custom;
// TODO (corydiers): Implement custom flyouts once #1153 is solved.
if (custom && custom.value == Blockly.VARIABLE_CATEGORY_NAME) {
var varBlocks =
@@ -95,7 +95,7 @@ blocklyApp.ToolboxModalService = ng.core.Class({
// containing all the top-level blocks.
var tmpWorkspace = new Blockly.Workspace();
Array.from(toolboxXmlElt.children).forEach(function(topLevelNode) {
Blockly.Xml.domToBlock(tmpWorkspace, topLevelNode);
Blockly.Xml.domToBlock(topLevelNode, tmpWorkspace);
});
that.allToolboxCategories = [{
@@ -214,7 +214,7 @@ blocklyApp.ToolboxModalService = ng.core.Class({
this.showModal_(this.toolboxCategoriesForNewGroup, function(block) {
var blockDescription = that.utilsService.getBlockDescription(block);
var xml = Blockly.Xml.blockToDom(block);
var newBlockId = Blockly.Xml.domToBlock(blocklyApp.workspace, xml).id;
var newBlockId = Blockly.Xml.domToBlock(xml, blocklyApp.workspace).id;
// Invoke a digest cycle, so that the DOM settles.
setTimeout(function() {

4
accessible/variable-add-modal.component.js
View File

@@ -71,7 +71,7 @@ blocklyApp.VariableAddModalComponent = ng.core.Component({
this.workspace = blocklyApp.workspace;
this.variableModalService = variableService;
this.audioService = audioService;
this.keyboardInputService = keyboardService
this.keyboardInputService = keyboardService;
this.modalIsVisible = false;
this.activeButtonIndex = -1;
@@ -103,7 +103,7 @@ blocklyApp.VariableAddModalComponent = ng.core.Component({
getInteractiveElements: Blockly.CommonModal.getInteractiveElements,
// Gets the container with interactive elements.
getInteractiveContainer: function() {
return document.getElementById("varForm");
return document.getElementById('varForm');
},
// Submits the name change for the variable.
submit: function() {

8
accessible/variable-remove-modal.component.js
View File

@@ -74,17 +74,17 @@ blocklyApp.VariableRemoveModalComponent = ng.core.Component({
this.treeService = treeService;
this.variableModalService = variableService;
this.audioService = audioService;
this.keyboardInputService = keyboardService
this.keyboardInputService = keyboardService;
this.modalIsVisible = false;
this.activeButtonIndex = -1;
this.currentVariableName = "";
this.currentVariableName = '';
this.count = 0;
var that = this;
this.variableModalService.registerPreRemoveShowHook(
function(name, count) {
that.currentVariableName = name;
that.count = count
that.count = count;
that.modalIsVisible = true;
Blockly.CommonModal.setupKeyboardOverrides(that);
@@ -106,7 +106,7 @@ blocklyApp.VariableRemoveModalComponent = ng.core.Component({
getInteractiveElements: Blockly.CommonModal.getInteractiveElements,
// Gets the container with interactive elements.
getInteractiveContainer: function() {
return document.getElementById("varForm");
return document.getElementById('varForm');
},
getNumVariables: function() {
return this.variableModalService.getNumVariables(this.currentVariableName);

6
accessible/variable-rename-modal.component.js
View File

@@ -72,10 +72,10 @@ blocklyApp.VariableRenameModalComponent = ng.core.Component({
this.workspace = blocklyApp.workspace;
this.variableModalService = variableService;
this.audioService = audioService;
this.keyboardInputService = keyboardService
this.keyboardInputService = keyboardService;
this.modalIsVisible = false;
this.activeButtonIndex = -1;
this.currentVariableName = "";
this.currentVariableName = '';
var that = this;
this.variableModalService.registerPreRenameShowHook(
@@ -106,7 +106,7 @@ blocklyApp.VariableRenameModalComponent = ng.core.Component({
getInteractiveElements: Blockly.CommonModal.getInteractiveElements,
// Gets the container with interactive elements.
getInteractiveContainer: function() {
return document.getElementById("varForm");
return document.getElementById('varForm');
},
// Submits the name change for the variable.
submit: function() {