recaptime.dev / phorge
@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
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Prevent double lightbox in lightbox comments

Summary: Ref T3612, prevents lightbox from spawning from inside a lightbox.

Test Plan: Click on file lightbox, leave file comment, click file comment, get take to file page instead of another lightbox.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T3612

Differential Revision: https://secure.phabricator.com/D16978

Chad Little 49a20bde aa6517a4

+17 -13
+11 -11
resources/celerity/map.php
··· 10 10 'conpherence.pkg.css' => '0b64e988', 11 11 'conpherence.pkg.js' => '6249a1cf', 12 12 'core.pkg.css' => '27fd330b', 13 - 'core.pkg.js' => '14fcb9e4', 13 + 'core.pkg.js' => 'e4260032', 14 14 'darkconsole.pkg.js' => 'e7393ebb', 15 15 'differential.pkg.css' => 'a4ba74b5', 16 16 'differential.pkg.js' => '634399e9', ··· 505 505 'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64', 506 506 'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0', 507 507 'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0', 508 - 'rsrc/js/core/behavior-lightbox-attachments.js' => 'e089b29b', 508 + 'rsrc/js/core/behavior-lightbox-attachments.js' => 'ddcd41cf', 509 509 'rsrc/js/core/behavior-line-linker.js' => '1499a8cb', 510 510 'rsrc/js/core/behavior-more.js' => 'a80d0378', 511 511 'rsrc/js/core/behavior-object-selector.js' => 'e0ec7f2f', ··· 651 651 'javelin-behavior-history-install' => '7ee2b591', 652 652 'javelin-behavior-icon-composer' => '8499b6ab', 653 653 'javelin-behavior-launch-icon-composer' => '48086888', 654 - 'javelin-behavior-lightbox-attachments' => 'e089b29b', 654 + 'javelin-behavior-lightbox-attachments' => 'ddcd41cf', 655 655 'javelin-behavior-line-chart' => 'e4232876', 656 656 'javelin-behavior-load-blame' => '42126667', 657 657 'javelin-behavior-maniphest-batch-editor' => '782ab6e7', ··· 2050 2050 'javelin-util', 2051 2051 'phabricator-shaped-request', 2052 2052 ), 2053 - 'de2e896f' => array( 2054 - 'javelin-behavior', 2055 - 'javelin-dom', 2056 - 'javelin-typeahead', 2057 - 'javelin-typeahead-ondemand-source', 2058 - 'javelin-dom', 2059 - ), 2060 - 'e089b29b' => array( 2053 + 'ddcd41cf' => array( 2061 2054 'javelin-behavior', 2062 2055 'javelin-stratcom', 2063 2056 'javelin-dom', ··· 2065 2058 'javelin-util', 2066 2059 'phuix-icon-view', 2067 2060 'phabricator-busy', 2061 + ), 2062 + 'de2e896f' => array( 2063 + 'javelin-behavior', 2064 + 'javelin-dom', 2065 + 'javelin-typeahead', 2066 + 'javelin-typeahead-ondemand-source', 2067 + 'javelin-dom', 2068 2068 ), 2069 2069 'e0ec7f2f' => array( 2070 2070 'javelin-behavior',
+1
src/view/page/PhabricatorStandardPageView.php
··· 512 512 'div', 513 513 array( 514 514 'class' => implode(' ', $classes), 515 + 'id' => 'main-page-frame', 515 516 ), 516 517 array( 517 518 $main_page,
+5 -2
webroot/rsrc/js/core/behavior-lightbox-attachments.js
··· 50 50 51 51 e.kill(); 52 52 53 - var links = JX.DOM.scry(document, 'a', 'lightboxable'); 53 + var mainFrame = JX.$('main-page-frame'); 54 + var links = JX.DOM.scry(mainFrame, 'a', 'lightboxable'); 54 55 var phids = {}; 55 56 var data; 56 57 for (var i = 0; i < links.length; i++) { ··· 317 318 el.click(); 318 319 } 319 320 320 - JX.Stratcom.listen( 321 + // Only look for lightboxable inside the main page, not other lightboxes. 322 + JX.DOM.listen( 323 + JX.$('main-page-frame'), 321 324 'click', 322 325 ['lightboxable'], 323 326 loadLightBox);