From 9b6c0bdafc63db035ffba98c008700e8cef1f19b Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 18 Jan 2014 00:59:23 +0100 Subject: [PATCH 1/4] Strings for switching with tab --- src/nls/de/strings.js | 2 +- src/nls/root/strings.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 7e697f42e67..9cf78347c6d 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -482,7 +482,7 @@ define({ // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Zeit", "INLINE_TIMING_EDITOR_PROGRESSION" : "Verlauf", - "BEZIER_EDITOR_INFO" : "↑↓←→ Ausgewählten Punkt bewegen
Umschalt Um 10 Einheiten bewegen", + "BEZIER_EDITOR_INFO" : "↑↓←→ Ausgewählten Punkt bewegen
Umschalt Um 10 Einheiten bewegen
\u21B9 Zwischen Punkten wechseln", "STEPS_EDITOR_INFO" : "↑↓ Stufenzahl vergrößern oder verkleinern
←→ 'Start' oder 'Ende'", // extensions/default/InlineColorEditor diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 39591c369bb..3bc19e5baa1 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -488,7 +488,7 @@ define({ // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Time", "INLINE_TIMING_EDITOR_PROGRESSION" : "Progression", - "BEZIER_EDITOR_INFO" : "↑↓←→ Move selected point
Shift Move by ten units", + "BEZIER_EDITOR_INFO" : "↑↓←→ Move selected point
Shift Move by ten units
\u21B9 Switch points", "STEPS_EDITOR_INFO" : "↑↓ Increase or decrease steps
←→ 'Start' or 'End'", // extensions/default/InlineColorEditor From 9aaa0b728ba9bc195ed50917d4e955020ef6572f Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 18 Jan 2014 01:31:13 +0100 Subject: [PATCH 2/4] Support for tabbing in BezierEditor --- .../InlineTimingFunctionEditor/BezierCurveEditor.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js b/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js index 82575fef136..c235e82fa54 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js +++ b/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js @@ -496,6 +496,14 @@ define(function (require, exports, module) { } else if (code === KeyEvent.DOM_VK_ESCAPE) { return true; + } else if (code === KeyEvent.DOM_VK_TAB && !e.ctrlKey && !e.metaKey && !e.altKey) { + // Switch between the two points by tabbing + if ($(e.target).hasClass("P1")) { + $(".P2").focus(); + } else { + $(".P1").focus(); + } + e.preventDefault(); } return false; From e04dacf32e2246366619a2bbc493e1d9a3b79fb4 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 24 Jan 2014 23:58:35 +0100 Subject: [PATCH 3/4] key handler returns true --- .../default/InlineTimingFunctionEditor/BezierCurveEditor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js b/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js index c235e82fa54..2fca5361847 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js +++ b/src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js @@ -504,6 +504,7 @@ define(function (require, exports, module) { $(".P1").focus(); } e.preventDefault(); + return true; } return false; From 9ef711860bcbc75199ab9ad8bfdc30b4ed278a77 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Sat, 25 Jan 2014 01:45:03 +0100 Subject: [PATCH 4/4] Changing string to use Tab instead of unicode char --- src/nls/de/strings.js | 2 +- src/nls/root/strings.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 873e55a999b..b6d65425063 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -482,7 +482,7 @@ define({ // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Zeit", "INLINE_TIMING_EDITOR_PROGRESSION" : "Verlauf", - "BEZIER_EDITOR_INFO" : "↑↓←→ Ausgewählten Punkt bewegen
Umschalt Um 10 Einheiten bewegen
\u21B9 Zwischen Punkten wechseln", + "BEZIER_EDITOR_INFO" : "↑↓←→ Ausgewählten Punkt bewegen
Umschalt Um 10 Einheiten bewegen
Tab Zwischen Punkten wechseln", "STEPS_EDITOR_INFO" : "↑↓ Stufenzahl vergrößern oder verkleinern
←→ 'Start' oder 'Ende'", // extensions/default/InlineColorEditor diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 3ddead54156..9b4b8d778ae 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -488,7 +488,7 @@ define({ // extensions/default/InlineTimingFunctionEditor "INLINE_TIMING_EDITOR_TIME" : "Time", "INLINE_TIMING_EDITOR_PROGRESSION" : "Progression", - "BEZIER_EDITOR_INFO" : "↑↓←→ Move selected point
Shift Move by ten units
\u21B9 Switch points", + "BEZIER_EDITOR_INFO" : "↑↓←→ Move selected point
Shift Move by ten units
Tab Switch points", "STEPS_EDITOR_INFO" : "↑↓ Increase or decrease steps
←→ 'Start' or 'End'", // extensions/default/InlineColorEditor