diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -13,7 +13,7 @@ 'core.pkg.js' => '599698a7', 'darkconsole.pkg.js' => '1f9a31bc', 'differential.pkg.css' => '7d4cfa59', - 'differential.pkg.js' => 'd7e3edd5', + 'differential.pkg.js' => '06cddcc0', 'diffusion.pkg.css' => 'b93d9b8c', 'diffusion.pkg.js' => '84c8f8fd', 'favicon.ico' => '30672e08', @@ -392,7 +392,7 @@ 'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63', 'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140', 'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27', - 'rsrc/js/application/diff/DiffInline.js' => 'ca0fafde', + 'rsrc/js/application/diff/DiffInline.js' => '4478f8ac', 'rsrc/js/application/diff/ScrollObjective.js' => '9df4e4e2', 'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101', 'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832', @@ -779,7 +779,7 @@ 'phabricator-dashboard-css' => 'fe5b1869', 'phabricator-diff-changeset' => 'cf4e2140', 'phabricator-diff-changeset-list' => 'a716ca27', - 'phabricator-diff-inline' => 'ca0fafde', + 'phabricator-diff-inline' => '4478f8ac', 'phabricator-drag-and-drop-file-upload' => '58dea2fa', 'phabricator-draggable-list' => 'bea6e7f4', 'phabricator-fatal-config-template-css' => '8f18fa41', @@ -1203,6 +1203,9 @@ 'javelin-workflow', 'javelin-workboard-controller', ), + '4478f8ac' => array( + 'javelin-dom', + ), '44959b73' => array( 'javelin-util', 'javelin-uri', @@ -1976,9 +1979,6 @@ 'phabricator-shaped-request', 'conpherence-thread-manager', ), - 'ca0fafde' => array( - 'javelin-dom', - ), 'caade6f2' => array( 'javelin-behavior', 'javelin-request', diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php --- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php +++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php @@ -421,6 +421,11 @@ $actions, )); + $snippet = id(new PhutilUTF8StringTruncator()) + ->setMaximumGlyphs(96) + ->truncateString($inline->getContent()); + $metadata['snippet'] = pht('%s: %s', $author, $snippet); + $markup = javelin_tag( 'div', array( @@ -444,10 +449,6 @@ phutil_tag_div('phabricator-remarkup', $content)), )); - $snippet = id(new PhutilUTF8StringTruncator()) - ->setMaximumGlyphs(96) - ->truncateString($inline->getContent()); - $summary = phutil_tag( 'div', array( diff --git a/webroot/rsrc/js/application/diff/DiffInline.js b/webroot/rsrc/js/application/diff/DiffInline.js --- a/webroot/rsrc/js/application/diff/DiffInline.js +++ b/webroot/rsrc/js/application/diff/DiffInline.js @@ -22,6 +22,7 @@ _undoRow: null, _replyToCommentPHID: null, _originalText: null, + _snippet: null, _isDeleted: false, _isInvisible: false, @@ -75,6 +76,7 @@ this._changesetID = data.changesetID; this._isNew = false; + this._snippet = data.snippet; this.setInvisible(false); @@ -219,7 +221,7 @@ var icon = 'fa-comment'; var color = 'bluegrey'; - var tooltip = null; + var tooltip = this._snippet; var anchor = this._row; if (this._isEditing) {