Author: vjrj
Date: Fri Jun 14 08:42:10 2013
New Revision: 1492997
URL: http://svn.apache.org/r1492997
Log:
Line-through editor shortcut
Modified:
incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/EventWrapper.java
incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/KeyCombo.java
incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorImpl.java
incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorInstrumentor.java
Modified:
incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/EventWrapper.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/EventWrapper.java?rev=1492997&r1=1492996&r2=1492997&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/EventWrapper.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/EventWrapper.java
Fri Jun 14 08:42:10 2013
@@ -143,7 +143,8 @@ public class EventWrapper {
put('2' + CTRL + SHIFT, KeyCombo.CTRL_SHIFT_2);
put('#' + CTRL + SHIFT, KeyCombo.CTRL_SHIFT_3);
put('3' + CTRL + SHIFT, KeyCombo.CTRL_SHIFT_3);
-
+ put('%' + CTRL + SHIFT, KeyCombo.CTRL_SHIFT_5);
+ put('5' + CTRL + SHIFT, KeyCombo.CTRL_SHIFT_5);
// Allowable ORDER combos
// ORDER is the Apple key on OS X and the Ctrl key in Windows and Linux.
@@ -175,6 +176,7 @@ public class EventWrapper {
put('R' + orderKey + SHIFT, KeyCombo.ORDER_SHIFT_R);
put('V' + orderKey + SHIFT, KeyCombo.ORDER_SHIFT_V);
put('K' + orderKey + SHIFT, KeyCombo.ORDER_SHIFT_K);
+ put('5' + orderKey + SHIFT, KeyCombo.ORDER_SHIFT_5);
// Plaintext paste in Safari
put('V' | orderKey | ALT | SHIFT, KeyCombo.ORDER_ALT_SHIFT_V);
Modified:
incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/KeyCombo.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/KeyCombo.java?rev=1492997&r1=1492996&r2=1492997&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/KeyCombo.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/wave/client/common/util/KeyCombo.java
Fri Jun 14 08:42:10 2013
@@ -246,6 +246,10 @@ public enum KeyCombo {
CTRL_SHIFT_2,
/***/
CTRL_SHIFT_3,
+ /***/
+ CTRL_SHIFT_5,
+ /***/
+ ORDER_SHIFT_5,
OTHER,
}
Modified:
incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorImpl.java?rev=1492997&r1=1492996&r2=1492997&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorImpl.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorImpl.java
Fri Jun 14 08:42:10 2013
@@ -723,6 +723,11 @@ public class EditorImpl extends LogicalP
doStyle(start, end, "textDecoration", "underline");
settings.getInstrumentor().record(Action.SHORTCUT_UNDERLINE);
return true;
+ case CTRL_SHIFT_5:
+ case ORDER_SHIFT_5:
+ doStyle(start, end, "textDecoration", "line-through");
+ settings.getInstrumentor().record(Action.SHORTCUT_LINETHROUGH);
+ return true;
}
return false;
@@ -764,6 +769,11 @@ public class EditorImpl extends LogicalP
doCollapsedStyle(caret, "textDecoration", "underline");
settings.getInstrumentor().record(Action.SHORTCUT_UNDERLINE);
return true;
+ case CTRL_SHIFT_5:
+ case ORDER_SHIFT_5:
+ doCollapsedStyle(caret, "textDecoration", "line-through");
+ settings.getInstrumentor().record(Action.SHORTCUT_LINETHROUGH);
+ return true;
}
return false;
Modified:
incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorInstrumentor.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorInstrumentor.java?rev=1492997&r1=1492996&r2=1492997&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorInstrumentor.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/wave/client/editor/EditorInstrumentor.java
Fri Jun 14 08:42:10 2013
@@ -45,6 +45,7 @@ public interface EditorInstrumentor {
SHORTCUT_OPENNEARBYPOPUP,
SHORTCUT_HEADINGSTYLE,
SHORTCUT_ALIGNMENT,
+ SHORTCUT_LINETHROUGH,
// Copy & Paste,
CLIPBOARD_COPY,
