Commit ab7650f1 authored by Evan W. Patton's avatar Evan W. Patton Committed by Susan Rati Lane

Hide more chaff

Change-Id: Iae1a102a0323a65a936b21cfa36326c686e3a2c5
parent 702f9b0f
...@@ -479,6 +479,7 @@ Blockly.Backpack.prototype.openBackpack = function(e) { ...@@ -479,6 +479,7 @@ Blockly.Backpack.prototype.openBackpack = function(e) {
for (var i = 0; i < len; i++) { for (var i = 0; i < len; i++) {
newBackpack[i] = Blockly.Xml.textToDom(backpack[i]).firstChild; newBackpack[i] = Blockly.Xml.textToDom(backpack[i]).firstChild;
} }
Blockly.hideChaff();
p.flyout_.show(newBackpack); p.flyout_.show(newBackpack);
}); });
} }
......
...@@ -152,6 +152,7 @@ Blockly.Drawer.prototype.showBuiltin = function(drawerName) { ...@@ -152,6 +152,7 @@ Blockly.Drawer.prototype.showBuiltin = function(drawerName) {
if (!blockSet) { if (!blockSet) {
throw "no such drawer: " + drawerName; throw "no such drawer: " + drawerName;
} }
Blockly.hideChaff();
var xmlList = this.blockListToXMLArray(blockSet); var xmlList = this.blockListToXMLArray(blockSet);
this.flyout_.show(xmlList); this.flyout_.show(xmlList);
}; };
...@@ -164,7 +165,7 @@ Blockly.Drawer.prototype.showBuiltin = function(drawerName) { ...@@ -164,7 +165,7 @@ Blockly.Drawer.prototype.showBuiltin = function(drawerName) {
Blockly.Drawer.prototype.showComponent = function(instanceName) { Blockly.Drawer.prototype.showComponent = function(instanceName) {
var component = this.workspace_.getComponentDatabase().getInstance(instanceName); var component = this.workspace_.getComponentDatabase().getInstance(instanceName);
if (component) { if (component) {
this.flyout_.hide(); Blockly.hideChaff();
this.flyout_.show(this.instanceRecordToXMLArray(component)); this.flyout_.show(this.instanceRecordToXMLArray(component));
this.lastComponent = instanceName; this.lastComponent = instanceName;
} else { } else {
...@@ -182,8 +183,7 @@ Blockly.Drawer.prototype.showComponent = function(instanceName) { ...@@ -182,8 +183,7 @@ Blockly.Drawer.prototype.showComponent = function(instanceName) {
*/ */
Blockly.Drawer.prototype.showGeneric = function(typeName) { Blockly.Drawer.prototype.showGeneric = function(typeName) {
if (this.workspace_.getComponentDatabase().hasType(typeName)) { if (this.workspace_.getComponentDatabase().hasType(typeName)) {
this.flyout_.hide(); Blockly.hideChaff();
var xmlList = this.componentTypeToXMLArray(typeName); var xmlList = this.componentTypeToXMLArray(typeName);
this.flyout_.show(xmlList); this.flyout_.show(xmlList);
} else { } else {
......
...@@ -257,20 +257,26 @@ Blockly.WarningIndicator.prototype.updateWarningToggleText = function() { ...@@ -257,20 +257,26 @@ Blockly.WarningIndicator.prototype.updateWarningToggleText = function() {
* *
*/ */
Blockly.WarningIndicator.prototype.onclickWarningToggle = function() { Blockly.WarningIndicator.prototype.onclickWarningToggle = function() {
Blockly.hideChaff();
window.parent.BlocklyPanel_callToggleWarning(); window.parent.BlocklyPanel_callToggleWarning();
} };
Blockly.WarningIndicator.prototype.onclickWarningNavPrevious = function() { Blockly.WarningIndicator.prototype.onclickWarningNavPrevious = function() {
Blockly.hideChaff();
this.workspace_.getWarningHandler().previousWarning(); this.workspace_.getWarningHandler().previousWarning();
} };
Blockly.WarningIndicator.prototype.onclickWarningNavNext = function() { Blockly.WarningIndicator.prototype.onclickWarningNavNext = function() {
Blockly.hideChaff();
this.workspace_.getWarningHandler().nextWarning(); this.workspace_.getWarningHandler().nextWarning();
} };
Blockly.WarningIndicator.prototype.onclickErrorNavPrevious = function() { Blockly.WarningIndicator.prototype.onclickErrorNavPrevious = function() {
Blockly.hideChaff();
this.workspace_.getWarningHandler().previousError(); this.workspace_.getWarningHandler().previousError();
} };
Blockly.WarningIndicator.prototype.onclickErrorNavNext = function() { Blockly.WarningIndicator.prototype.onclickErrorNavNext = function() {
Blockly.hideChaff();
this.workspace_.getWarningHandler().nextError(); this.workspace_.getWarningHandler().nextError();
} };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment