From a4a24b428380bad23612ff8834193362e9a356fa Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 1 Mar 2015 08:22:05 -0800 Subject: [PATCH] Fix exception with wrong column content ID Summary: This was missed in a recent rename. Test Plan: No more console exception. Reviewers: btrahan, chad Reviewed By: chad Subscribers: epriestley Differential Revision: https://secure.phabricator.com/D11916 --- resources/celerity/map.php | 36 +++++++++---------- .../conpherence/behavior-durable-column.js | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index fc31bcde3b..95e9289ab0 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,10 +7,10 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'dc3f102a', + 'core.pkg.css' => '3fa78a8d', 'core.pkg.js' => '23d653bb', 'darkconsole.pkg.js' => '8ab24e01', - 'differential.pkg.css' => '4c3242f8', + 'differential.pkg.css' => '14f0fa92', 'differential.pkg.js' => '7b5a4aa4', 'diffusion.pkg.css' => '591664fa', 'diffusion.pkg.js' => 'bfc0737b', @@ -56,7 +56,7 @@ return array( 'rsrc/css/application/dashboard/dashboard.css' => 'c0062064', 'rsrc/css/application/diff/inline-comment-summary.css' => 'eb5f8e8c', 'rsrc/css/application/differential/add-comment.css' => 'c478bcaa', - 'rsrc/css/application/differential/changeset-view.css' => 'a7781046', + 'rsrc/css/application/differential/changeset-view.css' => '8244e5a8', 'rsrc/css/application/differential/core.css' => '7ac3cabc', 'rsrc/css/application/differential/results-table.css' => '181aa9d9', 'rsrc/css/application/differential/revision-comment.css' => '48186045', @@ -106,7 +106,7 @@ return array( 'rsrc/css/application/tokens/tokens.css' => '3d0f239e', 'rsrc/css/application/uiexample/example.css' => '528b19de', 'rsrc/css/core/core.css' => 'c8c5ecd2', - 'rsrc/css/core/remarkup.css' => '2dbff225', + 'rsrc/css/core/remarkup.css' => '07f22227', 'rsrc/css/core/syntax.css' => '56c1ba38', 'rsrc/css/core/z-index.css' => '8239495e', 'rsrc/css/diviner/diviner-shared.css' => '38813222', @@ -130,7 +130,7 @@ return array( 'rsrc/css/phui/phui-document.css' => '8240b0b1', 'rsrc/css/phui/phui-error-view.css' => '41518665', 'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5', - 'rsrc/css/phui/phui-fontkit.css' => '4394f216', + 'rsrc/css/phui/phui-fontkit.css' => 'bd111278', 'rsrc/css/phui/phui-form-view.css' => '8b78a986', 'rsrc/css/phui/phui-form.css' => 'f535f938', 'rsrc/css/phui/phui-header-view.css' => '083669db', @@ -353,7 +353,7 @@ return array( 'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761', 'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18', 'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de', - 'rsrc/js/application/conpherence/behavior-durable-column.js' => '0c404426', + 'rsrc/js/application/conpherence/behavior-durable-column.js' => '3d86ed6e', 'rsrc/js/application/conpherence/behavior-menu.js' => '869e3445', 'rsrc/js/application/conpherence/behavior-pontificate.js' => '86df5915', 'rsrc/js/application/conpherence/behavior-widget-pane.js' => '40b1ff90', @@ -522,7 +522,7 @@ return array( 'conpherence-notification-css' => '04a6e10a', 'conpherence-update-css' => '1099a660', 'conpherence-widget-pane-css' => '3d575438', - 'differential-changeset-view-css' => 'a7781046', + 'differential-changeset-view-css' => '8244e5a8', 'differential-core-view-css' => '7ac3cabc', 'differential-inline-comment-editor' => 'f2441746', 'differential-results-table-css' => '181aa9d9', @@ -587,7 +587,7 @@ return array( 'javelin-behavior-diffusion-locate-file' => '6d3e1947', 'javelin-behavior-diffusion-pull-lastmodified' => '2b228192', 'javelin-behavior-doorkeeper-tag' => 'e5822781', - 'javelin-behavior-durable-column' => '0c404426', + 'javelin-behavior-durable-column' => '3d86ed6e', 'javelin-behavior-error-log' => '6882e80a', 'javelin-behavior-fancy-datepicker' => 'c51ae228', 'javelin-behavior-global-drag-and-drop' => '07f199d8', @@ -740,7 +740,7 @@ return array( 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '72da38cc', 'phabricator-profile-css' => 'd8cb982b', - 'phabricator-remarkup-css' => '2dbff225', + 'phabricator-remarkup-css' => '07f22227', 'phabricator-search-results-css' => 'f240504c', 'phabricator-shaped-request' => '7cbe244b', 'phabricator-side-menu-view-css' => '7e8c6341', @@ -785,7 +785,7 @@ return array( 'phui-error-view-css' => '41518665', 'phui-feed-story-css' => 'c9f3a0b5', 'phui-font-icon-base-css' => '3dad2ae3', - 'phui-fontkit-css' => '4394f216', + 'phui-fontkit-css' => 'bd111278', 'phui-form-css' => 'f535f938', 'phui-form-view-css' => '8b78a986', 'phui-header-view-css' => '083669db', @@ -877,14 +877,6 @@ return array( 'javelin-dom', 'javelin-router', ), - '0c404426' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-stratcom', - 'javelin-scrollbar', - 'javelin-quicksand', - 'phabricator-keyboard-shortcut', - ), '0c6946e7' => array( 'javelin-install', 'javelin-dom', @@ -1048,6 +1040,14 @@ return array( 'javelin-util', 'javelin-uri', ), + '3d86ed6e' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-stratcom', + 'javelin-scrollbar', + 'javelin-quicksand', + 'phabricator-keyboard-shortcut', + ), '3ee3408b' => array( 'javelin-behavior', 'javelin-behavior-device', diff --git a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js index 5f79985bc6..9d16905a79 100644 --- a/webroot/rsrc/js/application/conpherence/behavior-durable-column.js +++ b/webroot/rsrc/js/application/conpherence/behavior-durable-column.js @@ -24,7 +24,7 @@ JX.behavior('durable-column', function() { }) .register(); - new JX.Scrollbar(JX.$('phui-durable-column-content')); + new JX.Scrollbar(JX.$('conpherence-durable-column-content')); JX.Quicksand.start();