Page MenuHomePhabricator

D12795.diff
No OneTemporary

D12795.diff

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' => 'ed3d6355',
- 'core.pkg.js' => '31eaf90a',
+ 'core.pkg.js' => '3ed82e2f',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => 'bb338e4b',
'differential.pkg.js' => '895b8d62',
@@ -211,7 +211,7 @@
'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
'rsrc/externals/javelin/lib/Router.js' => '29274e2b',
- 'rsrc/externals/javelin/lib/Scrollbar.js' => '4f812f8a',
+ 'rsrc/externals/javelin/lib/Scrollbar.js' => '087e919c',
'rsrc/externals/javelin/lib/Sound.js' => '949c0fe5',
'rsrc/externals/javelin/lib/URI.js' => '6eff08aa',
'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
@@ -350,7 +350,7 @@
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '9e507b59',
'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a',
- 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'ac11eb8a',
+ 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'bc5107aa',
'rsrc/js/application/conpherence/behavior-menu.js' => '804b0773',
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
@@ -584,7 +584,7 @@
'javelin-behavior-diffusion-locate-file' => '6d3e1947',
'javelin-behavior-diffusion-pull-lastmodified' => '2b228192',
'javelin-behavior-doorkeeper-tag' => 'e5822781',
- 'javelin-behavior-durable-column' => 'ac11eb8a',
+ 'javelin-behavior-durable-column' => 'bc5107aa',
'javelin-behavior-error-log' => '6882e80a',
'javelin-behavior-event-all-day' => 'ca5fa62a',
'javelin-behavior-fancy-datepicker' => '5c0f680f',
@@ -681,7 +681,7 @@
'javelin-resource' => '44959b73',
'javelin-routable' => 'b3e7d692',
'javelin-router' => '29274e2b',
- 'javelin-scrollbar' => '4f812f8a',
+ 'javelin-scrollbar' => '087e919c',
'javelin-sound' => '949c0fe5',
'javelin-stratcom' => '6c53634d',
'javelin-tokenizer' => 'ab5f468d',
@@ -868,6 +868,12 @@
'javelin-uri',
'phabricator-file-upload',
),
+ '087e919c' => array(
+ 'javelin-install',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ 'javelin-vector',
+ ),
'0a3f3021' => array(
'javelin-behavior',
'javelin-stratcom',
@@ -1134,12 +1140,6 @@
'javelin-stratcom',
'javelin-request',
),
- '4f812f8a' => array(
- 'javelin-install',
- 'javelin-dom',
- 'javelin-stratcom',
- 'javelin-vector',
- ),
'4fdb476d' => array(
'javelin-behavior',
'javelin-stratcom',
@@ -1681,16 +1681,6 @@
'javelin-stratcom',
'javelin-install',
),
- 'ac11eb8a' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-stratcom',
- 'javelin-behavior-device',
- 'javelin-scrollbar',
- 'javelin-quicksand',
- 'phabricator-keyboard-shortcut',
- 'conpherence-thread-manager',
- ),
'b1a59974' => array(
'javelin-behavior',
'javelin-aphlict',
@@ -1744,6 +1734,16 @@
'javelin-stratcom',
'javelin-dom',
),
+ 'bc5107aa' => array(
+ 'javelin-behavior',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ 'javelin-behavior-device',
+ 'javelin-scrollbar',
+ 'javelin-quicksand',
+ 'phabricator-keyboard-shortcut',
+ 'conpherence-thread-manager',
+ ),
'bd4c8dca' => array(
'javelin-install',
'javelin-util',
diff --git a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js
--- a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js
+++ b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js
@@ -73,8 +73,14 @@
}
function _drawColumn(visible) {
- JX.DOM.alterClass(document.body, 'with-durable-column', visible);
- JX.DOM.alterClass(document.body, 'with-durable-margin', !!margin);
+ JX.DOM.alterClass(
+ document.body,
+ 'with-durable-column',
+ visible);
+ JX.DOM.alterClass(
+ document.body,
+ 'with-durable-margin',
+ visible && !!margin);
var column = _getColumnNode();
if (visible) {

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 20, 3:48 AM (20 h, 43 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6909416
Default Alt Text
D12795.diff (4 KB)

Event Timeline