+32 -20

resources/celerity/map.php

reviewed

··· 12 12 'core.pkg.css' => 'a4a2417c', 13 13 'core.pkg.js' => '4355a8d3', 14 14 'differential.pkg.css' => '607c84be', 15 15 - 'differential.pkg.js' => 'e40c5192', 15 15 + 'differential.pkg.js' => '688775a9', 16 16 'diffusion.pkg.css' => '42c75c37', 17 17 'diffusion.pkg.js' => 'a98c0bf7', 18 18 'maniphest.pkg.css' => '35995d6d', ··· 378 378 'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => 'a2ab19be', 379 379 'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '1e413dc9', 380 380 'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => '0116d3e8', 381 381 - 'rsrc/js/application/diff/DiffChangeset.js' => '5a4e4a3b', 382 382 - 'rsrc/js/application/diff/DiffChangesetList.js' => '3ac694dd', 381 381 + 'rsrc/js/application/diff/DiffChangeset.js' => 'd1eda7b4', 382 382 + 'rsrc/js/application/diff/DiffChangesetList.js' => '469beba0', 383 383 'rsrc/js/application/diff/DiffInline.js' => '16e97ebc', 384 384 + 'rsrc/js/application/diff/DiffPathView.js' => 'e5166692', 385 385 + 'rsrc/js/application/diff/DiffTreeView.js' => '4055adeb', 384 386 'rsrc/js/application/diff/behavior-preview-link.js' => 'f51e9c17', 385 387 'rsrc/js/application/differential/behavior-diff-radios.js' => '925fe8cd', 386 388 'rsrc/js/application/differential/behavior-populate.js' => 'b86ef6c2', ··· 778 780 'phabricator-darklog' => '3b869402', 779 781 'phabricator-darkmessage' => '26cd4b73', 780 782 'phabricator-dashboard-css' => '5a205b9d', 781 781 - 'phabricator-diff-changeset' => '5a4e4a3b', 782 782 - 'phabricator-diff-changeset-list' => '3ac694dd', 783 783 + 'phabricator-diff-changeset' => 'd1eda7b4', 784 784 + 'phabricator-diff-changeset-list' => '469beba0', 783 785 'phabricator-diff-inline' => '16e97ebc', 786 786 + 'phabricator-diff-path-view' => 'e5166692', 787 787 + 'phabricator-diff-tree-view' => '4055adeb', 784 788 'phabricator-drag-and-drop-file-upload' => '4370900d', 785 789 'phabricator-draggable-list' => '0169e425', 786 790 'phabricator-fatal-config-template-css' => '20babf50', ··· 1240 1244 'trigger-rule', 1241 1245 'trigger-rule-type', 1242 1246 ), 1243 1243 - '3ac694dd' => array( 1244 1244 - 'javelin-install', 1245 1245 - 'phuix-button-view', 1246 1246 - ), 1247 1247 '3ae89b20' => array( 1248 1248 'phui-workcard-view-css', 1249 1249 ), ··· 1266 1266 'phabricator-phtize', 1267 1267 'phabricator-drag-and-drop-file-upload', 1268 1268 'phabricator-draggable-list', 1269 1269 + ), 1270 1270 + '4055adeb' => array( 1271 1271 + 'javelin-dom', 1269 1272 ), 1270 1273 '407ee861' => array( 1271 1274 'javelin-behavior', ··· 1315 1318 'javelin-router', 1316 1319 'javelin-util', 1317 1320 'phabricator-busy', 1321 1321 + ), 1322 1322 + '469beba0' => array( 1323 1323 + 'javelin-install', 1324 1324 + 'phuix-button-view', 1325 1325 + 'phabricator-diff-tree-view', 1318 1326 ), 1319 1327 '47a0728b' => array( 1320 1328 'javelin-behavior', ··· 1466 1474 'javelin-dom', 1467 1475 'javelin-history', 1468 1476 ), 1469 1469 - '5a4e4a3b' => array( 1470 1470 - 'javelin-dom', 1471 1471 - 'javelin-util', 1472 1472 - 'javelin-stratcom', 1473 1473 - 'javelin-install', 1474 1474 - 'javelin-workflow', 1475 1475 - 'javelin-router', 1476 1476 - 'javelin-behavior-device', 1477 1477 - 'javelin-vector', 1478 1478 - 'phabricator-diff-inline', 1479 1479 - ), 1480 1477 '5a6f6a06' => array( 1481 1478 'javelin-behavior', 1482 1479 'javelin-quicksand', ··· 2099 2096 'javelin-workflow', 2100 2097 'javelin-util', 2101 2098 ), 2099 2099 + 'd1eda7b4' => array( 2100 2100 + 'javelin-dom', 2101 2101 + 'javelin-util', 2102 2102 + 'javelin-stratcom', 2103 2103 + 'javelin-install', 2104 2104 + 'javelin-workflow', 2105 2105 + 'javelin-router', 2106 2106 + 'javelin-behavior-device', 2107 2107 + 'javelin-vector', 2108 2108 + 'phabricator-diff-inline', 2109 2109 + 'phabricator-diff-path-view', 2110 2110 + ), 2102 2111 'd3799cb4' => array( 2103 2112 'javelin-install', 2104 2113 ), ··· 2124 2133 'javelin-stratcom', 2125 2134 'javelin-dom', 2126 2135 'phuix-dropdown-menu', 2136 2136 + ), 2137 2137 + 'e5166692' => array( 2138 2138 + 'javelin-dom', 2127 2139 ), 2128 2140 'e5bdb730' => array( 2129 2141 'javelin-behavior',

