CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-16 05:17:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #663 from picklesrus/develop-fix-xml-load

Browse Source 
Fix #648. It was calling method on the wrong object. Broken by refact…
This commit is contained in:
Rachel Fenichel
2016-10-04 13:19:19 -07:00
committed by GitHub
parent bec41c0065 e5635325d5
commit 4126972b55
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/blocklyfactory/workspacefactory/wfactory_controller.js
View File

@@ -735,7 +735,7 @@ WorkspaceFactoryController.prototype.importFile = function(file, importMode) {
// Confirm that the user wants to override their current toolbox.
var hasToolboxElements = controller.model.hasElements() ||
controller.getAllBlocks().length > 0;
controller.toolboxWorkspace.getAllBlocks().length > 0;
if (hasToolboxElements &&
!confirm('Are you sure you want to import? You will lose your '
+ 'current toolbox. ')) {