Skip to content

Commit f095d4b

Browse files
committed
Merge remote-tracking branch 'pjboy/master'
2 parents 1d453b9 + 6b33dc9 commit f095d4b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

gadgets/standard_revisions.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ $(function() {
15551555

15561556
var disp_desc = [];
15571557
var prev_nums = nums;
1558-
var prev_revs = [ Rev.DIFF ];
1558+
var prev_visibe = new VisibilityMap([Rev.DIFF]);
15591559

15601560
for (var rev = Rev.FIRST; rev !== Rev.LAST; ++rev) {
15611561
var target_nums = [];
@@ -1575,14 +1575,14 @@ $(function() {
15751575
}
15761576

15771577
if (array_equal(target_nums, prev_nums)) {
1578-
prev_revs.push(rev);
1578+
prev_visibe.add(rev);
15791579
} else {
1580-
disp_desc.push({ revs: prev_revs, nums: prev_nums });
1581-
prev_revs = [rev];
1580+
disp_desc.push({ visible: prev_visibe, nums: prev_nums });
1581+
prev_visibe = new VisibilityMap([rev]);
15821582
prev_nums = target_nums;
15831583
}
15841584
}
1585-
disp_desc.push({ revs: prev_revs, nums: prev_nums });
1585+
disp_desc.push({ visible: prev_visibe, nums: prev_nums });
15861586
// hide entire t-liX element if needed
15871587
if (!visible.is_visible_on_all()) {
15881588
this.tracker.add_diff_object(descs[i].obj, visible);
@@ -1591,7 +1591,7 @@ $(function() {
15911591
// Add t-li elements with different text if needed
15921592
// the first item always includes Rev.DIFF in .revs
15931593
if (disp_desc.length > 1) {
1594-
this.tracker.add_diff_object(descs[i].obj_num, disp_desc[0].revs);
1594+
this.tracker.add_diff_object(descs[i].obj_num, disp_desc[0].visible);
15951595
for (var j = 1; j < disp_desc.length; ++j) {
15961596
var new_el = descs[i].obj_num.clone().hide()
15971597
.insertAfter(descs[i].obj_num);
@@ -1601,7 +1601,7 @@ $(function() {
16011601
text = text + ',' + disp_desc[j].nums[k].toString();
16021602
}
16031603
new_el.text(text + ')');
1604-
this.tracker.add_object(new_el, descs[i].obj_num, disp_desc[j].revs);
1604+
this.tracker.add_object(new_el, descs[i].obj_num, disp_desc[j].visible);
16051605
}
16061606
}
16071607
}

0 commit comments

Comments
 (0)