From 62a172af901ca1b80cbbedaa6c4e05ba0e68937c Mon Sep 17 00:00:00 2001 From: vrana Date: Mon, 9 Apr 2012 22:00:14 -0700 Subject: [PATCH] Fix reticle Summary: Now I understand that [[ https://secure.phabricator.com/diffusion/P/browse/master/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js;32f12d1f8fb7aeca$174-176 | behavior-edit-inline-comments.js:174-176 ]] and [[ https://secure.phabricator.com/diffusion/P/browse/master/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php;32f12d1f8fb7aeca$72-99 | DifferentialChangesetViewController.php:72-99 ]] need to stay in sync: - 1 - isOnRight equals isNewFile - 1/-1 - left is new, right is missing - 1/2 - both are new Test Plan: Hover inline comment. Reviewers: epriestley Reviewed By: epriestley CC: aran Maniphest Tasks: T1076 Differential Revision: https://secure.phabricator.com/D2179 --- src/__celerity_resource_map__.php | 40 +++++++++---------- .../behavior-edit-inline-comments.js | 3 +- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 4442286179..582a2b8afd 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -912,7 +912,7 @@ celerity_register_resource_map(array( ), 'javelin-behavior-differential-edit-inline-comments' => array( - 'uri' => '/res/4c4329fe/rsrc/js/application/differential/behavior-edit-inline-comments.js', + 'uri' => '/res/5b24f03c/rsrc/js/application/differential/behavior-edit-inline-comments.js', 'type' => 'js', 'requires' => array( @@ -2470,7 +2470,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/216b9542/differential.pkg.css', 'type' => 'css', ), - 'fe787a90' => + 17105732 => array( 'name' => 'differential.pkg.js', 'symbols' => @@ -2493,7 +2493,7 @@ celerity_register_resource_map(array( 15 => 'javelin-behavior-differential-dropdown-menus', 16 => 'javelin-behavior-buoyant', ), - 'uri' => '/res/pkg/fe787a90/differential.pkg.js', + 'uri' => '/res/pkg/17105732/differential.pkg.js', 'type' => 'js', ), '4ccda8a6' => @@ -2583,7 +2583,7 @@ celerity_register_resource_map(array( 'aphront-typeahead-control-css' => '9ca700e9', 'differential-changeset-view-css' => '216b9542', 'differential-core-view-css' => '216b9542', - 'differential-inline-comment-editor' => 'fe787a90', + 'differential-inline-comment-editor' => '17105732', 'differential-local-commits-view-css' => '216b9542', 'differential-revision-add-comment-css' => '216b9542', 'differential-revision-comment-css' => '216b9542', @@ -2594,27 +2594,27 @@ celerity_register_resource_map(array( 'diffusion-commit-view-css' => '4ccda8a6', 'javelin-behavior' => '4fbae2af', 'javelin-behavior-aphront-basic-tokenizer' => '2af849fb', - 'javelin-behavior-aphront-drag-and-drop' => 'fe787a90', - 'javelin-behavior-aphront-drag-and-drop-textarea' => 'fe787a90', + 'javelin-behavior-aphront-drag-and-drop' => '17105732', + 'javelin-behavior-aphront-drag-and-drop-textarea' => '17105732', 'javelin-behavior-aphront-form-disable-on-submit' => '21d01ed8', - 'javelin-behavior-buoyant' => 'fe787a90', - 'javelin-behavior-differential-accept-with-errors' => 'fe787a90', - 'javelin-behavior-differential-add-reviewers-and-ccs' => 'fe787a90', - 'javelin-behavior-differential-comment-jump' => 'fe787a90', - 'javelin-behavior-differential-diff-radios' => 'fe787a90', - 'javelin-behavior-differential-dropdown-menus' => 'fe787a90', - 'javelin-behavior-differential-edit-inline-comments' => 'fe787a90', - 'javelin-behavior-differential-feedback-preview' => 'fe787a90', - 'javelin-behavior-differential-keyboard-navigation' => 'fe787a90', - 'javelin-behavior-differential-populate' => 'fe787a90', - 'javelin-behavior-differential-show-more' => 'fe787a90', + 'javelin-behavior-buoyant' => '17105732', + 'javelin-behavior-differential-accept-with-errors' => '17105732', + 'javelin-behavior-differential-add-reviewers-and-ccs' => '17105732', + 'javelin-behavior-differential-comment-jump' => '17105732', + 'javelin-behavior-differential-diff-radios' => '17105732', + 'javelin-behavior-differential-dropdown-menus' => '17105732', + 'javelin-behavior-differential-edit-inline-comments' => '17105732', + 'javelin-behavior-differential-feedback-preview' => '17105732', + 'javelin-behavior-differential-keyboard-navigation' => '17105732', + 'javelin-behavior-differential-populate' => '17105732', + 'javelin-behavior-differential-show-more' => '17105732', 'javelin-behavior-maniphest-batch-selector' => '86fc0b0c', 'javelin-behavior-maniphest-transaction-controls' => '86fc0b0c', 'javelin-behavior-maniphest-transaction-expand' => '86fc0b0c', 'javelin-behavior-maniphest-transaction-preview' => '86fc0b0c', 'javelin-behavior-phabricator-autofocus' => '21d01ed8', 'javelin-behavior-phabricator-keyboard-shortcuts' => '21d01ed8', - 'javelin-behavior-phabricator-object-selector' => 'fe787a90', + 'javelin-behavior-phabricator-object-selector' => '17105732', 'javelin-behavior-phabricator-watch-anchor' => '21d01ed8', 'javelin-behavior-refresh-csrf' => '21d01ed8', 'javelin-behavior-workflow' => '21d01ed8', @@ -2642,7 +2642,7 @@ celerity_register_resource_map(array( 'phabricator-core-buttons-css' => '9ca700e9', 'phabricator-core-css' => '9ca700e9', 'phabricator-directory-css' => '9ca700e9', - 'phabricator-drag-and-drop-file-upload' => 'fe787a90', + 'phabricator-drag-and-drop-file-upload' => '17105732', 'phabricator-dropdown-menu' => '21d01ed8', 'phabricator-jump-nav' => '9ca700e9', 'phabricator-keyboard-shortcut' => '21d01ed8', @@ -2651,7 +2651,7 @@ celerity_register_resource_map(array( 'phabricator-object-selector-css' => '216b9542', 'phabricator-paste-file-upload' => '21d01ed8', 'phabricator-remarkup-css' => '9ca700e9', - 'phabricator-shaped-request' => 'fe787a90', + 'phabricator-shaped-request' => '17105732', 'phabricator-standard-page-view' => '9ca700e9', 'phabricator-transaction-view-css' => '9ca700e9', 'syntax-highlighting-css' => '9ca700e9', diff --git a/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js b/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js index 1bc7b14aed..2007e4dbb4 100644 --- a/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js +++ b/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js @@ -172,7 +172,8 @@ JX.behavior('differential-edit-inline-comments', function(config) { var change = e.getNodeData('differential-changeset'); var id_part = data.on_right ? change.right : change.left; - var new_part = isNewFile(comment) ? 'N' : 'O'; + var th = comment.parentNode.previousSibling; + var new_part = isNewFile(th) ? 'N' : 'O'; var prefix = 'C' + id_part + new_part + 'L'; origin = JX.$(prefix + data.number);