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

[WIP] Merge mutator.js

Browse Source
This commit is contained in:
Evan W. Patton
2016-09-28 21:21:40 -04:00
parent 632e09ac12
commit 37f04bc014
2 changed files with 20 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/mutator.js
View File

@@ -118,20 +118,32 @@ Blockly.Mutator.prototype.createEditor_ = function() {
var quarkXml = null;
}
var workspaceOptions = {
horizontalLayout: false,
languageTree: quarkXml,
parentWorkspace: this.block_.workspace,
pathToMedia: this.block_.workspace.options.pathToMedia,
RTL: this.block_.RTL,
hasCategories: false,
toolboxPosition: this.block_.RTL ? Blockly.TOOLBOX_AT_RIGHT :
Blockly.TOOLBOX_AT_LEFT,
horizontalLayout: false,
getMetrics: this.getFlyoutMetrics_.bind(this),
setMetrics: null
};
this.workspace_ = new Blockly.WorkspaceSvg(workspaceOptions);
this.workspace_.isMutator = true;
this.flyout_ = new Blockly.Flyout();
this.flyout_.autoClose = false;
this.svgDialog_.appendChild(this.flyout_.createDom());
this.svgDialog_.appendChild(
this.workspace_.createDom('blocklyMutatorBackground'));
this.workspace_.createDom('blocklyMutatorBackground'));
//when mutator bubble is clicked, do not close mutator
Blockly.bindEvent_(this.svgDialog_, 'mousedown', this.svgDialog_,
function(e) {
e.preventDefault();
e.stopPropagation();
});
return this.svgDialog_;
};
@@ -165,7 +177,12 @@ Blockly.Mutator.prototype.updateEditable = function() {
*/
Blockly.Mutator.prototype.resizeBubble_ = function() {
var doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
var workspaceSize = this.workspace_.getCanvas().getBBox();
try {
var workspaceSize = this.workspace_.getCanvas().getBBox();
} catch (e) {
// Firefox has trouble with hidden elements (Bug 528969).
return;
}
var width;
if (this.block_.RTL) {
width = -workspaceSize.x;

63
core/mutator.js.rej
View File

@@ -1,63 +0,0 @@
***************
*** 80,86 ****
{'class': 'blocklyIconMark',
'x': Blockly.Icon.RADIUS,
'y': 2 * Blockly.Icon.RADIUS - 4}, this.iconGroup_);
- this.iconMark_.appendChild(document.createTextNode('\u2605'));
};
/**
--- 80,87 ----
{'class': 'blocklyIconMark',
'x': Blockly.Icon.RADIUS,
'y': 2 * Blockly.Icon.RADIUS - 4}, this.iconGroup_);
+ this.iconMark_.appendChild(document.createTextNode('\u2699'));
+ //this.iconMark_.appendChild(document.createTextNode('\u2605'));
};
/**
***************
*** 122,127 ****
this.flyout_.autoClose = false;
this.svgDialog_.appendChild(this.flyout_.createDom());
this.svgDialog_.appendChild(this.workspace_.createDom());
return this.svgDialog_;
};
--- 123,136 ----
this.flyout_.autoClose = false;
this.svgDialog_.appendChild(this.flyout_.createDom());
this.svgDialog_.appendChild(this.workspace_.createDom());
+
+ //when mutator bubble is clicked, do not close mutator
+ Blockly.bindEvent_(this.svgDialog_, 'mousedown', this.svgDialog_,
+ function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ });
+
return this.svgDialog_;
};
***************
*** 147,153 ****
*/
Blockly.Mutator.prototype.resizeBubble_ = function() {
var doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
- var workspaceSize = this.workspace_.getCanvas().getBBox();
var flyoutMetrics = this.flyout_.getMetrics_();
var width;
if (Blockly.RTL) {
--- 156,167 ----
*/
Blockly.Mutator.prototype.resizeBubble_ = function() {
var doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+ try {
+ var workspaceSize = this.workspace_.getCanvas().getBBox();
+ } catch (e) {
+ // Firefox has trouble with hidden elements (Bug 528969).
+ return;
+ }
var flyoutMetrics = this.flyout_.getMetrics_();
var width;
if (Blockly.RTL) {