paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 01:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand the compose box in the correct mode when narrowed to PMs.

Browse Source 
(imported from commit 68e4bb3091b855dafda8df3ca10737abb5d2f337)
This commit is contained in:
Jessica McKellar
2013-05-24 16:00:23 -04:00
parent c1a067857b
commit 1ac44f0356
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zephyr/static/js/compose.js
View File

@@ -555,7 +555,11 @@ $(function () {
$("#new_message_content").click(function (e) { $("#new_message_content").click(function (e) {
// If we click in the composebox, start up a new message // If we click in the composebox, start up a new message
if (!compose.composing()) { if (!compose.composing()) {
compose.set_mode('stream'); if (narrow.narrowed_to_pms()) {
compose.set_mode('private');
} else {
compose.set_mode('stream');
}
e.stopPropagation(); e.stopPropagation();
} }
}); });

13
zephyr/static/js/narrow.js
View File

@@ -603,6 +603,19 @@ exports.by_stream_subject_uri = function (stream, subject) {
"/subject/" + hashchange.encodeHashComponent(subject); "/subject/" + hashchange.encodeHashComponent(subject);
}; };
exports.narrowed_to_pms = function () {
// Are we narrowed to PMs: all PMs or PMs with particular people.
var operators = narrow.operators();
if (!operators) {
return false;
}
if ((operators[0][0] === "pm-with") ||
((operators[0][0] === "is") && (operators[0][1] === "private-message"))) {
return true;
}
return false;
};
return exports; return exports;
}()); }());