Skip to content

Create entry for first commit, clearer loop break condition, remove commented code blocks #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2022
Merged

Create entry for first commit, clearer loop break condition, remove commented code blocks #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions git-webui/release/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ webui.SideBarView = function(mainView, noEventHandlers) {
'</div>' +
'</div>' +
'</div>')[0];
// self.element.appendChild(popup);
return popup;
};

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

if (ref[0] == "*") {
$(button).addClass("branch-current");
// self.selectRef(refname);
}
} else {
var refname = ref.replaceAll('/', '-');
Expand Down Expand Up @@ -787,26 +785,25 @@ webui.LogView = function(historyView) {
self.nextRef = undefined;
while (true) {
var end = data.indexOf("\ncommit ", start);
if (end != -1) {
var len = end - start;
} else {
var len = undefined;
}
var entry = new Entry(self, data.substring(start, start+len));
if (len!=undefined) {
content.appendChild(entry.element);
if (!self.lineHeight) {
self.lineHeight = Math.ceil($(entry.element).outerHeight() / 2) * 2;
}
entry.element.setAttribute("style", "height:" + self.lineHeight + "px");
if (!currentSelection) {
entry.select();
if(end == -1){
if(start>=data.length) {
break
}
} else if (count >= maxCount) {
var end = data.length;
}

var entry = new Entry(self, data.substring(start, end));
content.appendChild(entry.element);
if (!self.lineHeight) {
self.lineHeight = Math.ceil($(entry.element).outerHeight() / 2) * 2;
}
entry.element.setAttribute("style", "height:" + self.lineHeight + "px");
if (!currentSelection) {
entry.select();
}
if (count >= maxCount) {
self.nextRef = entry.commit;
break;
} else {
break;
}
start = end + 1;
++count;
Expand Down Expand Up @@ -1169,9 +1166,6 @@ webui.StashListView = function(stashView) {
var svg = self.element.children[0];
var content = self.element.children[1];
var currentSelection = null;
// var lineHeight = null;
// var streams = [];
// var streamColor = 0;
self.stashView = stashView
}

Expand Down
38 changes: 16 additions & 22 deletions git-webui/src/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ webui.SideBarView = function(mainView, noEventHandlers) {
'</div>' +
'</div>' +
'</div>')[0];
// self.element.appendChild(popup);
return popup;
};

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

if (ref[0] == "*") {
$(button).addClass("branch-current");
// self.selectRef(refname);
}
} else {
var refname = ref.replaceAll('/', '-');
Expand Down Expand Up @@ -787,26 +785,25 @@ webui.LogView = function(historyView) {
self.nextRef = undefined;
while (true) {
var end = data.indexOf("\ncommit ", start);
if (end != -1) {
var len = end - start;
} else {
var len = undefined;
}
var entry = new Entry(self, data.substring(start, start+len));
if (len!=undefined) {
content.appendChild(entry.element);
if (!self.lineHeight) {
self.lineHeight = Math.ceil($(entry.element).outerHeight() / 2) * 2;
}
entry.element.setAttribute("style", "height:" + self.lineHeight + "px");
if (!currentSelection) {
entry.select();
if(end == -1){
if(start>=data.length) {
break
}
} else if (count >= maxCount) {
var end = data.length;
}

var entry = new Entry(self, data.substring(start, end));
content.appendChild(entry.element);
if (!self.lineHeight) {
self.lineHeight = Math.ceil($(entry.element).outerHeight() / 2) * 2;
}
entry.element.setAttribute("style", "height:" + self.lineHeight + "px");
if (!currentSelection) {
entry.select();
}
if (count >= maxCount) {
self.nextRef = entry.commit;
break;
} else {
break;
}
start = end + 1;
++count;
Expand Down Expand Up @@ -1169,9 +1166,6 @@ webui.StashListView = function(stashView) {
var svg = self.element.children[0];
var content = self.element.children[1];
var currentSelection = null;
// var lineHeight = null;
// var streams = [];
// var streamColor = 0;
self.stashView = stashView
}

Expand Down