Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions TangleKit/TangleKit.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@
font: 9px "Helvetica-Neue", "Arial", sans-serif;
}

.TKAdjustableNumberDown .TKAdjustableNumberHelp {
color: #f00;
}
24 changes: 16 additions & 8 deletions TangleKit/TangleKit.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ Tangle.classes.TKIf = {

update: function (element, value) {
if (this.isInverted) { value = !value; }
element.style.display = !value ? "none" : "inline"; // todo, block or inline?
if (value) { element.style.removeProperty("display"); }
else { element.style.display = "none" };
}
};

Expand All @@ -43,7 +44,8 @@ Tangle.classes.TKSwitch = {

update: function (element, value) {
element.getChildren().each( function (child, index) {
child.style.display = (index != value) ? "none" : "inline";
if (index != value) { child.style.display = "none"; }
else { child.style.removeProperty("display"); }
});
}
};
Expand Down Expand Up @@ -129,6 +131,7 @@ Tangle.classes.TKNumberField = {
// Attributes: data-min (optional): minimum value
// data-max (optional): maximum value
// data-step (optional): granularity of adjustment (can be fractional)
// data-help (optional): the help text that appears above the value. defaults to "« drag »"

var isAnyAdjustableNumberDragging = false; // hack for dragging one value over another one

Expand All @@ -142,6 +145,7 @@ Tangle.classes.TKAdjustableNumber = {
this.min = (options.min !== undefined) ? parseFloat(options.min) : 0;
this.max = (options.max !== undefined) ? parseFloat(options.max) : 1e100;
this.step = (options.step !== undefined) ? parseFloat(options.step) : 1;
this.help = (options.help !== undefined) ? options.step : "« drag »";

this.initializeHover();
this.initializeHelp();
Expand Down Expand Up @@ -187,15 +191,19 @@ Tangle.classes.TKAdjustableNumber = {
initializeHelp: function () {
this.helpElement = (new Element("div", { "class": "TKAdjustableNumberHelp" })).inject(this.element, "top");
this.helpElement.setStyle("display", "none");
this.helpElement.set("text", "drag");
this.helpElement.set("text", this.help);
},

updateHelp: function () {
var size = this.element.getSize();
var top = -size.y + 7;
var left = Math.round(0.5 * (size.x - 20));
var display = (this.isHovering && !isAnyAdjustableNumberDragging) ? "block" : "none";
this.helpElement.setStyles({ left:left, top:top, display:display });
var show = ((this.isHovering && !isAnyAdjustableNumberDragging) || this.isDragging)
if (show) {
this.helpElement.setStyle("display", "block");
var top = - this.helpElement.getSize().y * 0.5;
var left = Math.round(0.5 * (this.element.getSize().x - this.helpElement.getSize().x));
this.helpElement.setStyles({ left:left, top:top });
} else {
this.helpElement.setStyle("display", "none");
}
},


Expand Down