Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found
Use url utility to retrieve hash
This commit is contained in:
parent
1e66061b1e
commit
d2ee380816
|
@ -237,8 +237,11 @@
|
|||
_this.expandViewContainer();
|
||||
}
|
||||
_this.diffsLoaded = true;
|
||||
_this.scrollToElement("#diffs");
|
||||
_this.highlighSelectedLine();
|
||||
var anchoredDiff = gl.utils.getLocationHash();
|
||||
if (anchoredDiff) _this.openAnchoredDiff(anchoredDiff, function() {
|
||||
_this.scrollToElement("#diffs");
|
||||
_this.highlighSelectedLine();
|
||||
});
|
||||
_this.filesCommentButton = $('.files .diff-file').filesCommentButton();
|
||||
return $(document).off('click', '.diff-line-num a').on('click', '.diff-line-num a', function(e) {
|
||||
e.preventDefault();
|
||||
|
@ -251,6 +254,17 @@
|
|||
});
|
||||
};
|
||||
|
||||
MergeRequestTabs.prototype.openAnchoredDiff = function(anchoredDiff, cb) {
|
||||
var diffTitle = $('#file-path-' + anchoredDiff);
|
||||
var diffFile = diffTitle.closest('.diff-file');
|
||||
var nothingHereBlock = $('.nothing-here-block:visible', diffFile);
|
||||
if (nothingHereBlock.length) {
|
||||
diffFile.singleFileDiff(true, cb);
|
||||
} else {
|
||||
cb();
|
||||
}
|
||||
};
|
||||
|
||||
MergeRequestTabs.prototype.highlighSelectedLine = function() {
|
||||
var $diffLine, diffLineTop, hashClassString, locationHash, navBarHeight;
|
||||
$('.hll').removeClass('hll');
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
COLLAPSED_HTML = '<div class="nothing-here-block diff-collapsed">This diff is collapsed. <a class="click-to-expand">Click to expand it.</a></div>';
|
||||
|
||||
function SingleFileDiff(file) {
|
||||
function SingleFileDiff(file, forceLoad, cb) {
|
||||
this.file = file;
|
||||
this.toggleDiff = bind(this.toggleDiff, this);
|
||||
this.content = $('.diff-content', this.file);
|
||||
|
@ -31,9 +31,12 @@
|
|||
this.$toggleIcon.addClass('fa-caret-down');
|
||||
}
|
||||
$('.file-title, .click-to-expand', this.file).on('click', this.toggleDiff);
|
||||
if (forceLoad) {
|
||||
this.toggleDiff(null, cb);
|
||||
}
|
||||
}
|
||||
|
||||
SingleFileDiff.prototype.toggleDiff = function(e) {
|
||||
SingleFileDiff.prototype.toggleDiff = function(e, cb) {
|
||||
var $target = $(e.target);
|
||||
if (!$target.hasClass('file-title') && !$target.hasClass('click-to-expand') && !$target.hasClass('diff-toggle-caret')) return;
|
||||
this.isOpen = !this.isOpen;
|
||||
|
@ -53,11 +56,11 @@
|
|||
}
|
||||
} else {
|
||||
this.$toggleIcon.addClass('fa-caret-down').removeClass('fa-caret-right');
|
||||
return this.getContentHTML();
|
||||
return this.getContentHTML(cb);
|
||||
}
|
||||
};
|
||||
|
||||
SingleFileDiff.prototype.getContentHTML = function() {
|
||||
SingleFileDiff.prototype.getContentHTML = function(cb) {
|
||||
this.collapsedContent.hide();
|
||||
this.loadingContent.show();
|
||||
$.get(this.diffForPath, (function(_this) {
|
||||
|
@ -75,6 +78,8 @@
|
|||
if (typeof DiffNotesApp !== 'undefined') {
|
||||
DiffNotesApp.compileComponents();
|
||||
}
|
||||
|
||||
if (cb) cb();
|
||||
};
|
||||
})(this));
|
||||
};
|
||||
|
@ -83,10 +88,10 @@
|
|||
|
||||
})();
|
||||
|
||||
$.fn.singleFileDiff = function() {
|
||||
$.fn.singleFileDiff = function(forceLoad, cb) {
|
||||
return this.each(function() {
|
||||
if (!$.data(this, 'singleFileDiff')) {
|
||||
return $.data(this, 'singleFileDiff', new SingleFileDiff(this));
|
||||
if (!$.data(this, 'singleFileDiff') || forceLoad) {
|
||||
return $.data(this, 'singleFileDiff', new SingleFileDiff(this, forceLoad, cb));
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue