Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13977948
D15227.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D15227.id.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -8,7 +8,7 @@
return array(
'names' => array(
'core.pkg.css' => 'e8763436',
- 'core.pkg.js' => '17380dd3',
+ 'core.pkg.js' => 'd7daa6d8',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9',
'differential.pkg.js' => 'd0cd0df6',
@@ -415,8 +415,8 @@
'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef',
'rsrc/js/application/policy/behavior-policy-control.js' => 'd0c516d5',
'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c',
- 'rsrc/js/application/projects/Workboard.js' => 'b38d2c73',
- 'rsrc/js/application/projects/behavior-project-boards.js' => '7f4359dd',
+ 'rsrc/js/application/projects/Workboard.js' => 'fa8ab410',
+ 'rsrc/js/application/projects/behavior-project-boards.js' => '7784bfc6',
'rsrc/js/application/projects/behavior-project-create.js' => '065227cc',
'rsrc/js/application/projects/behavior-reorder-columns.js' => 'e1d25dfb',
'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf',
@@ -449,7 +449,7 @@
'rsrc/js/application/uiexample/notification-example.js' => '8ce821c5',
'rsrc/js/core/Busy.js' => '59a7976a',
'rsrc/js/core/DragAndDropFileUpload.js' => '81f182b5',
- 'rsrc/js/core/DraggableList.js' => '705df8d1',
+ 'rsrc/js/core/DraggableList.js' => '5a13c79f',
'rsrc/js/core/FileUpload.js' => '680ea2c8',
'rsrc/js/core/Hovercard.js' => '1bd28176',
'rsrc/js/core/KeyboardShortcut.js' => '1ae869f2',
@@ -656,7 +656,7 @@
'javelin-behavior-phui-profile-menu' => '12884df9',
'javelin-behavior-policy-control' => 'd0c516d5',
'javelin-behavior-policy-rule-editor' => '5e9f347c',
- 'javelin-behavior-project-boards' => '7f4359dd',
+ 'javelin-behavior-project-boards' => '7784bfc6',
'javelin-behavior-project-create' => '065227cc',
'javelin-behavior-quicksand-blacklist' => '7927a7d3',
'javelin-behavior-recurring-edit' => '5f1c4d5f',
@@ -723,7 +723,7 @@
'javelin-view-renderer' => '6c2b09a2',
'javelin-view-visitor' => 'efe49472',
'javelin-websocket' => 'e292eaf4',
- 'javelin-workboard' => 'b38d2c73',
+ 'javelin-workboard' => 'fa8ab410',
'javelin-workflow' => '5b2e3e2b',
'lightbox-attachment-css' => '7acac05d',
'maniphest-batch-editor' => 'b0f0b6d5',
@@ -745,7 +745,7 @@
'phabricator-countdown-css' => 'e7544472',
'phabricator-dashboard-css' => 'eb458607',
'phabricator-drag-and-drop-file-upload' => '81f182b5',
- 'phabricator-draggable-list' => '705df8d1',
+ 'phabricator-draggable-list' => '5a13c79f',
'phabricator-fatal-config-template-css' => '8e6c6fcd',
'phabricator-feed-css' => 'ecd4ec57',
'phabricator-file-upload' => '680ea2c8',
@@ -1255,6 +1255,14 @@
'javelin-dom',
'javelin-stratcom',
),
+ '5a13c79f' => array(
+ 'javelin-install',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ 'javelin-util',
+ 'javelin-vector',
+ 'javelin-magical-init',
+ ),
'5b2e3e2b' => array(
'javelin-stratcom',
'javelin-request',
@@ -1356,14 +1364,6 @@
'javelin-typeahead',
'javelin-uri',
),
- '705df8d1' => array(
- 'javelin-install',
- 'javelin-dom',
- 'javelin-stratcom',
- 'javelin-util',
- 'javelin-vector',
- 'javelin-magical-init',
- ),
'70baed2f' => array(
'javelin-install',
'javelin-dom',
@@ -1407,6 +1407,17 @@
'javelin-reactor',
'javelin-util',
),
+ '7784bfc6' => array(
+ 'javelin-behavior',
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-vector',
+ 'javelin-stratcom',
+ 'javelin-workflow',
+ 'phabricator-draggable-list',
+ 'phabricator-drag-and-drop-file-upload',
+ 'javelin-workboard',
+ ),
'782ab6e7' => array(
'javelin-behavior',
'javelin-dom',
@@ -1446,17 +1457,6 @@
'javelin-behavior',
'javelin-history',
),
- '7f4359dd' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-util',
- 'javelin-vector',
- 'javelin-stratcom',
- 'javelin-workflow',
- 'phabricator-draggable-list',
- 'phabricator-drag-and-drop-file-upload',
- 'javelin-workboard',
- ),
'805b806a' => array(
'javelin-magical-init',
'javelin-install',
@@ -1717,16 +1717,6 @@
'javelin-uri',
'javelin-request',
),
- 'b38d2c73' => array(
- 'javelin-install',
- 'javelin-dom',
- 'javelin-util',
- 'javelin-vector',
- 'javelin-stratcom',
- 'javelin-workflow',
- 'phabricator-draggable-list',
- 'phabricator-drag-and-drop-file-upload',
- ),
'b3a4b884' => array(
'javelin-behavior',
'phabricator-prefab',
@@ -2088,6 +2078,16 @@
'javelin-vector',
'javelin-magical-init',
),
+ 'fa8ab410' => array(
+ 'javelin-install',
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-vector',
+ 'javelin-stratcom',
+ 'javelin-workflow',
+ 'phabricator-draggable-list',
+ 'phabricator-drag-and-drop-file-upload',
+ ),
'fb20ac8d' => array(
'javelin-behavior',
'javelin-aphlict',
diff --git a/webroot/rsrc/js/application/projects/Workboard.js b/webroot/rsrc/js/application/projects/Workboard.js
--- a/webroot/rsrc/js/application/projects/Workboard.js
+++ b/webroot/rsrc/js/application/projects/Workboard.js
@@ -140,7 +140,8 @@
var list = new JX.DraggableList('project-card', column)
.setOuterContainer(board_node)
.setFindItemsHandler(JX.bind(this, this._findCardsInColumn, column))
- .setCanDragX(true);
+ .setCanDragX(true)
+ .setHasInfiniteHeight(true);
// TODO: Restore these behaviors.
// list.listen('didSend', JX.bind(list, onupdate, cols[ii]));
@@ -149,10 +150,6 @@
list.listen('didDrop', JX.bind(this, this._onmovecard, list));
- // TODO: Restore these behaviors.
- // list.listen('didBeginDrag', JX.bind(null, onbegindrag));
- // list.listen('didEndDrag', JX.bind(null, onenddrag));
-
lists.push(list);
}
diff --git a/webroot/rsrc/js/application/projects/behavior-project-boards.js b/webroot/rsrc/js/application/projects/behavior-project-boards.js
--- a/webroot/rsrc/js/application/projects/behavior-project-boards.js
+++ b/webroot/rsrc/js/application/projects/behavior-project-boards.js
@@ -79,41 +79,6 @@
return 0;
}
- function getcontainer() {
- return JX.DOM.find(
- JX.$(statics.boardID),
- 'div',
- 'aphront-multi-column-view');
- }
-
- function onbegindrag(item) {
- // If the longest column on the board is taller than the window, the board
- // will scroll vertically. Dragging an item to the longest column may
- // make it longer, by the total height of the board, plus the height of
- // the drop target.
-
- // If this happens, the scrollbar will jump around and the scroll position
- // can be adjusted in a disorienting way. To reproduce this, drag a task
- // to the bottom of the longest column on a scrolling board and wave the
- // task in and out of the column. The scroll bar will jump around and
- // it will be hard to lock onto a target.
-
- // To fix this, set the minimum board height to the current board height
- // plus the size of the drop target (which is the size of the item plus
- // a bit of margin). This makes sure the scroll bar never needs to
- // recalculate.
-
- var item_size = JX.Vector.getDim(item);
- var container = getcontainer();
- var container_size = JX.Vector.getDim(container);
-
- container.style.minHeight = (item_size.y + container_size.y + 12) + 'px';
- }
-
- function onenddrag() {
- getcontainer().style.minHeight = '';
- }
-
function onedit(column, r) {
var new_card = JX.$H(r.tasks).getNode();
var new_data = JX.Stratcom.getData(new_card);
diff --git a/webroot/rsrc/js/core/DraggableList.js b/webroot/rsrc/js/core/DraggableList.js
--- a/webroot/rsrc/js/core/DraggableList.js
+++ b/webroot/rsrc/js/core/DraggableList.js
@@ -40,7 +40,8 @@
properties : {
findItemsHandler: null,
canDragX: false,
- outerContainer: null
+ outerContainer: null,
+ hasInfiniteHeight: false
},
members : {
@@ -286,6 +287,7 @@
_getTargetList : function(p) {
var target_list;
+ var infinity;
if (this._hasGroup()) {
var group = this._group;
for (var ii = 0; ii < group.length; ii++) {
@@ -293,6 +295,15 @@
var rp = JX.$V(root);
var rd = JX.Vector.getDim(root);
+ if (group[ii].getHasInfiniteHeight()) {
+ // The math doesn't work out quite right if we actually use
+ // Math.Infinity, so approximate infinity as the document height.
+ infinity = infinity || JX.Vector.getDocument().y;
+
+ rp.y = 0;
+ rd.y = infinity;
+ }
+
var is_target = false;
if (p.x >= rp.x && p.y >= rp.y) {
if (p.x <= (rp.x + rd.x) && p.y <= (rp.y + rd.y)) {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Oct 19, 8:45 PM (4 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6724250
Default Alt Text
D15227.id.diff (9 KB)
Attached To
Mode
D15227: Replace height buffer behavior while dragging on workboards with infinite column height
Attached
Detach File
Event Timeline
Log In to Comment