Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

[BezierEditor] Fix fadeout issue #7248

Merged
merged 1 commit into from
Mar 21, 2014
Merged

[BezierEditor] Fix fadeout issue #7248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,13 +530,14 @@ define(function (require, exports, module) {
// current cubic-bezier() function params
this._cubicBezierCoords = this._getCubicBezierCoords(bezierCurve);

this.hint = $(".hint", this.$element);
this.hint = {};
this.hint.elem = $(".hint", this.$element);
// If function was auto-corrected, then originalString holds the original function,
// and an informational message needs to be shown
if (bezierCurve.originalString) {
TimingFunctionUtils.showHideHint(this, true, bezierCurve.originalString, "cubic-bezier(" + this._cubicBezierCoords.join(", ") + ")");
TimingFunctionUtils.showHideHint(this.hint, true, bezierCurve.originalString, "cubic-bezier(" + this._cubicBezierCoords.join(", ") + ")");
} else {
TimingFunctionUtils.showHideHint(this, false);
TimingFunctionUtils.showHideHint(this.hint, false);
}

this.P1 = this.$element.find(".P1")[0];
Expand Down Expand Up @@ -611,7 +612,7 @@ define(function (require, exports, module) {
this._cubicBezierCoords[2] + ", " +
this._cubicBezierCoords[3] + ")";
this._callback(bezierCurveVal);
TimingFunctionUtils.showHideHint(this, false);
TimingFunctionUtils.showHideHint(this.hint, false);
};

/**
Expand Down Expand Up @@ -697,9 +698,9 @@ define(function (require, exports, module) {
// If function was auto-corrected, then originalString holds the original function,
// and an informational message needs to be shown
if (bezierCurve.originalString) {
TimingFunctionUtils.showHideHint(this, true, bezierCurve.originalString, "cubic-bezier(" + this._cubicBezierCoords.join(", ") + ")");
TimingFunctionUtils.showHideHint(this.hint, true, bezierCurve.originalString, "cubic-bezier(" + this._cubicBezierCoords.join(", ") + ")");
} else {
TimingFunctionUtils.showHideHint(this, false);
TimingFunctionUtils.showHideHint(this.hint, false);
}
};

Expand Down
13 changes: 7 additions & 6 deletions src/extensions/default/InlineTimingFunctionEditor/StepEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,14 @@ define(function (require, exports, module) {
// current step function params
this._stepParams = this._getStepParams(stepMatch);

this.hint = $(".hint", this.$element);
this.hint = {};
this.hint.elem = $(".hint", this.$element);
// If function was auto-corrected, then originalString holds the original function,
// and an informational message needs to be shown
if (stepMatch.originalString) {
TimingFunctionUtils.showHideHint(this, true, stepMatch.originalString, "steps(" + this._stepParams.count.toString() + ", " + this._stepParams.timing + ")");
TimingFunctionUtils.showHideHint(this.hint, true, stepMatch.originalString, "steps(" + this._stepParams.count.toString() + ", " + this._stepParams.timing + ")");
} else {
TimingFunctionUtils.showHideHint(this, false);
TimingFunctionUtils.showHideHint(this.hint, false);
}

this.canvas = this.$element.find(".steps")[0];
Expand Down Expand Up @@ -364,7 +365,7 @@ define(function (require, exports, module) {
this._stepParams.count.toString() + ", " +
this._stepParams.timing + ")";
this._callback(stepFuncVal);
TimingFunctionUtils.showHideHint(this, false);
TimingFunctionUtils.showHideHint(this.hint, false);
};

/**
Expand Down Expand Up @@ -436,9 +437,9 @@ define(function (require, exports, module) {
// If function was auto-corrected, then originalString holds the original function,
// and an informational message needs to be shown
if (stepMatch.originalString) {
TimingFunctionUtils.showHideHint(this, true, stepMatch.originalString, "steps(" + this._stepParams.count.toString() + ", " + this._stepParams.timing + ")");
TimingFunctionUtils.showHideHint(this.hint, true, stepMatch.originalString, "steps(" + this._stepParams.count.toString() + ", " + this._stepParams.timing + ")");
} else {
TimingFunctionUtils.showHideHint(this, false);
TimingFunctionUtils.showHideHint(this.hint, false);
}
};

Expand Down
29 changes: 16 additions & 13 deletions src/extensions/default/InlineTimingFunctionEditor/TimingFunctionUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,31 +248,34 @@ define(function (require, exports, module) {
/**
* Show, hide or update the hint text
*
* @param {(BezierCurveEditor|StepEditor)} editor BezierCurveEditor or StepsEditor where the hint should be changed
* @param {object} hint Editor.hint object of the current InlineTimingFunctionEditor
* @param {boolean} show Whether the hint should be shown or hidden
* @param {string=} documentCode The invalid code from the document (can be omitted when hiding)
* @param {string=} editorCode The valid code that is shown in the Inline Editor (can be omitted when hiding)
*/
function showHideHint(editor, show, documentCode, editorCode) {
if (!editor.hint) {
function showHideHint(hint, show, documentCode, editorCode) {
if (!hint || !hint.elem) {
return;
}

$(editor.hint[0]).removeClass("fadeout");
if (show) {
editor.hintShown = true;
editor.hint.html(StringUtils.format(Strings.INLINE_TIMING_EDITOR_INVALID, documentCode, editorCode));
editor.hint.css("display", "block");
} else if (editor.hintShown) {
editor.hintShown = false;
AnimationUtils.animateUsingClass(editor.hint[0], "fadeout")
hint.shown = true;
hint.animationInProgress = false;
hint.elem.removeClass("fadeout");
hint.elem.html(StringUtils.format(Strings.INLINE_TIMING_EDITOR_INVALID, documentCode, editorCode));
hint.elem.css("display", "block");
} else if (hint.shown) {
hint.animationInProgress = true;
AnimationUtils.animateUsingClass(hint.elem[0], "fadeout")
.done(function () {
if (!editor.hintShown) {
editor.hint.css("display", "none");
if (hint.animationInProgress) { // do this only if the animation was not cancelled
hint.elem.hide();
}
hint.shown = false;
hint.animationInProgress = false;
});
} else {
editor.hint.css("display", "none");
hint.elem.hide();
}
}

Expand Down