Desktop, Mobile: Resolves laurent22#1832: Only support checkboxes tha…

…t start with a dash
scoroi · Nov 10, 2019 · 1430e2a · 1430e2a
1 parent b83f1cd
commit 1430e2a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/ReactNativeClient/lib/renderers/MdToHtml/rules/checkbox.js b/ReactNativeClient/lib/renderers/MdToHtml/rules/checkbox.js
@@ -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;

diff --git a/ReactNativeClient/lib/renderers/noteStyle.js b/ReactNativeClient/lib/renderers/noteStyle.js
@@ -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;
 		}
 

diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
@@ -658,15 +658,15 @@ 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;
 				}
 
 				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 {

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