+4 -1

src/applications/differential/view/DifferentialChangesetDetailView.php

reviewed

··· 178 178 $changeset_state = null; 179 179 } 180 180 181 181 + $path_parts = trim($display_filename, '/'); 182 182 + $path_parts = explode('/', $path_parts); 183 183 + 181 184 return javelin_tag( 182 185 'div', 183 186 array( ··· 189 192 'ref' => $this->getRenderingRef(), 190 193 'autoload' => $this->getAutoload(), 191 194 'displayPath' => hsprintf('%s', $display_parts), 192 192 - 'path' => $display_filename, 193 195 'icon' => $display_icon, 194 196 'treeNodeID' => 'tree-node-'.$changeset->getAnchorName(), 197 197 + 'pathParts' => $path_parts, 195 198 196 199 'editorURI' => $this->getEditorURI(), 197 200 'editorConfigureURI' => $this->getEditorConfigureURI(),

+18 -1

webroot/rsrc/js/application/diff/DiffChangeset.js

reviewed

··· 9 9 * javelin-behavior-device 10 10 * javelin-vector 11 11 * phabricator-diff-inline 12 12 + * phabricator-diff-path-view 12 13 * @javelin 13 14 */ 14 14 - 15 15 16 16 JX.install('DiffChangeset', { 17 17 ··· 29 29 this._rightID = data.right; 30 30 31 31 this._displayPath = JX.$H(data.displayPath); 32 32 + this._pathParts = data.pathParts; 32 33 this._icon = data.icon; 33 34 34 35 this._editorURI = data.editorURI; ··· 70 71 71 72 _editorURI: null, 72 73 _editorConfigureURI: null, 74 74 + _pathView: null, 73 75 74 76 getEditorURI: function() { 75 77 return this._editorURI; ··· 891 893 _onundo: function(e) { 892 894 e.kill(); 893 895 this.toggleVisibility(); 896 896 + }, 897 897 + 898 898 + getPathView: function() { 899 899 + if (!this._pathView) { 900 900 + this._pathView = new JX.DiffPathView() 901 901 + .setChangeset(this) 902 902 + .setPath(this._pathParts); 903 903 + } 904 904 + 905 905 + return this._pathView; 906 906 + }, 907 907 + 908 908 + select: function(scroll) { 909 909 + this.getChangesetList().selectChangeset(this, scroll); 910 910 + return this; 894 911 } 895 912 }, 896 913

+56 -9

webroot/rsrc/js/application/diff/DiffChangesetList.js

reviewed

··· 2 2 * @provides phabricator-diff-changeset-list 3 3 * @requires javelin-install 4 4 * phuix-button-view 5 5 + * phabricator-diff-tree-view 5 6 * @javelin 6 7 */ 7 8 ··· 638 639 cursor: cursor, 639 640 items: items 640 641 }; 642 642 + }, 643 643 + 644 644 + selectChangeset: function(changeset, scroll) { 645 645 + var items = this._getSelectableItems(); 646 646 + 647 647 + var cursor = null; 648 648 + for (var ii = 0; ii < items.length; ii++) { 649 649 + var item = items[ii]; 650 650 + if (changeset === item.target) { 651 651 + cursor = ii; 652 652 + break; 653 653 + } 654 654 + } 655 655 + 656 656 + if (cursor !== null) { 657 657 + this._setSelectionState(items[cursor], true); 658 658 + } 659 659 + 660 660 + return this; 641 661 }, 642 662 643 663 _setSelectionState: function(item, scroll) { ··· 1467 1487 1468 1488 var node = this._getBannerNode(); 1469 1489 var changeset = this._getVisibleChangeset(); 1490 1490 + var tree = this._getTreeView(); 1491 1491 + var formation = this.getFormationView(); 1470 1492 1471 1493 if (!changeset) { 1472 1494 this._bannerChangeset = null; 1473 1495 JX.DOM.remove(node); 1496 1496 + tree.setSelectedPath(null); 1497 1497 + 1498 1498 + if (formation) { 1499 1499 + formation.repaint(); 1500 1500 + } 1501 1501 + 1474 1502 return; 1475 1503 } 1476 1504 ··· 1481 1509 } 1482 1510 this._bannerChangeset = changeset; 1483 1511 1512 1512 + var paths = tree.getPaths(); 1513 1513 + for (var ii = 0; ii < paths.length; ii++) { 1514 1514 + var path = paths[ii]; 1515 1515 + if (path.getChangeset() === changeset) { 1516 1516 + tree.setSelectedPath(path); 1517 1517 + } 1518 1518 + } 1519 1519 + 1484 1520 var inlines = this._getInlinesByType(); 1485 1521 1486 1522 var unsaved = inlines.unsaved; ··· 1586 1622 JX.DOM.setContent(node, [buttons_view, path_view]); 1587 1623 1588 1624 document.body.appendChild(node); 1625 1625 + 1626 1626 + if (formation) { 1627 1627 + formation.repaint(); 1628 1628 + } 1589 1629 }, 1590 1630 1591 1631 _getInlinesByType: function() { ··· 1958 1998 return null; 1959 1999 }, 1960 2000 2001 2001 + _getTreeView: function() { 2002 2002 + if (!this._treeView) { 2003 2003 + var tree = new JX.DiffTreeView(); 2004 2004 + 2005 2005 + for (var ii = 0; ii < this._changesets.length; ii++) { 2006 2006 + var changeset = this._changesets[ii]; 2007 2007 + tree.addPath(changeset.getPathView()); 2008 2008 + } 2009 2009 + 2010 2010 + this._treeView = tree; 2011 2011 + } 2012 2012 + return this._treeView; 2013 2013 + }, 2014 2014 + 1961 2015 _redrawFiletree : function() { 1962 2016 var formation = this.getFormationView(); 1963 2017 ··· 1970 2024 1971 2025 var flank_body = flank.getBodyNode(); 1972 2026 1973 1973 - var items = []; 1974 1974 - for (var ii = 0; ii < this._changesets.length; ii++) { 1975 1975 - var changeset = this._changesets[ii]; 1976 1976 - 1977 1977 - var node = JX.$N('div', {}, changeset.getDisplayPath()); 1978 1978 - items.push(node); 1979 1979 - } 1980 1980 - 1981 1981 - JX.DOM.setContent(flank_body, items); 2027 2027 + var tree = this._getTreeView(); 2028 2028 + JX.DOM.setContent(flank_body, tree.getNode()); 1982 2029 } 1983 2030 1984 2031 }

