зеркало из https://github.com/mozilla/pjs.git
Remove selectionHead and selectionTail from key handlers because rangedSelect can already do the work for us (mouse handlers were already using it) b=97434 r=varga sr=alecf
This commit is contained in:
neil%parkwaycc.co.uk
Родитель
fba485be1c
Коммит
7b6e84b250
|
|
@ -86,12 +86,6 @@
|
|||
<field name="pageUpOrDownMovesSelection">
|
||||
true
|
||||
</field>
|
||||
<field name="selectionHead">
|
||||
-1
|
||||
</field>
|
||||
<field name="selectionTail">
|
||||
-1
|
||||
</field>
|
||||
<property name="enableColumnDrag"
|
||||
onget="return this.hasAttribute('enableColumnDrag');"
|
||||
onset="if (val) this.setAttribute('enableColumnDrag', 'true');
|
||||
|
|
@ -283,8 +277,6 @@
|
|||
var c = this.currentIndex;
|
||||
if (c == -1 || c == 0)
|
||||
return;
|
||||
this.selectionHead = -1;
|
||||
this.selectionTail = -1;
|
||||
this.view.selection.timedSelect(c-1, this._selectDelay);
|
||||
this.treeBoxObject.ensureRowIsVisible(c-1);
|
||||
]]>
|
||||
|
|
@ -295,8 +287,6 @@
|
|||
try { if (c+1 == this.treeBoxObject.view.rowCount)
|
||||
return;
|
||||
} catch (e) {}
|
||||
this.selectionHead = -1;
|
||||
this.selectionTail = -1;
|
||||
this.view.selection.timedSelect(c+1, this._selectDelay);
|
||||
this.treeBoxObject.ensureRowIsVisible(c+1);
|
||||
]]>
|
||||
|
|
@ -308,21 +298,8 @@
|
|||
var c = this.currentIndex;
|
||||
if (c == -1 || c == 0)
|
||||
return;
|
||||
if (c == this.selectionTail) {
|
||||
if (this.selectionHead < this.selectionTail) {
|
||||
this.view.selection.toggleSelect(c);
|
||||
this.currentIndex = c - 1;
|
||||
}
|
||||
else {
|
||||
this.view.selection.toggleSelect(c - 1);
|
||||
}
|
||||
}
|
||||
else {
|
||||
this.view.selection.clearSelection();
|
||||
this.selectionHead = c;
|
||||
this.view.selection.rangedSelect(c, c - 1, true);
|
||||
}
|
||||
this.selectionTail = c - 1;
|
||||
// Extend the selection from the existing pivot, if any
|
||||
this.view.selection.rangedSelect(-1, c - 1, false);
|
||||
this.treeBoxObject.ensureRowIsVisible(c - 1);
|
||||
]]>
|
||||
</handler>
|
||||
|
|
@ -334,21 +311,8 @@
|
|||
try { if (c+1 == this.treeBoxObject.view.rowCount)
|
||||
return;
|
||||
} catch (e) {}
|
||||
if (c == this.selectionTail) {
|
||||
if (this.selectionHead > this.selectionTail) {
|
||||
this.view.selection.toggleSelect(c);
|
||||
this.currentIndex = c + 1;
|
||||
}
|
||||
else
|
||||
this.view.selection.toggleSelect(c + 1);
|
||||
}
|
||||
else {
|
||||
this.view.selection.clearSelection();
|
||||
this.selectionHead = c;
|
||||
this.view.selection.rangedSelect(c, c + 1, true);
|
||||
}
|
||||
this.selectionTail = c + 1;
|
||||
this.treeBoxObject.ensureRowIsVisible(c + 1);
|
||||
// Extend the selection from the existing pivot, if any
|
||||
this.view.selection.rangedSelect(-1, c + 1, false);
|
||||
]]>
|
||||
</handler>
|
||||
<handler event="keypress" keycode="vk_up" modifiers="control">
|
||||
|
|
@ -379,8 +343,6 @@
|
|||
var c = this.currentIndex;
|
||||
if (c == 0)
|
||||
return;
|
||||
this.selectionHead = -1;
|
||||
this.selectionTail = -1;
|
||||
var f = this.treeBoxObject.getFirstVisibleRow();
|
||||
var i = 0;
|
||||
if (f > 0) {
|
||||
|
|
@ -404,8 +366,6 @@
|
|||
var l = this.treeBoxObject.view.rowCount - 1;
|
||||
if (c == l)
|
||||
return;
|
||||
this.selectionHead = -1;
|
||||
this.selectionTail = -1;
|
||||
var f = this.treeBoxObject.getFirstVisibleRow();
|
||||
var p = this.treeBoxObject.getPageLength();
|
||||
var i = l;
|
||||
|
|
@ -437,26 +397,8 @@
|
|||
i = c - f;
|
||||
this.treeBoxObject.scrollByPages(-1);
|
||||
}
|
||||
if (c == this.selectionTail) {
|
||||
if (this.selectionHead < this.selectionTail) {
|
||||
if (i < this.selectionHead) {
|
||||
this.view.selection.clearRange(c, this.selectionHead + 1);
|
||||
this.view.selection.rangedSelect(this.selectionHead - 1, i, true);
|
||||
}
|
||||
else {
|
||||
this.view.selection.clearRange(c, i + 1);
|
||||
this.currentIndex = i;
|
||||
}
|
||||
}
|
||||
else
|
||||
this.view.selection.rangedSelect(c - 1, i, true);
|
||||
}
|
||||
else {
|
||||
this.view.selection.clearSelection();
|
||||
this.selectionHead = c;
|
||||
this.view.selection.rangedSelect(c, i, true);
|
||||
}
|
||||
this.selectionTail = i;
|
||||
// Extend the selection from the existing pivot, if any
|
||||
this.view.selection.rangedSelect(-1, i, false);
|
||||
]]>
|
||||
</handler>
|
||||
<handler event="keypress" keycode="vk_page_down" modifiers="shift">
|
||||
|
|
@ -478,26 +420,8 @@
|
|||
i = lastTopRowIndex + c - f + 1;
|
||||
this.treeBoxObject.scrollByPages(1);
|
||||
}
|
||||
if (c == this.selectionTail) {
|
||||
if (this.selectionHead > this.selectionTail) {
|
||||
if (i > this.selectionHead) {
|
||||
this.view.selection.clearRange(c, this.selectionHead - 1);
|
||||
this.view.selection.rangedSelect(this.selectionHead + 1, i, true);
|
||||
}
|
||||
else {
|
||||
this.view.selection.clearRange(c, i - 1);
|
||||
this.currentIndex = i;
|
||||
}
|
||||
}
|
||||
else
|
||||
this.view.selection.rangedSelect(c + 1, i, true);
|
||||
}
|
||||
else {
|
||||
this.view.selection.clearSelection();
|
||||
this.selectionHead = c;
|
||||
this.view.selection.rangedSelect(c, i, true);
|
||||
}
|
||||
this.selectionTail = i;
|
||||
// Extend the selection from the existing pivot, if any
|
||||
this.view.selection.rangedSelect(-1, i, false);
|
||||
]]>
|
||||
</handler>
|
||||
<handler event="keypress" keycode="vk_page_up" modifiers="control">
|
||||
|
|
@ -540,22 +464,14 @@
|
|||
</handler>
|
||||
<handler event="keypress" keycode="vk_home">
|
||||
<![CDATA[
|
||||
if (this.currentIndex == 0)
|
||||
return;
|
||||
this.selectionHead = -1;
|
||||
this.selectionTail = -1;
|
||||
this.view.selection.select(0);
|
||||
this.view.selection.timedSelect(0, this._selectDelay);
|
||||
this.treeBoxObject.ensureRowIsVisible(0);
|
||||
]]>
|
||||
</handler>
|
||||
<handler event="keypress" keycode="vk_end">
|
||||
<![CDATA[
|
||||
var l = this.treeBoxObject.view.rowCount - 1;
|
||||
if (this.currentIndex == l)
|
||||
return;
|
||||
this.selectionHead = -1;
|
||||
this.selectionTail = -1;
|
||||
this.view.selection.select(l);
|
||||
this.view.selection.timedSelect(l, this._selectDelay);
|
||||
this.treeBoxObject.ensureRowIsVisible(l);
|
||||
]]>
|
||||
</handler>
|
||||
|
|
@ -563,15 +479,8 @@
|
|||
<![CDATA[
|
||||
if (this.view.selection.single)
|
||||
return;
|
||||
var c = this.currentIndex;
|
||||
if (c == 0)
|
||||
return;
|
||||
if (c != this.selectionTail) {
|
||||
this.view.selection.clearSelection();
|
||||
this.selectionHead = c;
|
||||
}
|
||||
this.view.selection.rangedSelect(c, 0, true);
|
||||
this.selectionTail = 0;
|
||||
// Extend the selection from the existing pivot, if any
|
||||
this.view.selection.rangedSelect(-1, 0, false);
|
||||
this.treeBoxObject.ensureRowIsVisible(0);
|
||||
]]>
|
||||
</handler>
|
||||
|
|
@ -579,23 +488,14 @@
|
|||
<![CDATA[
|
||||
if (this.view.selection.single)
|
||||
return;
|
||||
var c = this.currentIndex;
|
||||
var l = this.treeBoxObject.view.rowCount - 1;
|
||||
if (c == l)
|
||||
return;
|
||||
if (c != this.selectionTail) {
|
||||
this.view.selection.clearSelection();
|
||||
this.selectionHead = c;
|
||||
}
|
||||
this.view.selection.rangedSelect(c, l, true);
|
||||
this.selectionTail = l;
|
||||
// Extend the selection from the existing pivot, if any
|
||||
this.view.selection.rangedSelect(-1, l, false);
|
||||
this.treeBoxObject.ensureRowIsVisible(l);
|
||||
]]>
|
||||
</handler>
|
||||
<handler event="keypress" keycode="vk_home" modifiers="control">
|
||||
<![CDATA[
|
||||
if (this.currentIndex == 0)
|
||||
return;
|
||||
this.currentIndex = 0;
|
||||
this.treeBoxObject.ensureRowIsVisible(0);
|
||||
]]>
|
||||
|
|
@ -603,8 +503,6 @@
|
|||
<handler event="keypress" keycode="vk_end" modifiers="control">
|
||||
<![CDATA[
|
||||
var l = this.treeBoxObject.view.rowCount - 1;
|
||||
if (this.currentIndex == l)
|
||||
return;
|
||||
this.currentIndex = l;
|
||||
this.treeBoxObject.ensureRowIsVisible(l);
|
||||
]]>
|
||||
|
|
@ -652,8 +550,6 @@
|
|||
var cellText = this.view.getCellText(l, keyCol);
|
||||
cellText = cellText.substring(0, length).toLowerCase();
|
||||
if (cellText == incrementalString) {
|
||||
this.selectionHead = -1;
|
||||
this.selectionTail = -1;
|
||||
this.view.selection.timedSelect(l, this._selectDelay);
|
||||
this.treeBoxObject.ensureRowIsVisible(l);
|
||||
break;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче