Skip to content

Commit 225f702

Browse files
committed
Create entry for first commit, clearer loop break condition, remove commented code blocks
1 parent b3d984c commit 225f702

File tree

2 files changed

+32
-44
lines changed

2 files changed

+32
-44
lines changed

git-webui/release/share/git-webui/webui/js/git-webui.js

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ webui.SideBarView = function(mainView, noEventHandlers) {
290290
'</div>' +
291291
'</div>' +
292292
'</div>')[0];
293-
// self.element.appendChild(popup);
294293
return popup;
295294
};
296295

@@ -343,7 +342,6 @@ webui.SideBarView = function(mainView, noEventHandlers) {
343342

344343
if (ref[0] == "*") {
345344
$(button).addClass("branch-current");
346-
// self.selectRef(refname);
347345
}
348346
} else {
349347
var refname = ref.replaceAll('/', '-');
@@ -787,26 +785,25 @@ webui.LogView = function(historyView) {
787785
self.nextRef = undefined;
788786
while (true) {
789787
var end = data.indexOf("\ncommit ", start);
790-
if (end != -1) {
791-
var len = end - start;
792-
} else {
793-
var len = undefined;
794-
}
795-
var entry = new Entry(self, data.substring(start, start+len));
796-
if (len!=undefined) {
797-
content.appendChild(entry.element);
798-
if (!self.lineHeight) {
799-
self.lineHeight = Math.ceil($(entry.element).outerHeight() / 2) * 2;
800-
}
801-
entry.element.setAttribute("style", "height:" + self.lineHeight + "px");
802-
if (!currentSelection) {
803-
entry.select();
788+
if(end == -1){
789+
if(start>=data.length) {
790+
break
804791
}
805-
} else if (count >= maxCount) {
792+
var end = data.length;
793+
}
794+
795+
var entry = new Entry(self, data.substring(start, end));
796+
content.appendChild(entry.element);
797+
if (!self.lineHeight) {
798+
self.lineHeight = Math.ceil($(entry.element).outerHeight() / 2) * 2;
799+
}
800+
entry.element.setAttribute("style", "height:" + self.lineHeight + "px");
801+
if (!currentSelection) {
802+
entry.select();
803+
}
804+
if (count >= maxCount) {
806805
self.nextRef = entry.commit;
807806
break;
808-
} else {
809-
break;
810807
}
811808
start = end + 1;
812809
++count;
@@ -1169,9 +1166,6 @@ webui.StashListView = function(stashView) {
11691166
var svg = self.element.children[0];
11701167
var content = self.element.children[1];
11711168
var currentSelection = null;
1172-
// var lineHeight = null;
1173-
// var streams = [];
1174-
// var streamColor = 0;
11751169
self.stashView = stashView
11761170
}
11771171

git-webui/src/share/git-webui/webui/js/git-webui.js

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ webui.SideBarView = function(mainView, noEventHandlers) {
290290
'</div>' +
291291
'</div>' +
292292
'</div>')[0];
293-
// self.element.appendChild(popup);
294293
return popup;
295294
};
296295

@@ -343,7 +342,6 @@ webui.SideBarView = function(mainView, noEventHandlers) {
343342

344343
if (ref[0] == "*") {
345344
$(button).addClass("branch-current");
346-
// self.selectRef(refname);
347345
}
348346
} else {
349347
var refname = ref.replaceAll('/', '-');
@@ -787,26 +785,25 @@ webui.LogView = function(historyView) {
787785
self.nextRef = undefined;
788786
while (true) {
789787
var end = data.indexOf("\ncommit ", start);
790-
if (end != -1) {
791-
var len = end - start;
792-
} else {
793-
var len = undefined;
794-
}
795-
var entry = new Entry(self, data.substring(start, start+len));
796-
if (len!=undefined) {
797-
content.appendChild(entry.element);
798-
if (!self.lineHeight) {
799-
self.lineHeight = Math.ceil($(entry.element).outerHeight() / 2) * 2;
800-
}
801-
entry.element.setAttribute("style", "height:" + self.lineHeight + "px");
802-
if (!currentSelection) {
803-
entry.select();
788+
if(end == -1){
789+
if(start>=data.length) {
790+
break
804791
}
805-
} else if (count >= maxCount) {
792+
var end = data.length;
793+
}
794+
795+
var entry = new Entry(self, data.substring(start, end));
796+
content.appendChild(entry.element);
797+
if (!self.lineHeight) {
798+
self.lineHeight = Math.ceil($(entry.element).outerHeight() / 2) * 2;
799+
}
800+
entry.element.setAttribute("style", "height:" + self.lineHeight + "px");
801+
if (!currentSelection) {
802+
entry.select();
803+
}
804+
if (count >= maxCount) {
806805
self.nextRef = entry.commit;
807806
break;
808-
} else {
809-
break;
810807
}
811808
start = end + 1;
812809
++count;
@@ -1169,9 +1166,6 @@ webui.StashListView = function(stashView) {
11691166
var svg = self.element.children[0];
11701167
var content = self.element.children[1];
11711168
var currentSelection = null;
1172-
// var lineHeight = null;
1173-
// var streams = [];
1174-
// var streamColor = 0;
11751169
self.stashView = stashView
11761170
}
11771171

0 commit comments

Comments
 (0)