Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 329642 Remove global delete listener to make cancel dialog always work, r=mvl

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@200323 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jminta%gmail.com
2006-06-19 17:04:01 +00:00
parent fc69ca53af
commit d69b65433b
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/calendar/resources/content/calendar.xul
View File

@@ -165,7 +165,6 @@
<key id="key_cut" key="&calendar.cut.key;" observes="cut_command" modifiers="accel"/>
<key id="key_copy" key="&calendar.copy.key;" observes="copy_command" modifiers="accel"/>
<key id="key_paste" key="&calendar.paste.key;" observes="paste_command" modifiers="accel"/>
<key id="delete_key" keycode="VK_DELETE" observes="delete_command_no_confirm"/>
<key id="key_selectAll" key="&calendar.selectall.key;" observes="select_all_command" modifiers="accel"/>
# calendar.xpi adds shift as an accelerator to these 4 keys so we don't conflict with Seamonkey
@@ -675,6 +674,7 @@
</hbox>
<tree id="unifinder-search-results-listbox" flex="1"
onselect="unifinderOnSelect( event )"
onkeypress="unifinderKeyPress(event)"
enableColumnDrag="true">
<treecols id="unifinder-search-results-tree-cols">
<treecol id="unifinder-search-results-tree-col-title"

13
mozilla/calendar/resources/content/unifinder.js
View File

@@ -833,3 +833,16 @@ function focusFirstItemIfNoSelection()
}
}
function unifinderKeyPress(aEvent) {
const kKE = Components.interfaces.nsIDOMKeyEvent;
switch (aEvent.keyCode) {
case 13:
// Enter, edit the event
editEvent();
break;
case kKE.DOM_VK_BACK_SPACE:
case kKE.DOM_VK_DELETE:
deleteEventCommand(true);
break;
}
}

1
mozilla/calendar/sunbird/base/content/calendar-sets.inc
View File

@@ -141,7 +141,6 @@
<key id="key_cut" key="&calendar.cut.key;" observes="cut_command" modifiers="accel"/>
<key id="key_copy" key="&calendar.copy.key;" observes="copy_command" modifiers="accel"/>
<key id="key_paste" key="&calendar.paste.key;" observes="paste_command" modifiers="accel"/>
<key id="delete_key" keycode="VK_DELETE" observes="delete_command_no_confirm"/>
<key id="key_selectAll" key="&calendar.selectall.key;" observes="select_all_command" modifiers="accel"/>
<key id="view_day_key" key="&calendar.dayView.key;" observes="day_view_command" modifiers="accel"/>

1
mozilla/calendar/sunbird/base/content/calendar.xul
View File

@@ -601,6 +601,7 @@
</hbox>
<tree id="unifinder-search-results-listbox" flex="1"
onselect="unifinderOnSelect( event )"
onkeypress="unifinderKeyPress(event)"
enableColumnDrag="true">
<treecols id="unifinder-search-results-tree-cols">
<treecol id="unifinder-search-results-tree-col-title"