Page MenuHomePhabricator
Files F15471801

D17590.id42312.diff
No OneTemporary
Actions

D17590.id42312.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(
'conpherence.pkg.css' => '82aca405',
- 'conpherence.pkg.js' => '6249a1cf',
+ 'conpherence.pkg.js' => '8a03b309',
'core.pkg.css' => '87c434ee',
'core.pkg.js' => '021685f1',
'darkconsole.pkg.js' => 'e7393ebb',
@@ -375,7 +375,7 @@
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'aa3bd034',
'rsrc/js/application/conpherence/behavior-menu.js' => '7524fcfa',
'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8',
- 'rsrc/js/application/conpherence/behavior-pontificate.js' => 'f2e58483',
+ 'rsrc/js/application/conpherence/behavior-pontificate.js' => 'c525eed8',
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
'rsrc/js/application/conpherence/behavior-toggle-widget.js' => '3dbf94d5',
'rsrc/js/application/countdown/timer.js' => 'e4cc26b3',
@@ -600,7 +600,7 @@
'javelin-behavior-config-reorder-fields' => 'b6993408',
'javelin-behavior-conpherence-menu' => '7524fcfa',
'javelin-behavior-conpherence-participant-pane' => '8604caa8',
- 'javelin-behavior-conpherence-pontificate' => 'f2e58483',
+ 'javelin-behavior-conpherence-pontificate' => 'c525eed8',
'javelin-behavior-conpherence-search' => '9bbf3762',
'javelin-behavior-countdown-timer' => 'e4cc26b3',
'javelin-behavior-dark-console' => 'f411b6ae',
@@ -1944,6 +1944,14 @@
'javelin-stratcom',
'phabricator-tooltip',
),
+ 'c525eed8' => array(
+ 'javelin-behavior',
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-workflow',
+ 'javelin-stratcom',
+ 'conpherence-thread-manager',
+ ),
'c587b80f' => array(
'javelin-install',
),
@@ -2165,14 +2173,6 @@
'f12cbc9f' => array(
'phui-oi-list-view-css',
),
- 'f2e58483' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-util',
- 'javelin-workflow',
- 'javelin-stratcom',
- 'conpherence-thread-manager',
- ),
'f411b6ae' => array(
'javelin-behavior',
'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/conpherence/behavior-pontificate.js b/webroot/rsrc/js/application/conpherence/behavior-pontificate.js
--- a/webroot/rsrc/js/application/conpherence/behavior-pontificate.js
+++ b/webroot/rsrc/js/application/conpherence/behavior-pontificate.js
@@ -38,6 +38,16 @@
return;
}
+ var node = document.body;
+ var className = 'remarkup-fullscreen-mode';
+ var full = ((' '+node.className+' ').indexOf(' '+className+' ') > -1);
+
+ if (full) {
+ // If the fullscreen editor is running, don't Send on Enter.
+ return;
+ }
+
+
// From here on, interpret this as a "send" action, not a literal
// newline.
e.kill();

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 6, 8:09 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7734198
Default Alt Text
D17590.id42312.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility