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

Update to latest version.

Browse Source
This commit is contained in:
Neil Fraser
2014-09-08 14:26:52 -07:00
parent 58f264f4ce
commit d998a1c8ec
737 changed files with 29546 additions and 27625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/field_colour.js
View File

@@ -45,7 +45,7 @@ Blockly.FieldColour = function(colour, opt_changeHandler) {
Blockly.FieldColour.superClass_.constructor.call(this, '\u00A0\u00A0\u00A0');
this.changeHandler_ = opt_changeHandler;
this.borderRect_.style.fillOpacity = 1;
this.borderRect_.style['fillOpacity'] = 1;
// Set the initial state.
this.setValue(colour);
};
@@ -66,10 +66,10 @@ Blockly.FieldColour.prototype.clone = function() {
Blockly.FieldColour.prototype.CURSOR = 'default';
/**
* Dispose of all DOM objects belonging to this editable field.
* Close the colour picker if this input is being deleted.
*/
Blockly.FieldColour.prototype.dispose = function() {
Blockly.WidgetDiv.hideIfField(this);
Blockly.WidgetDiv.hideIfOwner(this);
Blockly.FieldColour.superClass_.dispose.call(this);
};
@@ -89,6 +89,9 @@ Blockly.FieldColour.prototype.setValue = function(colour) {
this.colour_ = colour;
this.borderRect_.style.fill = colour;
if (this.sourceBlock_ && this.sourceBlock_.rendered) {
// Since we're not re-rendering we need to explicitly call
// Blockly.Realtime.blockChanged()
Blockly.Realtime.blockChanged(this.sourceBlock_);
this.sourceBlock_.workspace.fireChangeEvent();
}
};
@@ -111,27 +114,45 @@ Blockly.FieldColour.COLUMNS = 7;
* @private
*/
Blockly.FieldColour.prototype.showEditor_ = function() {
Blockly.WidgetDiv.show(this, Blockly.FieldColour.dispose_);
var div = Blockly.WidgetDiv.DIV;
Blockly.WidgetDiv.show(this, Blockly.FieldColour.widgetDispose_);
// Create the palette using Closure.
var picker = new goog.ui.ColorPicker();
picker.setSize(Blockly.FieldColour.COLUMNS);
picker.setColors(Blockly.FieldColour.COLOURS);
picker.render(div);
picker.setSelectedColor(this.getValue());
// Position the palette to line up with the field.
// Record windowSize and scrollOffset before adding the palette.
var windowSize = goog.dom.getViewportSize();
var scrollOffset = goog.style.getViewportPageOffset(document);
var xy = Blockly.getAbsoluteXY_(/** @type {!Element} */ (this.borderRect_));
var borderBBox = this.borderRect_.getBBox();
var div = Blockly.WidgetDiv.DIV;
picker.render(div);
picker.setSelectedColor(this.getValue());
// Record paletteSize after adding the palette.
var paletteSize = goog.style.getSize(picker.getElement());
// Flip the palette vertically if off the bottom.
if (xy.y + paletteSize.height + borderBBox.height >=
windowSize.height + scrollOffset.y) {
xy.y -= paletteSize.height - 1;
} else {
xy.y += borderBBox.height - 1;
}
if (Blockly.RTL) {
xy.x += borderBBox.width;
xy.x -= paletteSize.width;
// Don't go offscreen left.
if (xy.x < scrollOffset.x) {
xy.x = scrollOffset.x;
}
} else {
// Don't go offscreen right.
if (xy.x > windowSize.width + scrollOffset.x - paletteSize.width) {
xy.x = windowSize.width + scrollOffset.x - paletteSize.width;
}
}
xy.y += borderBBox.height - 1;
if (Blockly.RTL) {
xy.x -= div.offsetWidth;
}
div.style.left = xy.x + 'px';
div.style.top = xy.y + 'px';
Blockly.WidgetDiv.position(xy.x, xy.y, windowSize, scrollOffset);
// Configure event handler.
var thisObj = this;
@@ -157,7 +178,7 @@ Blockly.FieldColour.prototype.showEditor_ = function() {
* Hide the colour palette.
* @private
*/
Blockly.FieldColour.dispose_ = function() {
Blockly.FieldColour.widgetDispose_ = function() {
if (Blockly.FieldColour.changeEventKey_) {
goog.events.unlistenByKey(Blockly.FieldColour.changeEventKey_);
}