+83

webroot/rsrc/js/application/diff/DiffPathView.js

reviewed

··· 1 1 + /** 2 2 + * @provides phabricator-diff-path-view 3 3 + * @requires javelin-dom 4 4 + * @javelin 5 5 + */ 6 6 + 7 7 + JX.install('DiffPathView', { 8 8 + 9 9 + construct: function() { 10 10 + }, 11 11 + 12 12 + properties: { 13 13 + changeset: null 14 14 + }, 15 15 + 16 16 + members: { 17 17 + _node: null, 18 18 + _path: null, 19 19 + _depth: 0, 20 20 + _selected: false, 21 21 + 22 22 + getNode: function() { 23 23 + if (!this._node) { 24 24 + this._node = JX.$N('li'); 25 25 + 26 26 + var onclick = JX.bind(this, this._onclick); 27 27 + JX.DOM.listen(this._node, 'click', null, onclick); 28 28 + } 29 29 + return this._node; 30 30 + }, 31 31 + 32 32 + setPath: function(path) { 33 33 + this._path = path; 34 34 + this._redraw(); 35 35 + return this; 36 36 + }, 37 37 + 38 38 + getPath: function() { 39 39 + return this._path; 40 40 + }, 41 41 + 42 42 + setDepth: function(depth) { 43 43 + this._depth = depth; 44 44 + this._redraw(); 45 45 + return this; 46 46 + }, 47 47 + 48 48 + setIsSelected: function(selected) { 49 49 + this._selected = selected; 50 50 + this._redraw(); 51 51 + return this; 52 52 + }, 53 53 + 54 54 + _onclick: function(e) { 55 55 + if (!e.isNormalClick()) { 56 56 + return; 57 57 + } 58 58 + 59 59 + var changeset = this.getChangeset(); 60 60 + if (changeset) { 61 61 + changeset.select(true); 62 62 + } 63 63 + 64 64 + e.kill(); 65 65 + }, 66 66 + 67 67 + _redraw: function() { 68 68 + var node = this.getNode(); 69 69 + 70 70 + node.style.paddingLeft = (8 * this._depth) + 'px'; 71 71 + 72 72 + var display = this._path[this._path.length - 1]; 73 73 + 74 74 + if (this._selected) { 75 75 + display = ['*', display]; 76 76 + } 77 77 + 78 78 + JX.DOM.setContent(node, display); 79 79 + } 80 80 + 81 81 + } 82 82 + 83 83 + });

