@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Reduce cleverness of tablet breakpoint adjustment
Summary:
Fixes T7713. 2 much math X.X
Specifically, we could end up with some nonsense widths here (smaller than the phone breakpoint) with an initially-hidden column.
Test Plan: Hit tablet breakpoint with column open and closed.
Reviewers: chad, btrahan
Reviewed By: btrahan
Subscribers: epriestley
Maniphest Tasks: T7713
Differential Revision: https://secure.phabricator.com/D12225
+40
-36
+33
-33
resources/celerity/map.php
+33
-33
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => 'ad650d52',
10
+
'core.pkg.css' => '20d3b672',
11
11
'core.pkg.js' => '0c88e7f6',
12
12
'darkconsole.pkg.js' => '8ab24e01',
13
13
'differential.pkg.css' => '3500921f',
···
20
20
'rsrc/css/aphront/dark-console.css' => '6378ef3d',
21
21
'rsrc/css/aphront/dialog-view.css' => 'd2e76b88',
22
22
'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d',
23
-
'rsrc/css/aphront/list-filter-view.css' => '18b7e144',
23
+
'rsrc/css/aphront/list-filter-view.css' => '2ae43867',
24
24
'rsrc/css/aphront/multi-column.css' => 'fd18389d',
25
25
'rsrc/css/aphront/notification.css' => '9c279160',
26
26
'rsrc/css/aphront/pager-view.css' => '2e3539af',
···
34
34
'rsrc/css/aphront/typeahead.css' => '0e403212',
35
35
'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
36
36
'rsrc/css/application/auth/auth.css' => '1e655982',
37
-
'rsrc/css/application/base/main-menu-view.css' => '361a51f9',
37
+
'rsrc/css/application/base/main-menu-view.css' => 'cfa2ec0f',
38
38
'rsrc/css/application/base/notification-menu.css' => '6aa0a74b',
39
39
'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f',
40
40
'rsrc/css/application/base/standard-page-view.css' => 'd2a6518d',
···
45
45
'rsrc/css/application/config/setup-issue.css' => '22270af2',
46
46
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
47
47
'rsrc/css/application/conpherence/durable-column.css' => 'caa12d4a',
48
-
'rsrc/css/application/conpherence/menu.css' => '7c900089',
48
+
'rsrc/css/application/conpherence/menu.css' => 'beef0920',
49
49
'rsrc/css/application/conpherence/message-pane.css' => '44154798',
50
50
'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
51
51
'rsrc/css/application/conpherence/update.css' => '1099a660',
···
354
354
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
355
355
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
356
356
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'bb928342',
357
-
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c81c2bba',
358
-
'rsrc/js/application/conpherence/behavior-menu.js' => 'cda6de80',
357
+
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'a0216452',
358
+
'rsrc/js/application/conpherence/behavior-menu.js' => 'de5579b4',
359
359
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
360
360
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
361
361
'rsrc/js/application/conpherence/behavior-widget-pane.js' => '1ec93bcf',
···
501
501
'aphront-bars' => '231ac33c',
502
502
'aphront-dark-console-css' => '6378ef3d',
503
503
'aphront-dialog-view-css' => 'd2e76b88',
504
-
'aphront-list-filter-view-css' => '18b7e144',
504
+
'aphront-list-filter-view-css' => '2ae43867',
505
505
'aphront-multi-column-view-css' => 'fd18389d',
506
506
'aphront-pager-view-css' => '2e3539af',
507
507
'aphront-panel-view-css' => '8427b78d',
···
515
515
'config-options-css' => '7fedf08b',
516
516
'config-welcome-css' => '6abd79be',
517
517
'conpherence-durable-column-view' => 'caa12d4a',
518
-
'conpherence-menu-css' => '7c900089',
518
+
'conpherence-menu-css' => 'beef0920',
519
519
'conpherence-message-pane-css' => '44154798',
520
520
'conpherence-notification-css' => '04a6e10a',
521
521
'conpherence-thread-manager' => 'bb928342',
···
557
557
'javelin-behavior-boards-dropdown' => '0ec56e1d',
558
558
'javelin-behavior-choose-control' => '6153c708',
559
559
'javelin-behavior-config-reorder-fields' => '14a827de',
560
-
'javelin-behavior-conpherence-menu' => 'cda6de80',
560
+
'javelin-behavior-conpherence-menu' => 'de5579b4',
561
561
'javelin-behavior-conpherence-pontificate' => '21ba5861',
562
562
'javelin-behavior-conpherence-widget-pane' => '1ec93bcf',
563
563
'javelin-behavior-countdown-timer' => 'e4cc26b3',
···
584
584
'javelin-behavior-diffusion-locate-file' => '6d3e1947',
585
585
'javelin-behavior-diffusion-pull-lastmodified' => '2b228192',
586
586
'javelin-behavior-doorkeeper-tag' => 'e5822781',
587
-
'javelin-behavior-durable-column' => 'c81c2bba',
587
+
'javelin-behavior-durable-column' => 'a0216452',
588
588
'javelin-behavior-error-log' => '6882e80a',
589
589
'javelin-behavior-fancy-datepicker' => 'c51ae228',
590
590
'javelin-behavior-global-drag-and-drop' => 'bbdf75ca',
···
729
729
'phabricator-hovercard-view-css' => '893f4783',
730
730
'phabricator-keyboard-shortcut' => '1ae869f2',
731
731
'phabricator-keyboard-shortcut-manager' => 'c1700f6f',
732
-
'phabricator-main-menu-view' => '361a51f9',
732
+
'phabricator-main-menu-view' => 'cfa2ec0f',
733
733
'phabricator-nav-view-css' => '7aeaf435',
734
734
'phabricator-notification' => '0c6946e7',
735
735
'phabricator-notification-css' => '9c279160',
···
1569
1569
'javelin-request',
1570
1570
'phabricator-shaped-request',
1571
1571
),
1572
+
'a0216452' => array(
1573
+
'javelin-behavior',
1574
+
'javelin-dom',
1575
+
'javelin-stratcom',
1576
+
'javelin-behavior-device',
1577
+
'javelin-scrollbar',
1578
+
'javelin-quicksand',
1579
+
'phabricator-keyboard-shortcut',
1580
+
'conpherence-thread-manager',
1581
+
),
1572
1582
'a0b57eb8' => array(
1573
1583
'javelin-behavior',
1574
1584
'javelin-dom',
···
1731
1741
'javelin-stratcom',
1732
1742
'javelin-vector',
1733
1743
),
1734
-
'c81c2bba' => array(
1735
-
'javelin-behavior',
1736
-
'javelin-dom',
1737
-
'javelin-stratcom',
1738
-
'javelin-behavior-device',
1739
-
'javelin-scrollbar',
1740
-
'javelin-quicksand',
1741
-
'phabricator-keyboard-shortcut',
1742
-
'conpherence-thread-manager',
1743
-
),
1744
1744
'c90a04fc' => array(
1745
1745
'javelin-dom',
1746
1746
'javelin-dynval',
···
1754
1754
'javelin-dom',
1755
1755
'javelin-stratcom',
1756
1756
'phabricator-phtize',
1757
-
),
1758
-
'cda6de80' => array(
1759
-
'javelin-behavior',
1760
-
'javelin-dom',
1761
-
'javelin-util',
1762
-
'javelin-stratcom',
1763
-
'javelin-workflow',
1764
-
'javelin-behavior-device',
1765
-
'javelin-history',
1766
-
'javelin-vector',
1767
-
'phabricator-shaped-request',
1768
-
'conpherence-thread-manager',
1769
1757
),
1770
1758
'd19198c8' => array(
1771
1759
'javelin-install',
···
1818
1806
'javelin-typeahead',
1819
1807
'javelin-typeahead-ondemand-source',
1820
1808
'javelin-dom',
1809
+
),
1810
+
'de5579b4' => array(
1811
+
'javelin-behavior',
1812
+
'javelin-dom',
1813
+
'javelin-util',
1814
+
'javelin-stratcom',
1815
+
'javelin-workflow',
1816
+
'javelin-behavior-device',
1817
+
'javelin-history',
1818
+
'javelin-vector',
1819
+
'phabricator-shaped-request',
1820
+
'conpherence-thread-manager',
1821
1821
),
1822
1822
'e10f8e18' => array(
1823
1823
'javelin-behavior',
+7
-3
webroot/rsrc/js/application/conpherence/behavior-durable-column.js
+7
-3
webroot/rsrc/js/application/conpherence/behavior-durable-column.js
···
83
83
84
84
// When we activate the column, adjust the tablet breakpoint so that we
85
85
// convert the left side of the screen to tablet mode on narrow displays.
86
-
var breakpoint = JX.Device.getTabletBreakpoint();
87
-
JX.Device.setTabletBreakpoint(
88
-
visible ? (breakpoint + columnWidth) : (breakpoint - columnWidth));
86
+
var breakpoint;
87
+
if (visible) {
88
+
breakpoint = minimumViewportWidth + columnWidth;
89
+
} else {
90
+
breakpoint = minimumViewportWidth;
91
+
}
92
+
JX.Device.setTabletBreakpoint(breakpoint);
89
93
90
94
JX.Stratcom.invoke('resize');
91
95
}