Page MenuHomePhabricator

D7939.id17960.diff
No OneTemporary

D7939.id17960.diff

Index: resources/celerity/map.php
===================================================================
--- resources/celerity/map.php
+++ resources/celerity/map.php
@@ -416,7 +416,7 @@
'rsrc/js/application/uiexample/notification-example.js' => 'c51a6616',
'rsrc/js/core/Busy.js' => '6453c869',
'rsrc/js/core/DragAndDropFileUpload.js' => 'ae6abfba',
- 'rsrc/js/core/DraggableList.js' => 'f0a4bbdf',
+ 'rsrc/js/core/DraggableList.js' => '6f5a879c',
'rsrc/js/core/DropdownMenu.js' => '2f6f80f4',
'rsrc/js/core/DropdownMenuItem.js' => '0f386ef4',
'rsrc/js/core/FileUpload.js' => '96713558',
@@ -673,7 +673,7 @@
'phabricator-countdown-css' => '86b7b0a0',
'phabricator-crumbs-view-css' => '2d9db584',
'phabricator-drag-and-drop-file-upload' => 'ae6abfba',
- 'phabricator-draggable-list' => 'f0a4bbdf',
+ 'phabricator-draggable-list' => '6f5a879c',
'phabricator-dropdown-menu' => '2f6f80f4',
'phabricator-fatal-config-template-css' => '25d446d6',
'phabricator-feed-css' => '4716c86f',
@@ -1192,6 +1192,15 @@
1 => 'javelin-dom',
2 => 'javelin-workflow',
),
+ '6f5a879c' =>
+ array(
+ 0 => 'javelin-install',
+ 1 => 'javelin-dom',
+ 2 => 'javelin-stratcom',
+ 3 => 'javelin-util',
+ 4 => 'javelin-vector',
+ 5 => 'javelin-magical-init',
+ ),
'71755c79' =>
array(
0 => 'javelin-behavior',
@@ -1847,15 +1856,6 @@
2 => 'javelin-util',
3 => 'javelin-request',
),
- 'f0a4bbdf' =>
- array(
- 0 => 'javelin-install',
- 1 => 'javelin-dom',
- 2 => 'javelin-stratcom',
- 3 => 'javelin-util',
- 4 => 'javelin-vector',
- 5 => 'javelin-magical-init',
- ),
'f2441746' =>
array(
0 => 'javelin-dom',
Index: src/infrastructure/celerity/CelerityResourceMap.php
===================================================================
--- src/infrastructure/celerity/CelerityResourceMap.php
+++ src/infrastructure/celerity/CelerityResourceMap.php
@@ -213,7 +213,7 @@
* is unknown.
*/
public function getRequiredSymbolsForName($name) {
- $hash = idx($this->symbolMap, $name);
+ $hash = idx($this->nameMap, $name);
if ($hash === null) {
return null;
}
Index: src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
===================================================================
--- src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
+++ src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
@@ -147,7 +147,7 @@
$path);
$need = $external_classes;
- $resource_name = substr($path, strlen('webroot'));
+ $resource_name = substr($path, strlen('webroot/'));
$requires = $celerity->getRequiredSymbolsForName($resource_name);
if (!$requires) {
$requires = array();
@@ -170,7 +170,7 @@
// If JS requires CSS, just assume everything is fine.
unset($requires[$key]);
} else {
- $symbol_path = 'webroot'.$requires_name;
+ $symbol_path = 'webroot/'.$requires_name;
list($ignored, $req_install) = $this->getUsedAndInstalledSymbolsForPath(
$symbol_path);
if (array_intersect_key($req_install, $external_classes)) {
Index: webroot/rsrc/js/core/DraggableList.js
===================================================================
--- webroot/rsrc/js/core/DraggableList.js
+++ webroot/rsrc/js/core/DraggableList.js
@@ -197,12 +197,21 @@
break;
}
+ // If the dragged row is the first row, don't allow it to be dragged
+ // into the first position, since this operation doesn't make sense.
+ if (cur_target === null) {
+ var first_item = targets[targets.length - 1].item;
+ if (dragging === first_item) {
+ cur_target = false;
+ }
+ }
+
// If we've selected a new target, update the UI to show where we're
// going to drop the row.
- if (cur_target != target) {
+ if (cur_target !== target) {
- if (target) {
+ if (target !== false) {
JX.DOM.remove(ghost);
}

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 1:14 PM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6291304
Default Alt Text
D7939.id17960.diff (4 KB)

Event Timeline