+159

webroot/rsrc/js/application/diff/DiffTreeView.js

reviewed

··· 1 1 + /** 2 2 + * @provides phabricator-diff-tree-view 3 3 + * @requires javelin-dom 4 4 + * @javelin 5 5 + */ 6 6 + 7 7 + JX.install('DiffTreeView', { 8 8 + 9 9 + construct: function() { 10 10 + this._keys = []; 11 11 + this._tree = this._newTreeNode(null, [], 0); 12 12 + this._nodes = {}; 13 13 + this._paths = []; 14 14 + }, 15 15 + 16 16 + members: { 17 17 + _node: null, 18 18 + _keys: null, 19 19 + _tree: null, 20 20 + _nodes: null, 21 21 + _dirty: false, 22 22 + _paths: null, 23 23 + _selectedPath: null, 24 24 + 25 25 + getNode: function() { 26 26 + if (!this._node) { 27 27 + this._node = JX.$N('ul'); 28 28 + } 29 29 + 30 30 + if (this._dirty) { 31 31 + this.redraw(); 32 32 + } 33 33 + 34 34 + return this._node; 35 35 + }, 36 36 + 37 37 + addPath: function(path) { 38 38 + this._paths.push(path); 39 39 + 40 40 + var tree = this._getTree(this._tree, path.getPath(), 0); 41 41 + tree.pathObject = path; 42 42 + 43 43 + this._dirty = true; 44 44 + 45 45 + return this; 46 46 + }, 47 47 + 48 48 + getPaths: function() { 49 49 + return this._paths; 50 50 + }, 51 51 + 52 52 + setSelectedPath: function(path) { 53 53 + if (this._selectedPath) { 54 54 + this._selectedPath.setIsSelected(false); 55 55 + this._selectedPath = null; 56 56 + } 57 57 + 58 58 + if (path) { 59 59 + path.setIsSelected(true); 60 60 + } 61 61 + 62 62 + this._selectedPath = path; 63 63 + 64 64 + return this; 65 65 + }, 66 66 + 67 67 + redraw: function() { 68 68 + if (!this._dirty) { 69 69 + return; 70 70 + } 71 71 + this._dirty = false; 72 72 + 73 73 + var ii; 74 74 + 75 75 + // For nodes which don't have a path object yet, build one. 76 76 + var tree; 77 77 + var trees = []; 78 78 + for (ii = 0; ii < this._keys.length; ii++) { 79 79 + var key = this._keys[ii]; 80 80 + tree = this._nodes[key]; 81 81 + var path = tree.pathObject; 82 82 + 83 83 + if (!path) { 84 84 + path = new JX.DiffPathView() 85 85 + .setPath(tree.parts); 86 86 + tree.pathObject = path; 87 87 + } 88 88 + 89 89 + trees.push(tree); 90 90 + } 91 91 + 92 92 + for (ii = 0; ii < trees.length; ii++) { 93 93 + tree = trees[ii]; 94 94 + 95 95 + if (!tree.parent) { 96 96 + tree.depth = 0; 97 97 + } else { 98 98 + tree.depth = tree.parent.depth + 1; 99 99 + } 100 100 + 101 101 + tree.pathObject.setDepth((tree.depth - 1)); 102 102 + } 103 103 + 104 104 + var nodes = []; 105 105 + for (ii = 0; ii < trees.length; ii++) { 106 106 + tree = trees[ii]; 107 107 + nodes.push(tree.pathObject.getNode()); 108 108 + } 109 109 + 110 110 + JX.DOM.setContent(this.getNode(), nodes); 111 111 + }, 112 112 + 113 113 + _getTree: function(root, path, ii) { 114 114 + if (ii >= path.length) { 115 115 + return root; 116 116 + } 117 117 + 118 118 + var part = path[ii]; 119 119 + 120 120 + if (!root.children.hasOwnProperty(part)) { 121 121 + root.children[part] = this._newTreeNode(root, path, ii); 122 122 + root.childCount++; 123 123 + } 124 124 + 125 125 + return this._getTree(root.children[part], path, ii + 1); 126 126 + }, 127 127 + 128 128 + _newTreeNode: function(parent, path, ii) { 129 129 + var key; 130 130 + var parts; 131 131 + if (path.length) { 132 132 + parts = path.slice(0, ii + 1); 133 133 + key = parts.join('/'); 134 134 + this._keys.push(key); 135 135 + } else { 136 136 + parts = []; 137 137 + key = null; 138 138 + } 139 139 + 140 140 + var node = { 141 141 + parent: parent, 142 142 + nodeKey: key, 143 143 + parts: parts, 144 144 + children: {}, 145 145 + pathObject: null, 146 146 + childCount: 0, 147 147 + depth: 0 148 148 + }; 149 149 + 150 150 + if (key !== null) { 151 151 + this._nodes[key] = node; 152 152 + } 153 153 + 154 154 + return node; 155 155 + } 156 156 + 157 157 + } 158 158 + 159 159 + });