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

Display cursor hand on line number in revision but not in standalone view

Browse Source 
Summary: Partially broken by D2166.

Test Plan:
Hover line number in revision.
Hover line number in standalone view.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran

Differential Revision: https://secure.phabricator.com/D2196
This commit is contained in:
vrana
2012-04-10 15:00:09 -07:00
parent 1175784d5d
commit 01bd844926
5 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/__celerity_resource_map__.php
View File

@@ -487,7 +487,7 @@ celerity_register_resource_map(array(
), ),
'aphront-table-view-css' => 'aphront-table-view-css' =>
array( array(
'uri' => '/res/cbc7ab3a/rsrc/css/aphront/table-view.css', 'uri' => '/res/3237398a/rsrc/css/aphront/table-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@@ -524,7 +524,7 @@ celerity_register_resource_map(array(
), ),
'differential-changeset-view-css' => 'differential-changeset-view-css' =>
array( array(
'uri' => '/res/238f435d/rsrc/css/application/differential/changeset-view.css', 'uri' => '/res/56207509/rsrc/css/application/differential/changeset-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@@ -638,7 +638,7 @@ celerity_register_resource_map(array(
), ),
'diffusion-source-css' => 'diffusion-source-css' =>
array( array(
'uri' => '/res/bedea304/rsrc/css/application/diffusion/diffusion-source.css', 'uri' => '/res/e133cfdb/rsrc/css/application/diffusion/diffusion-source.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@@ -2399,7 +2399,7 @@ celerity_register_resource_map(array(
), array( ), array(
'packages' => 'packages' =>
array( array(
'9ca700e9' => 'dba9e1de' =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
'symbols' => 'symbols' =>
@@ -2424,7 +2424,7 @@ celerity_register_resource_map(array(
17 => 'aphront-pager-view-css', 17 => 'aphront-pager-view-css',
18 => 'phabricator-transaction-view-css', 18 => 'phabricator-transaction-view-css',
), ),
'uri' => '/res/pkg/9ca700e9/core.pkg.css', 'uri' => '/res/pkg/dba9e1de/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'21d01ed8' => '21d01ed8' =>
@@ -2449,7 +2449,7 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/21d01ed8/core.pkg.js', 'uri' => '/res/pkg/21d01ed8/core.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'216b9542' => 'e7780f43' =>
array( array(
'name' => 'differential.pkg.css', 'name' => 'differential.pkg.css',
'symbols' => 'symbols' =>
@@ -2467,7 +2467,7 @@ celerity_register_resource_map(array(
10 => 'phabricator-content-source-view-css', 10 => 'phabricator-content-source-view-css',
11 => 'differential-local-commits-view-css', 11 => 'differential-local-commits-view-css',
), ),
'uri' => '/res/pkg/216b9542/differential.pkg.css', 'uri' => '/res/pkg/e7780f43/differential.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
17105732 => 17105732 =>
@@ -2570,27 +2570,27 @@ celerity_register_resource_map(array(
'reverse' => 'reverse' =>
array( array(
'aphront-attached-file-view-css' => '8db30c56', 'aphront-attached-file-view-css' => '8db30c56',
'aphront-crumbs-view-css' => '9ca700e9', 'aphront-crumbs-view-css' => 'dba9e1de',
'aphront-dialog-view-css' => '9ca700e9', 'aphront-dialog-view-css' => 'dba9e1de',
'aphront-form-view-css' => '9ca700e9', 'aphront-form-view-css' => 'dba9e1de',
'aphront-headsup-action-list-view-css' => '216b9542', 'aphront-headsup-action-list-view-css' => 'e7780f43',
'aphront-list-filter-view-css' => '9ca700e9', 'aphront-list-filter-view-css' => 'dba9e1de',
'aphront-pager-view-css' => '9ca700e9', 'aphront-pager-view-css' => 'dba9e1de',
'aphront-panel-view-css' => '9ca700e9', 'aphront-panel-view-css' => 'dba9e1de',
'aphront-side-nav-view-css' => '9ca700e9', 'aphront-side-nav-view-css' => 'dba9e1de',
'aphront-table-view-css' => '9ca700e9', 'aphront-table-view-css' => 'dba9e1de',
'aphront-tokenizer-control-css' => '9ca700e9', 'aphront-tokenizer-control-css' => 'dba9e1de',
'aphront-typeahead-control-css' => '9ca700e9', 'aphront-typeahead-control-css' => 'dba9e1de',
'differential-changeset-view-css' => '216b9542', 'differential-changeset-view-css' => 'e7780f43',
'differential-core-view-css' => '216b9542', 'differential-core-view-css' => 'e7780f43',
'differential-inline-comment-editor' => '17105732', 'differential-inline-comment-editor' => '17105732',
'differential-local-commits-view-css' => '216b9542', 'differential-local-commits-view-css' => 'e7780f43',
'differential-revision-add-comment-css' => '216b9542', 'differential-revision-add-comment-css' => 'e7780f43',
'differential-revision-comment-css' => '216b9542', 'differential-revision-comment-css' => 'e7780f43',
'differential-revision-comment-list-css' => '216b9542', 'differential-revision-comment-list-css' => 'e7780f43',
'differential-revision-detail-css' => '216b9542', 'differential-revision-detail-css' => 'e7780f43',
'differential-revision-history-css' => '216b9542', 'differential-revision-history-css' => 'e7780f43',
'differential-table-of-contents-css' => '216b9542', 'differential-table-of-contents-css' => 'e7780f43',
'diffusion-commit-view-css' => '4ccda8a6', 'diffusion-commit-view-css' => '4ccda8a6',
'javelin-behavior' => '4fbae2af', 'javelin-behavior' => '4fbae2af',
'javelin-behavior-aphront-basic-tokenizer' => '2af849fb', 'javelin-behavior-aphront-basic-tokenizer' => '2af849fb',
@@ -2637,23 +2637,23 @@ celerity_register_resource_map(array(
'javelin-workflow' => '21d01ed8', 'javelin-workflow' => '21d01ed8',
'maniphest-task-summary-css' => '8db30c56', 'maniphest-task-summary-css' => '8db30c56',
'maniphest-transaction-detail-css' => '8db30c56', 'maniphest-transaction-detail-css' => '8db30c56',
'phabricator-app-buttons-css' => '9ca700e9', 'phabricator-app-buttons-css' => 'dba9e1de',
'phabricator-content-source-view-css' => '216b9542', 'phabricator-content-source-view-css' => 'e7780f43',
'phabricator-core-buttons-css' => '9ca700e9', 'phabricator-core-buttons-css' => 'dba9e1de',
'phabricator-core-css' => '9ca700e9', 'phabricator-core-css' => 'dba9e1de',
'phabricator-directory-css' => '9ca700e9', 'phabricator-directory-css' => 'dba9e1de',
'phabricator-drag-and-drop-file-upload' => '17105732', 'phabricator-drag-and-drop-file-upload' => '17105732',
'phabricator-dropdown-menu' => '21d01ed8', 'phabricator-dropdown-menu' => '21d01ed8',
'phabricator-jump-nav' => '9ca700e9', 'phabricator-jump-nav' => 'dba9e1de',
'phabricator-keyboard-shortcut' => '21d01ed8', 'phabricator-keyboard-shortcut' => '21d01ed8',
'phabricator-keyboard-shortcut-manager' => '21d01ed8', 'phabricator-keyboard-shortcut-manager' => '21d01ed8',
'phabricator-menu-item' => '21d01ed8', 'phabricator-menu-item' => '21d01ed8',
'phabricator-object-selector-css' => '216b9542', 'phabricator-object-selector-css' => 'e7780f43',
'phabricator-paste-file-upload' => '21d01ed8', 'phabricator-paste-file-upload' => '21d01ed8',
'phabricator-remarkup-css' => '9ca700e9', 'phabricator-remarkup-css' => 'dba9e1de',
'phabricator-shaped-request' => '17105732', 'phabricator-shaped-request' => '17105732',
'phabricator-standard-page-view' => '9ca700e9', 'phabricator-standard-page-view' => 'dba9e1de',
'phabricator-transaction-view-css' => '9ca700e9', 'phabricator-transaction-view-css' => 'dba9e1de',
'syntax-highlighting-css' => '9ca700e9', 'syntax-highlighting-css' => 'dba9e1de',
), ),
)); ));

2
src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
View File

@@ -232,8 +232,6 @@ final class DifferentialChangesetViewController extends DifferentialController {
$detail->appendChild($output); $detail->appendChild($output);
$detail->setVsChangesetID($left_source); $detail->setVsChangesetID($left_source);
$detail->setRevisionID($request->getInt('revision_id'));
$output = $output =
id(new DifferentialPrimaryPaneView()) id(new DifferentialPrimaryPaneView())
->setLineWidthFromChangesets(array($changeset)) ->setLineWidthFromChangesets(array($changeset))

14
src/applications/differential/view/changesetdetailview/DifferentialChangesetDetailView.php
View File

@@ -20,7 +20,7 @@ final class DifferentialChangesetDetailView extends AphrontView {
private $changeset; private $changeset;
private $buttons = array(); private $buttons = array();
private $revisionID; private $editable;
private $symbolIndex; private $symbolIndex;
private $id; private $id;
private $vsChangesetID; private $vsChangesetID;
@@ -35,8 +35,8 @@ final class DifferentialChangesetDetailView extends AphrontView {
return $this; return $this;
} }
public function setRevisionID($revision_id) { public function setEditable($editable) {
$this->revisionID = $revision_id; $this->editable = $editable;
return $this; return $this;
} }
@@ -67,15 +67,9 @@ final class DifferentialChangesetDetailView extends AphrontView {
Javelin::initBehavior('phabricator-oncopy', array()); Javelin::initBehavior('phabricator-oncopy', array());
if ($this->revisionID) {
$edit = true;
} else {
$edit = false;
}
$changeset = $this->changeset; $changeset = $this->changeset;
$class = 'differential-changeset'; $class = 'differential-changeset';
if (!$edit) { if (!$this->editable) {
$class .= ' differential-changeset-immutable'; $class .= ' differential-changeset-immutable';
} }

1
src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php
View File

@@ -128,6 +128,7 @@ final class DifferentialChangesetListView extends AphrontView {
$detail->addButton($view_options); $detail->addButton($view_options);
$detail->setSymbolIndex(idx($this->symbolIndexes, $key)); $detail->setSymbolIndex(idx($this->symbolIndexes, $key));
$detail->setVsChangesetID(idx($this->vsMap, $changeset->getID())); $detail->setVsChangesetID(idx($this->vsMap, $changeset->getID()));
$detail->setEditable(true);
$uniq_id = celerity_generate_unique_node_id(); $uniq_id = celerity_generate_unique_node_id();
$detail->appendChild( $detail->appendChild(

5
webroot/rsrc/css/application/differential/changeset-view.css
View File

@@ -47,6 +47,7 @@
vertical-align: top; vertical-align: top;
background: #eeeeee; background: #eeeeee;
color: #888888; color: #888888;
cursor: pointer;
border-style: solid; border-style: solid;
border-width: 0px 1px; border-width: 0px 1px;
border-color: #eeeeee #999999 #eeeeee #dddddd; border-color: #eeeeee #999999 #eeeeee #dddddd;
@@ -56,6 +57,10 @@
overflow: hidden; overflow: hidden;
} }
.differential-changeset-immutable .differential-diff th {
cursor: auto;
}
.differential-diff td.old { .differential-diff td.old {
background: #ffd0d0; background: #ffd0d0;
} }