Skip to content

Commit

Permalink
Merge pull request #2298 from rachel-fenichel/rc/Feb_19
Browse files Browse the repository at this point in the history
Rebuild and update version numbers
  • Loading branch information
rachel-fenichel authored Feb 16, 2019
2 parents 44f83f1 + 835b9e4 commit 460174d
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 26 deletions.
2 changes: 1 addition & 1 deletion appengine/app.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
application: blockly-demo
version: 1
version: 20190215
runtime: python27
api_version: 1
threadsafe: no
Expand Down
9 changes: 4 additions & 5 deletions blockly_accessible_compressed.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions blockly_compressed.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 21 additions & 14 deletions core/trashcan.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,28 @@ goog.require('goog.math.Rect');
* @constructor
*/
Blockly.Trashcan = function(workspace) {
/**
* The workspace the trashcan sits in.
* @type {!Blockly.Workspace}
* @private
*/
this.workspace_ = workspace;

/**
* True if the trashcan contains blocks, otherwise false.
* @type {boolean}
* @private
*/
this.hasBlocks_ = false;

/**
* A list of Xml (stored as strings) representing blocks "inside" the trashcan.
* @type {Array}
* @private
*/
this.contents_ = [];


if (this.workspace_.options.maxTrashcanContents <= 0) {
return;
}
Expand Down Expand Up @@ -142,20 +163,6 @@ Blockly.Trashcan.prototype.isOpen = false;
*/
Blockly.Trashcan.prototype.minOpenness_ = 0;

/**
* True if the trashcan contains blocks, otherwise false.
* @type {boolean}
* @private
*/
Blockly.Trashcan.prototype.hasBlocks_ = false;

/**
* A list of Xml (stored as strings) representing blocks "inside" the trashcan.
* @type {Array}
* @private
*/
Blockly.Trashcan.prototype.contents_ = [];

/**
* The SVG group containing the trash can.
* @type {Element}
Expand Down
Loading

0 comments on commit 460174d

Please sign in to comment.