зеркало из https://github.com/mozilla/pjs.git
Bug 373240 Uppercase the VK_* bits for consistency with the rest of the codebase (Gv1 - toolkit). p=Serge Gautherie <sgautherie.bz@free.fr>,r=enndeakin
This commit is contained in:
Родитель
2d61a2ff28
Коммит
68b6ff1a65
|
@ -707,17 +707,17 @@
|
||||||
</implementation>
|
</implementation>
|
||||||
|
|
||||||
<handlers>
|
<handlers>
|
||||||
<handler event="keypress" keycode="vk_up" modifiers="control shift any"
|
<handler event="keypress" keycode="VK_UP" modifiers="control shift any"
|
||||||
phase="target" action="moveByOffset(-1, !event.ctrlKey, event.shiftKey);"/>
|
phase="target" action="moveByOffset(-1, !event.ctrlKey, event.shiftKey);"/>
|
||||||
<handler event="keypress" keycode="vk_down" modifiers="control shift any"
|
<handler event="keypress" keycode="VK_DOWN" modifiers="control shift any"
|
||||||
phase="target" action="moveByOffset(1, !event.ctrlKey, event.shiftKey);"/>
|
phase="target" action="moveByOffset(1, !event.ctrlKey, event.shiftKey);"/>
|
||||||
<handler event="keypress" keycode="vk_home" modifiers="control shift any"
|
<handler event="keypress" keycode="VK_HOME" modifiers="control shift any"
|
||||||
phase="target" action="moveByOffset(-this.currentIndex, !event.ctrlKey, event.shiftKey);"/>
|
phase="target" action="moveByOffset(-this.currentIndex, !event.ctrlKey, event.shiftKey);"/>
|
||||||
<handler event="keypress" keycode="vk_end" modifiers="control shift any"
|
<handler event="keypress" keycode="VK_END" modifiers="control shift any"
|
||||||
phase="target" action="moveByOffset(this.getRowCount() - this.currentIndex - 1, !event.ctrlKey, event.shiftKey);"/>
|
phase="target" action="moveByOffset(this.getRowCount() - this.currentIndex - 1, !event.ctrlKey, event.shiftKey);"/>
|
||||||
<handler event="keypress" keycode="vk_page_up" modifiers="control shift any"
|
<handler event="keypress" keycode="VK_PAGE_UP" modifiers="control shift any"
|
||||||
phase="target" action="moveByOffset(this.scrollOnePage(-1), !event.ctrlKey, event.shiftKey);"/>
|
phase="target" action="moveByOffset(this.scrollOnePage(-1), !event.ctrlKey, event.shiftKey);"/>
|
||||||
<handler event="keypress" keycode="vk_page_down" modifiers="control shift any"
|
<handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="control shift any"
|
||||||
phase="target" action="moveByOffset(this.scrollOnePage(1), !event.ctrlKey, event.shiftKey);"/>
|
phase="target" action="moveByOffset(this.scrollOnePage(1), !event.ctrlKey, event.shiftKey);"/>
|
||||||
<handler event="keypress" key=" " phase="target">
|
<handler event="keypress" key=" " phase="target">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
|
|
|
@ -423,7 +423,7 @@
|
||||||
<handler event="blur" action="this.treeBoxObject.focused = false;"/>
|
<handler event="blur" action="this.treeBoxObject.focused = false;"/>
|
||||||
<handler event="blur" phase="capturing"
|
<handler event="blur" phase="capturing"
|
||||||
action="if (event.originalTarget == this.inputField.inputField) this.stopEditing(true);"/>
|
action="if (event.originalTarget == this.inputField.inputField) this.stopEditing(true);"/>
|
||||||
<handler event="keypress" keycode="vk_enter">
|
<handler event="keypress" keycode="VK_ENTER">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn) {
|
if (this._editingColumn) {
|
||||||
this.stopEditing(true);
|
this.stopEditing(true);
|
||||||
|
@ -435,7 +435,7 @@
|
||||||
}
|
}
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_return">
|
<handler event="keypress" keycode="VK_RETURN">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn) {
|
if (this._editingColumn) {
|
||||||
this.stopEditing(true);
|
this.stopEditing(true);
|
||||||
|
@ -447,7 +447,7 @@
|
||||||
}
|
}
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_escape">
|
<handler event="keypress" keycode="VK_ESCAPE">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn) {
|
if (this._editingColumn) {
|
||||||
this.stopEditing(false);
|
this.stopEditing(false);
|
||||||
|
@ -456,7 +456,7 @@
|
||||||
}
|
}
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_left">
|
<handler event="keypress" keycode="VK_LEFT">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn)
|
if (this._editingColumn)
|
||||||
return;
|
return;
|
||||||
|
@ -500,7 +500,7 @@
|
||||||
}
|
}
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_right">
|
<handler event="keypress" keycode="VK_RIGHT">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn)
|
if (this._editingColumn)
|
||||||
return;
|
return;
|
||||||
|
@ -552,7 +552,7 @@
|
||||||
}
|
}
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_up"
|
<handler event="keypress" keycode="VK_UP"
|
||||||
modifiers="accel any">
|
modifiers="accel any">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn)
|
if (this._editingColumn)
|
||||||
|
@ -586,7 +586,7 @@
|
||||||
this.treeBoxObject.ensureRowIsVisible(c);
|
this.treeBoxObject.ensureRowIsVisible(c);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_down"
|
<handler event="keypress" keycode="VK_DOWN"
|
||||||
modifiers="accel any">
|
modifiers="accel any">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn)
|
if (this._editingColumn)
|
||||||
|
@ -620,7 +620,7 @@
|
||||||
this.treeBoxObject.ensureRowIsVisible(c);
|
this.treeBoxObject.ensureRowIsVisible(c);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_up"
|
<handler event="keypress" keycode="VK_UP"
|
||||||
modifiers="accel any, shift">
|
modifiers="accel any, shift">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn || this.view.selection.single)
|
if (this._editingColumn || this.view.selection.single)
|
||||||
|
@ -634,7 +634,7 @@
|
||||||
this.treeBoxObject.ensureRowIsVisible(c - 1);
|
this.treeBoxObject.ensureRowIsVisible(c - 1);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_down"
|
<handler event="keypress" keycode="VK_DOWN"
|
||||||
modifiers="accel any, shift">
|
modifiers="accel any, shift">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn || this.view.selection.single)
|
if (this._editingColumn || this.view.selection.single)
|
||||||
|
@ -648,7 +648,7 @@
|
||||||
this.treeBoxObject.ensureRowIsVisible(c + 1);
|
this.treeBoxObject.ensureRowIsVisible(c + 1);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_page_up"
|
<handler event="keypress" keycode="VK_PAGE_UP"
|
||||||
modifiers="accel any">
|
modifiers="accel any">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn)
|
if (this._editingColumn)
|
||||||
|
@ -674,7 +674,7 @@
|
||||||
this.view.selection.timedSelect(i, this._selectDelay);
|
this.view.selection.timedSelect(i, this._selectDelay);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_page_down"
|
<handler event="keypress" keycode="VK_PAGE_DOWN"
|
||||||
modifiers="accel any">
|
modifiers="accel any">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn)
|
if (this._editingColumn)
|
||||||
|
@ -701,7 +701,7 @@
|
||||||
this.view.selection.timedSelect(i > l ? l : i, this._selectDelay);
|
this.view.selection.timedSelect(i > l ? l : i, this._selectDelay);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_page_up"
|
<handler event="keypress" keycode="VK_PAGE_UP"
|
||||||
modifiers="accel any, shift">
|
modifiers="accel any, shift">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn || this.view.selection.single)
|
if (this._editingColumn || this.view.selection.single)
|
||||||
|
@ -723,7 +723,7 @@
|
||||||
this.view.selection.rangedSelect(-1, i, this._isAccelPressed(event));
|
this.view.selection.rangedSelect(-1, i, this._isAccelPressed(event));
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_page_down"
|
<handler event="keypress" keycode="VK_PAGE_DOWN"
|
||||||
modifiers="accel any, shift">
|
modifiers="accel any, shift">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn || this.view.selection.single)
|
if (this._editingColumn || this.view.selection.single)
|
||||||
|
@ -746,7 +746,7 @@
|
||||||
this.view.selection.rangedSelect(-1, i > l ? l : i, this._isAccelPressed(event));
|
this.view.selection.rangedSelect(-1, i > l ? l : i, this._isAccelPressed(event));
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_home"
|
<handler event="keypress" keycode="VK_HOME"
|
||||||
modifiers="accel any">
|
modifiers="accel any">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn || this.view.rowCount == 0)
|
if (this._editingColumn || this.view.rowCount == 0)
|
||||||
|
@ -760,7 +760,7 @@
|
||||||
this.treeBoxObject.ensureRowIsVisible(0);
|
this.treeBoxObject.ensureRowIsVisible(0);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_end"
|
<handler event="keypress" keycode="VK_END"
|
||||||
modifiers="accel any">
|
modifiers="accel any">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn)
|
if (this._editingColumn)
|
||||||
|
@ -778,7 +778,7 @@
|
||||||
this.treeBoxObject.ensureRowIsVisible(l);
|
this.treeBoxObject.ensureRowIsVisible(l);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_home"
|
<handler event="keypress" keycode="VK_HOME"
|
||||||
modifiers="accel any, shift">
|
modifiers="accel any, shift">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn || this.view.selection.single)
|
if (this._editingColumn || this.view.selection.single)
|
||||||
|
@ -788,7 +788,7 @@
|
||||||
this.treeBoxObject.ensureRowIsVisible(0);
|
this.treeBoxObject.ensureRowIsVisible(0);
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_end"
|
<handler event="keypress" keycode="VK_END"
|
||||||
modifiers="accel any, shift">
|
modifiers="accel any, shift">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
if (this._editingColumn || this.view.selection.single)
|
if (this._editingColumn || this.view.selection.single)
|
||||||
|
|
|
@ -527,17 +527,17 @@
|
||||||
this.selected = event.target;
|
this.selected = event.target;
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="keypress" keycode="vk_enter" action="if (this.selected) this.selected.fireEvent('open');"/>
|
<handler event="keypress" keycode="VK_ENTER" action="if (this.selected) this.selected.fireEvent('open');"/>
|
||||||
<handler event="keypress" keycode="vk_return" action="if (this.selected) this.selected.fireEvent('open');"/>
|
<handler event="keypress" keycode="VK_RETURN" action="if (this.selected) this.selected.fireEvent('open');"/>
|
||||||
<handler event="keypress" keycode="vk_up" action="this.selectionBackward(event);"/>
|
<handler event="keypress" keycode="VK_UP" action="this.selectionBackward(event);"/>
|
||||||
<handler event="keypress" keycode="vk_left" action="this.selectionBackward(event);"/>
|
<handler event="keypress" keycode="VK_LEFT" action="this.selectionBackward(event);"/>
|
||||||
<handler event="keypress" keycode="vk_down" action="this.selectionForward(event);"/>
|
<handler event="keypress" keycode="VK_DOWN" action="this.selectionForward(event);"/>
|
||||||
<handler event="keypress" keycode="vk_right" action="this.selectionForward(event);"/>
|
<handler event="keypress" keycode="VK_RIGHT" action="this.selectionForward(event);"/>
|
||||||
<handler event="keypress" keycode="vk_up" modifiers="meta" action="this.selected = null"/>
|
<handler event="keypress" keycode="VK_UP" modifiers="meta" action="this.selected = null;"/>
|
||||||
<handler event="keypress" keycode="vk_down" modifiers="meta" action="this.selected = null"/>
|
<handler event="keypress" keycode="VK_DOWN" modifiers="meta" action="this.selected = null;"/>
|
||||||
<handler event="keypress" keycode="vk_left" modifiers="meta" action="this.selected = null"/>
|
<handler event="keypress" keycode="VK_LEFT" modifiers="meta" action="this.selected = null;"/>
|
||||||
<handler event="keypress" keycode="vk_right" modifiers="meta" action="this.selected = null"/>
|
<handler event="keypress" keycode="VK_RIGHT" modifiers="meta" action="this.selected = null;"/>
|
||||||
<handler event="keypress" keycode="vk_delete" action="if (this.selected) this.selected.fireEvent('remove');"/>
|
<handler event="keypress" keycode="VK_DELETE" action="if (this.selected) this.selected.fireEvent('remove');"/>
|
||||||
<handler event="keypress" key=" " action="if (this.selected) { this.selected.pauseResume(); }"/>
|
<handler event="keypress" key=" " action="if (this.selected) { this.selected.pauseResume(); }"/>
|
||||||
</handlers>
|
</handlers>
|
||||||
</binding>
|
</binding>
|
||||||
|
|
|
@ -187,17 +187,17 @@
|
||||||
]]>
|
]]>
|
||||||
</handler>
|
</handler>
|
||||||
<handler event="dblclick" action="if (this.selected && event.button == 0) this.selected.fireEvent('open');"/>
|
<handler event="dblclick" action="if (this.selected && event.button == 0) this.selected.fireEvent('open');"/>
|
||||||
<handler event="keypress" keycode="vk_enter" action="if (this.selected) this.selected.fireEvent('open');"/>
|
<handler event="keypress" keycode="VK_ENTER" action="if (this.selected) this.selected.fireEvent('open');"/>
|
||||||
<handler event="keypress" keycode="vk_return" action="if (this.selected) this.selected.fireEvent('open');"/>
|
<handler event="keypress" keycode="VK_RETURN" action="if (this.selected) this.selected.fireEvent('open');"/>
|
||||||
<handler event="keypress" keycode="vk_up" action="this.selectionBackward(event);"/>
|
<handler event="keypress" keycode="VK_UP" action="this.selectionBackward(event);"/>
|
||||||
<handler event="keypress" keycode="vk_left" action="this.selectionBackward(event);"/>
|
<handler event="keypress" keycode="VK_LEFT" action="this.selectionBackward(event);"/>
|
||||||
<handler event="keypress" keycode="vk_down" action="this.selectionForward(event);"/>
|
<handler event="keypress" keycode="VK_DOWN" action="this.selectionForward(event);"/>
|
||||||
<handler event="keypress" keycode="vk_right" action="this.selectionForward(event);"/>
|
<handler event="keypress" keycode="VK_RIGHT" action="this.selectionForward(event);"/>
|
||||||
<handler event="keypress" keycode="vk_up" modifiers="meta" action="this.selected = null"/>
|
<handler event="keypress" keycode="VK_UP" modifiers="meta" action="this.selected = null;"/>
|
||||||
<handler event="keypress" keycode="vk_down" modifiers="meta" action="this.selected = null"/>
|
<handler event="keypress" keycode="VK_DOWN" modifiers="meta" action="this.selected = null;"/>
|
||||||
<handler event="keypress" keycode="vk_left" modifiers="meta" action="this.selected = null"/>
|
<handler event="keypress" keycode="VK_LEFT" modifiers="meta" action="this.selected = null;"/>
|
||||||
<handler event="keypress" keycode="vk_right" modifiers="meta" action="this.selected = null"/>
|
<handler event="keypress" keycode="VK_RIGHT" modifiers="meta" action="this.selected = null;"/>
|
||||||
<handler event="keypress" keycode="vk_delete" action="if (this.selected) this.selected.fireEvent('remove');"/>
|
<handler event="keypress" keycode="VK_DELETE" action="if (this.selected) this.selected.fireEvent('remove');"/>
|
||||||
</handlers>
|
</handlers>
|
||||||
</binding>
|
</binding>
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче