archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

When you swap between document rendering engines, populate or redraw blame if appropriate

Browse Source 
Summary: Depends on D19311. Ref T13105. Currently, blame only renders on the initial request. Instead, redraw blame after swapping views.

Test Plan: Swapped from "Source -> Hexdump -> Source" and "Hexdump -> Source". Saw blame on source in all cases.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19312
This commit is contained in:
epriestley
2018-04-09 05:25:35 -07:00
parent eca7dc25f2
commit eb80f0a2d9
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
webroot/rsrc/js/application/files/behavior-document-engine.js
View File

@@ -151,7 +151,7 @@ JX.behavior('document-engine', function(config, statics) {
}
data.sequence = (data.sequence || 0) + 1;
var handler = JX.bind(null, onrender, data, data.sequence);
var handler = JX.bind(null, onrender, data, data.sequence, spec);
data.viewKey = spec.viewKey;
@@ -190,7 +190,7 @@ JX.behavior('document-engine', function(config, statics) {
JX.DOM.setContent(viewport, JX.$H(spec.loadingMarkup));
}
function onrender(data, sequence, r) {
function onrender(data, sequence, spec, r) {
// If this isn't the most recent request we sent, throw it away. This can
// happen if the user makes multiple selections from the menu while we are
// still rendering the first view.
@@ -209,19 +209,34 @@ JX.behavior('document-engine', function(config, statics) {
data.loadingView = false;
JX.DOM.setContent(viewport, JX.$H(r.markup));
// If this engine supports rendering blame, populate or draw it.
if (spec.canBlame) {
blame(data);
}
}
function blame(data) {
// If the rendering engine can't handle blame, bail.
if (!data.blame.uri) {
return;
}
if (!data.blame.value) {
new JX.Request(data.blame.uri, JX.bind(null, onblame, data))
.send();
// If we already have an outstanding request for blame data, bail.
if (data.blame.request) {
return;
}
// If we don't have blame data yet, request it and then try rendering
// again later.
if (!data.blame.value) {
var req = new JX.Request(data.blame.uri, JX.bind(null, onblame, data));
data.blame.request = req;
req.send();
return;
}
// We're ready to render.
var viewport = JX.$(data.viewportID);
var cells = JX.DOM.scry(viewport, 'th');
@@ -253,6 +268,7 @@ JX.behavior('document-engine', function(config, statics) {
}
function onblame(data, r) {
data.blame.request = null;
data.blame.value = r;
blame(data);
}