mirror of https://github.com/zulip/zulip.git
static/js/common: Extract function `has_mac_keyboard`.
This commit is contained in:
parent
e2549b3b84
commit
371343709b
|
@ -33,6 +33,7 @@ $.fn.keydown = noop;
|
|||
$.fn.keypress = noop;
|
||||
|
||||
var hotkey = zrequire('hotkey');
|
||||
zrequire('common');
|
||||
|
||||
set_global('list_util', {
|
||||
});
|
||||
|
|
|
@ -100,6 +100,10 @@ exports.copy_data_attribute_value = function (elem, key) {
|
|||
elem.fadeIn(1000);
|
||||
};
|
||||
|
||||
exports.has_mac_keyboard = function () {
|
||||
return /Mac/i.test(navigator.userAgent);
|
||||
};
|
||||
|
||||
return exports;
|
||||
|
||||
}());
|
||||
|
|
|
@ -612,7 +612,7 @@ exports.handle_keydown = function (event, textarea) {
|
|||
var isLink = code === 76 && event.shiftKey;
|
||||
|
||||
// detect command and ctrl key
|
||||
var isCmdOrCtrl = /Mac/i.test(navigator.userAgent) ? event.metaKey : event.ctrlKey;
|
||||
var isCmdOrCtrl = common.has_mac_keyboard() ? event.metaKey : event.ctrlKey;
|
||||
|
||||
if ((isBold || isItalic || isLink) && isCmdOrCtrl) {
|
||||
var range = textarea.range();
|
||||
|
|
|
@ -128,7 +128,7 @@ exports.get_keydown_hotkey = function (e) {
|
|||
}
|
||||
}
|
||||
|
||||
var isCmdOrCtrl = /Mac/i.test(navigator.userAgent) ? e.metaKey : e.ctrlKey;
|
||||
var isCmdOrCtrl = common.has_mac_keyboard() ? e.metaKey : e.ctrlKey;
|
||||
if (isCmdOrCtrl && !e.shiftKey) {
|
||||
hotkey = keydown_cmd_or_ctrl_mappings[e.which];
|
||||
if (hotkey) {
|
||||
|
|
|
@ -63,7 +63,7 @@ exports.set_up_toggler = function () {
|
|||
|
||||
$(".informational-overlays .overlay-tabs").append(elem);
|
||||
|
||||
if (/Mac/i.test(navigator.userAgent)) {
|
||||
if (common.has_mac_keyboard()) {
|
||||
adjust_mac_shortcuts();
|
||||
}
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ function render_code_sections() {
|
|||
|
||||
highlight_current_article();
|
||||
|
||||
if (/Mac/i.test(navigator.userAgent)) {
|
||||
if (common.has_mac_keyboard()) {
|
||||
adjust_mac_shortcuts();
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ export function detect_user_os() {
|
|||
if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {
|
||||
return "ios";
|
||||
}
|
||||
if (/Mac/i.test(navigator.userAgent)) {
|
||||
if (common.has_mac_keyboard()) {
|
||||
return "mac";
|
||||
}
|
||||
if (/Win/i.test(navigator.userAgent)) {
|
||||
|
|
|
@ -139,7 +139,7 @@ exports.get_hotkey_deprecation_notice = function (originalHotkey, replacementHot
|
|||
var shown_deprecation_notices = [];
|
||||
exports.maybe_show_deprecation_notice = function (key) {
|
||||
var message;
|
||||
var isCmdOrCtrl = /Mac/i.test(navigator.userAgent) ? "Cmd" : "Ctrl";
|
||||
var isCmdOrCtrl = common.has_mac_keyboard() ? "Cmd" : "Ctrl";
|
||||
if (key === 'C') {
|
||||
message = exports.get_hotkey_deprecation_notice('C', 'x');
|
||||
} else if (key === '*') {
|
||||
|
|
Loading…
Reference in New Issue