self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Desktop, Mobile: Resolves #1832: Only support checkboxes that start with a dash

Browse Source
This commit is contained in:
Laurent Cozic 2019-09-07 11:18:07 +01:00
parent 6da6f35ddd
commit 5a9b3b6c7c
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ReactNativeClient/lib/renderers/MdToHtml/rules/checkbox.js
View File

@ -83,7 +83,8 @@ function installRule(markdownIt, mdOptions, ruleOptions, context) {
continue;
}
if (currentListItem && !processedFirstInline && token.type === 'inline') {
// Note that we only support list items that start with "-" (not with "*")
if (currentListItem && currentListItem.markup === '-' && !processedFirstInline && token.type === 'inline') {
processedFirstInline = true;
const firstChild = token.children && token.children.length ? token.children[0] : null;
if (!firstChild) continue;

6
ReactNativeClient/lib/renderers/noteStyle.js
View File

@ -237,7 +237,11 @@ module.exports = function(style, options) {
align-items: center;
}
.checkbox-label-checked {
.md-checkbox input[type=checkbox]:checked {
opacity: 0.7;
}
.md-checkbox .checkbox-label-checked {
opacity: 0.5;
}

4
ReactNativeClient/lib/services/rest/Api.js
View File

@ -658,7 +658,7 @@ class Api {
if (!imageSizesCollection) {
// In some cases, we won't find the image size information for that particular URL. Normally
// it will only happen when using the "Clip simplified page" feature, which can modify the
// it will only happen when using the "Clip simplified page" feature, which can modify the
// image URLs (for example it will select a smaller size resolution). In that case, it's
// fine to return the image as-is because it has already good dimensions.
return before + resourceUrl + after;
@ -666,7 +666,7 @@ class Api {
const imageSize = imageSizesCollection[imageSizesIndexes[urlInfo.originalUrl]];
imageSizesIndexes[urlInfo.originalUrl]++;
if (imageSize && (imageSize.naturalWidth !== imageSize.width || imageSize.naturalHeight !== imageSize.height)) {
return '<img width="' + imageSize.width + '" height="' + imageSize.height + '" src="' + resourceUrl + '"/>';
} else {

3
package.json
View File

@ -12,7 +12,8 @@
},
"lint-staged": {
"*.{js,jsx}": [
"npm run linter"
"npm run linter",
"git add"
]
},
"repository": {