Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't use simpleMDE editor on mobile devices for 1.13 #14029

Merged
merged 4 commits into from
Dec 17, 2020
Merged

Don't use simpleMDE editor on mobile devices for 1.13 #14029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2443e83
Don't use simpleMDE editor on mobile devices
mrsdizzie Dec 16, 2020
441bd4a
Update web_src/js/index.js
mrsdizzie Dec 16, 2020
9b0736f
make isMobile function per code review -- disable simpleMDE for code …
mrsdizzie Dec 16, 2020
34d1310
Fix issue with plain text and wiki
mrsdizzie Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 32 additions & 11 deletions web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import ActivityTopAuthors from './components/ActivityTopAuthors.vue';
import {initNotificationsTable, initNotificationCount} from './features/notification.js';
import {createCodeEditor} from './features/codeeditor.js';
import {svg, svgs} from './svg.js';
import {isMobile} from './utils.js';

const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;

Expand Down Expand Up @@ -385,8 +386,14 @@ function initCommentForm() {
if ($('.comment.form').length === 0) {
return;
}

autoSimpleMDE = setCommentSimpleMDE($('.comment.form textarea:not(.review-textarea)'));

// Don't use simpleMDE on mobile due to multiple bug reports which go unfixed
// Other sections rely on it being initialized so just set it back to text area here
if (isMobile()) {
autoSimpleMDE.toTextArea();
}

initBranchSelector();
initCommentPreviewTab($('.comment.form'));
initImagePaste($('.comment.form textarea'));
Expand Down Expand Up @@ -1214,16 +1221,21 @@ function initPullRequestReview() {
const form = $(this).parent().find('.comment-form');
form.removeClass('hide');
const $textarea = form.find('textarea');
let $simplemde;
if ($textarea.data('simplemde')) {
$simplemde = $textarea.data('simplemde');
if (!isMobile()) {
let $simplemde;
if ($textarea.data('simplemde')) {
$simplemde = $textarea.data('simplemde');
} else {
attachTribute($textarea.get(), {mentions: true, emoji: true});
$simplemde = setCommentSimpleMDE($textarea);
$textarea.data('simplemde', $simplemde);
}
$textarea.focus();
$simplemde.codemirror.focus();
} else {
attachTribute($textarea.get(), {mentions: true, emoji: true});
$simplemde = setCommentSimpleMDE($textarea);
$textarea.data('simplemde', $simplemde);
$textarea.focus();
}
$textarea.focus();
$simplemde.codemirror.focus();
assingMenuAttributes(form.find('.menu'));
});
// The following part is only for diff views
Expand Down Expand Up @@ -1290,9 +1302,13 @@ function initPullRequestReview() {
const $textarea = commentCloud.find('textarea');
attachTribute($textarea.get(), {mentions: true, emoji: true});

const $simplemde = setCommentSimpleMDE($textarea);
$textarea.focus();
$simplemde.codemirror.focus();
if (!isMobile()) {
const $simplemde = setCommentSimpleMDE($textarea);
$textarea.focus();
$simplemde.codemirror.focus();
} else {
$textarea.focus();
}
});
}

Expand Down Expand Up @@ -1338,6 +1354,10 @@ function initWikiForm() {
const $editArea = $('.repository.wiki textarea#edit_area');
let sideBySideChanges = 0;
let sideBySideTimeout = null;
if ($editArea.length > 0 && isMobile) {
$editArea.css('display', 'inline-block');
return;
}
if ($editArea.length > 0) {
const simplemde = new SimpleMDE({
autoDownloadFontAwesome: false,
Expand Down Expand Up @@ -1433,6 +1453,7 @@ function initWikiForm() {
name: 'revert-to-textarea',
action(e) {
e.toTextArea();
$editArea.css('display', 'inline-block');
},
className: 'fa fa-file',
title: 'Revert to simple textarea',
Expand Down
5 changes: 5 additions & 0 deletions web_src/js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ export function isDarkTheme() {
return document.documentElement.classList.contains('theme-arc-green');
}

// returns if mobile device
export function isMobile() {
return /Mobi/.test(navigator.userAgent);
}

// removes duplicate elements in an array
export function uniq(arr) {
return Array.from(new Set(arr));
Expand Down