42885: Move browser and editor XUL bindings out of global (i.e.
widget-toolkit) and into communicator (i.e. core). Also remove the obsolete files platformInputBindings.xul and platformTextAreaBindings.xul: text controls use XBL bindings now, and the XUL bindings are no longer used. r=ben,saari git-svn-id: svn://10.0.0.236/trunk@74402 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
08857bf0bd
commit
3ef413d57d
@ -6,3 +6,5 @@ taskbarOverlay.xul
|
||||
tasksOverlay.js
|
||||
tasksOverlay.xul
|
||||
dialogBindings.xml
|
||||
browserBindings.xul
|
||||
editorBindings.xul
|
||||
|
||||
@ -44,6 +44,8 @@ CHROME_CONTENT = \
|
||||
tasksOverlay.js \
|
||||
tasksOverlay.xul \
|
||||
dialogBindings.xml \
|
||||
browserBindings.xul \
|
||||
editorBindings.xul \
|
||||
$(NULL)
|
||||
|
||||
DIRS = unix
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xul-overlay href="chrome://global/content/platformGlobalOverlay.xul"?>
|
||||
|
||||
<window id="browserBindings"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<keyset id="browserKeySet">
|
||||
<key id="key_page_up" keycode="VK_PAGE_UP" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollPageUp');
|
||||
controller.doCommand('cmd_scrollPageUp');"/>
|
||||
<key id="key_page_down" keycode="VK_PAGE_DOWN" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
|
||||
controller.doCommand('cmd_scrollPageDown');"/>
|
||||
<key id="space" key=" " shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var v = document.commandDispatcher.focusedElement;
|
||||
|
||||
if (v && (v.localName == 'INPUT' || v.localName == 'TEXTAREA')) {
|
||||
return true;
|
||||
}
|
||||
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
|
||||
controller.doCommand('cmd_scrollPageDown');
|
||||
"/>
|
||||
|
||||
<key id="key_page_up" keycode="VK_UP" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollLineUp');
|
||||
controller.doCommand('cmd_scrollLineUp');"/>
|
||||
<key id="key_page_down" keycode="VK_DOWN" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollLineDown');
|
||||
controller.doCommand('cmd_scrollLineDown');"/>
|
||||
<key id="key_left" keycode="VK_LEFT" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollLeft');
|
||||
controller.doCommand('cmd_scrollLeft');"/>
|
||||
<key id="key_right" keycode="VK_RIGHT" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollRight');
|
||||
controller.doCommand('cmd_scrollRight');"/>
|
||||
</keyset>
|
||||
</window>
|
||||
112
mozilla/xpfe/communicator/resources/content/editorBindings.xul
Normal file
112
mozilla/xpfe/communicator/resources/content/editorBindings.xul
Normal file
@ -0,0 +1,112 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<window id="editorBindings"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<keyset id="editorKeySet">
|
||||
<key id="key_home" keycode="VK_HOME" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_beginLine');
|
||||
controller.doCommand('cmd_beginLine');"/>
|
||||
<key id="key_end" keycode="VK_END" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_endLine');
|
||||
controller.doCommand('cmd_endLine');"/>
|
||||
<key id="key_left" keycode="VK_LEFT" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_charPrevious');
|
||||
controller.doCommand('cmd_charPrevious');"/>
|
||||
<key id="key_right" keycode="VK_RIGHT" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_charNext');
|
||||
controller.doCommand('cmd_charNext');"/>
|
||||
<key id="key_homeshift" keycode="VK_HOME" shift="true" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_selectBeginLine');
|
||||
controller.doCommand('cmd_selectBeginLine');"/>
|
||||
<key id="key_endshift" keycode="VK_END" shift="true" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_selectEndLine');
|
||||
controller.doCommand('cmd_selectEndLine');"/>
|
||||
<key id="key_leftshift" keycode="VK_LEFT" shift="true" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_selectCharPrevious');
|
||||
controller.doCommand('cmd_selectCharPrevious');"/>
|
||||
<key id="key_rightshift" keycode="VK_RIGHT" shift="true" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_selectCharNext');
|
||||
controller.doCommand('cmd_selectCharNext');"/>
|
||||
<key id="key_pageup" keycode="VK_PAGE_UP" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollPageUp');
|
||||
controller.doCommand('cmd_scrollPageUp');"/>
|
||||
<key id="key_pagedown" keycode="VK_PAGE_DOWN" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
|
||||
controller.doCommand('cmd_scrollPageDown');"/>
|
||||
<key id="key_left" keycode="VK_UP" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_linePrevious');
|
||||
controller.doCommand('cmd_linePrevious');"/>
|
||||
<key id="key_right" keycode="VK_DOWN" shift="false" control="false" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_lineNext');
|
||||
controller.doCommand('cmd_lineNext');"/>
|
||||
<key id="key_left_shift" keycode="VK_UP" shift="true" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_selectLinePrevious');
|
||||
controller.doCommand('cmd_selectLinePrevious');"/>
|
||||
<key id="key_right_shift" keycode="VK_DOWN" shift="true" alt="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_selectLineNext');
|
||||
controller.doCommand('cmd_selectLineNext');"/>
|
||||
<key id="key_undo" key="z" xulkey="true" shift="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_undo');
|
||||
controller.doCommand('cmd_undo');"/>
|
||||
<key id="key_redo" key="y" xulkey="true" shift="false"
|
||||
onkeypress="
|
||||
var controller =
|
||||
document.commandDispatcher.getControllerForCommand('cmd_redo');
|
||||
controller.doCommand('cmd_redo');"/>
|
||||
<key id="key_space" key=" " cancel="true"/>
|
||||
|
||||
<!-- cut, copy, paste, undo and redo keys -->
|
||||
<key id="emCutKey" key="x" control="true" shift="false"
|
||||
onkeypress="
|
||||
var controller = document.commandDispatcher.getControllerForCommand('cmd_cut');
|
||||
controller.doCommand('cmd_cut');"/>
|
||||
<key id="emCopyKey" key="c" xulkey="true" shift="false"
|
||||
onkeypress="
|
||||
var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
|
||||
controller.doCommand('cmd_copy');"/>
|
||||
<key id="emPasteKey" key="v" xulkey="true" shift="false"
|
||||
onkeypress="
|
||||
var controller = document.commandDispatcher.getControllerForCommand('cmd_paste');
|
||||
controller.doCommand('cmd_paste');"/>
|
||||
<key id="emUndoKey" key="z" xulkey="true" shift="false"
|
||||
onkeypress="
|
||||
var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');
|
||||
controller.doCommand('cmd_undo');"/>
|
||||
<key id="emRedoKey" key="r" xulkey="true" shift="false"
|
||||
onkeypress="
|
||||
var controller = document.commandDispatcher.getControllerForCommand('cmd_redo');
|
||||
controller.doCommand('cmd_redo');"/>
|
||||
|
||||
</keyset>
|
||||
</window>
|
||||
@ -41,6 +41,8 @@ CHROME_CONTENT = \
|
||||
.\tasksOverlay.js \
|
||||
.\tasksOverlay.xul \
|
||||
.\dialogBindings.xml \
|
||||
.\browserBindings.xul \
|
||||
.\editorBindings.xul \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
@ -1,7 +1,3 @@
|
||||
browserBindings.xul
|
||||
editorBindings.xul
|
||||
inputBindings.xul
|
||||
textAreaBindings.xul
|
||||
hiddenWindow.xul
|
||||
globalOverlay.xul
|
||||
globalOverlay.js
|
||||
|
||||
@ -43,10 +43,6 @@ CHROME_MISC= \
|
||||
|
||||
CHROME_CONTENT= \
|
||||
manifest.rdf \
|
||||
browserBindings.xul \
|
||||
editorBindings.xul \
|
||||
inputBindings.xul \
|
||||
textAreaBindings.xul \
|
||||
hiddenWindow.xul \
|
||||
globalOverlay.xul \
|
||||
globalOverlay.js \
|
||||
|
||||
@ -1,7 +1,3 @@
|
||||
platformDialogOverlay.xul
|
||||
platformGlobalOverlay.xul
|
||||
platformBrowserBindings.xul
|
||||
platformInputBindings.xul
|
||||
platformTextAreaBindings.xul
|
||||
platformEditorBindings.xul
|
||||
platformHTMLBindings.xml
|
||||
|
||||
@ -34,10 +34,6 @@ CHROME_MISC= \
|
||||
$(NULL)
|
||||
|
||||
CHROME_CONTENT= \
|
||||
.\browserBindings.xul \
|
||||
.\editorBindings.xul \
|
||||
.\inputBindings.xul \
|
||||
.\textAreaBindings.xul \
|
||||
.\hiddenWindow.xul \
|
||||
.\globalOverlay.xul \
|
||||
.\globalOverlay.js \
|
||||
|
||||
@ -32,11 +32,6 @@ CHROME_CONTENT_DIR = global/content
|
||||
CHROME_CONTENT = \
|
||||
platformGlobalOverlay.xul \
|
||||
platformDialogOverlay.xul \
|
||||
platformInputBindings.xul \
|
||||
platformBrowserBindings.xul \
|
||||
platformInputBindings.xul \
|
||||
platformEditorBindings.xul \
|
||||
platformTextAreaBindings.xul \
|
||||
platformHTMLBindings.xml \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -32,11 +32,6 @@ CHROME_CONTENT_DIR = global/content
|
||||
CHROME_CONTENT = \
|
||||
platformGlobalOverlay.xul \
|
||||
platformDialogOverlay.xul \
|
||||
platformInputBindings.xul \
|
||||
platformBrowserBindings.xul \
|
||||
platformInputBindings.xul \
|
||||
platformEditorBindings.xul \
|
||||
platformTextAreaBindings.xul \
|
||||
platformHTMLBindings.xml \
|
||||
printdialog.xul \
|
||||
printdialog.js \
|
||||
|
||||
@ -27,10 +27,6 @@ CHROME_CONTENT_DIR = global\content
|
||||
CHROME_CONTENT = \
|
||||
.\platformGlobalOverlay.xul \
|
||||
.\platformDialogOverlay.xul \
|
||||
.\platformBrowserBindings.xul \
|
||||
.\platformInputBindings.xul \
|
||||
.\platformTextAreaBindings.xul \
|
||||
.\platformEditorBindings.xul \
|
||||
.\platformHTMLBindings.xml \
|
||||
$(NULL)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user