mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 953904 - Unread status doesn't disappear when the tabbar-tab (instead of the content of the tab) had the focus when the selected tab changed, r=florian.

This commit is contained in:
aleth 2012-07-14 15:57:50 +02:00
Родитель 7e01319f88
Коммит dc6fd7c994
2 изменённых файлов: 64 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
im/content/conversation.xml
Просмотреть файл

@ -1220,10 +1220,9 @@
</body>
</method>
<method name="focus">
<method name="onSelect">
<body>
<![CDATA[
this.editor.focus();
this.displayStatusText();
if (!this.loaded)
return;
@ -1235,6 +1234,15 @@
</body>
</method>
<method name="focus">
<body>
<![CDATA[
this.editor.focus();
this.onSelect();
]]>
</body>
</method>
<method name="hasLogs">
<body>
<![CDATA[

56
im/content/tabbrowser.xml
Просмотреть файл

@ -81,7 +81,8 @@
onclosetab="var node = this.parentNode;
while (node.localName != 'tabbrowser')
node = node.parentNode;
node.removeCurrentTab();">
node.removeCurrentTab();"
onkeypress="this.parentNode.parentNode.parentNode.onTabKeypress(event);">
<xul:tab selected="true" validate="never"
onerror="this.removeAttribute('image');"
maxwidth="250" width="0" minwidth="100" flex="100"
@ -240,14 +241,65 @@
!focusedElement.collapsed) {
// The focus is on a tab in the same tab panel and we are not
// closing that tab: focus the new tab, not the conversation.
return; // If focus was on a tab, switching tabs focuses the new tab
// Nevertheless update the visible conversation, but only if
// the user stays on the tab for more than a moment, to prevent
// tabs from being marked as read if the user is just scrolling
// past them with the arrow keys. 400ms is between "200ms - a bit
// too quick for people who repeat-keypress more slowly than me"
// and "600ms - a bit too noticeable already".
if (this._tabSelectTimer)
clearTimeout(this._tabSelectTimer);
this._tabSelectTimer = setTimeout(function() {
this.mCurrentConversation.onSelect();
}.bind(this), 400);
return;
}
delete this._tabSelectTimer;
this.mCurrentConversation.focus();
]]>
</body>
</method>
<method name="onTabKeypress">
<parameter name="event"/>
<body>
<![CDATA[
const tabKeyCodes = [KeyEvent.DOM_VK_TAB,
KeyEvent.DOM_VK_HOME, KeyEvent.DOM_VK_END,
KeyEvent.DOM_VK_UP, KeyEvent.DOM_VK_DOWN,
KeyEvent.DOM_VK_LEFT, KeyEvent.DOM_VK_RIGHT];
if (tabKeyCodes.indexOf(event.keyCode) != -1)
return;
// Focus the editbox and pass the key to it.
event.preventDefault();
event.stopPropagation();
this.mCurrentConversation.editor.focus();
const masks = Components.interfaces.nsIDOMNSEvent;
var modifiers = 0;
if (event.shiftKey)
modifiers |= masks.SHIFT_MASK;
if (event.ctrlKey)
modifiers |= masks.CONTROL_MASK;
if (event.altKey)
modifiers |= masks.ALT_MASK;
if (event.metaKey)
modifiers |= masks.META_MASK;
if (event.accelKey)
modifiers |= (navigator.platform.indexOf("Mac") >= 0) ? masks.META_MASK
: masks.CONTROL_MASK;
// Can't use dispatchEvent to the textbox as these refuse untrusted key events.
this.mCurrentConversation.ownerDocument.defaultView
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIDOMWindowUtils)
.sendKeyEvent(event.type, event.keyCode, event.charCode, modifiers);
]]>
</body>
</method>
<method name="onTabClick">
<parameter name="event"/>
<body>