Skip to content

Commit

Permalink
Merge pull request #1877 from wordpress-mobile/merge-v1.22.0-to-develop
Browse files Browse the repository at this point in the history
Merge v1.22.0 to develop
  • Loading branch information
hypest authored Feb 11, 2020
2 parents f997bb5 + 3b93a33 commit 03b2179
Show file tree
Hide file tree
Showing 174 changed files with 4,820 additions and 2,044 deletions.
5 changes: 5 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
------
* Add support for changing images size in Gallery block
* Make inserter to show options on long-press to add before/after
* Retry displaying image when connectivity restores
* [iOS] Show an "Edit" button overlay on selected image blocks
* [Android] Fix blank post when sharing media from another app
* Add support for image size options in the gallery block
* Fix issue that sometimes prevented merging paragraph blocks

1.21.0
------
Expand Down
2,087 changes: 1,074 additions & 1,013 deletions bundle/android/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/App.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "core/audio",
"category": "common",
"attributes": {
"src": {
"type": "string",
"source": "attribute",
"selector": "audio",
"attribute": "src"
},
"caption": {
"type": "string",
"source": "html",
"selector": "figcaption"
},
"id": {
"type": "number"
},
"autoplay": {
"type": "boolean",
"source": "attribute",
"selector": "audio",
"attribute": "autoplay"
},
"loop": {
"type": "boolean",
"source": "attribute",
"selector": "audio",
"attribute": "loop"
},
"preload": {
"type": "string",
"source": "attribute",
"selector": "audio",
"attribute": "preload"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"name": "core/button",
"category": "layout",
"attributes": {
"url": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "href"
},
"title": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "title"
},
"text": {
"type": "string",
"source": "html",
"selector": "a"
},
"backgroundColor": {
"type": "string"
},
"textColor": {
"type": "string"
},
"customBackgroundColor": {
"type": "string"
},
"customTextColor": {
"type": "string"
},
"linkTarget": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "target"
},
"rel": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "rel"
},
"placeholder": {
"type": "string"
},
"borderRadius": {
"type": "number"
},
"gradient": {
"type": "string"
},
"customGradient": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "core/code",
"category": "formatting",
"attributes": {
"content": {
"type": "string",
"source": "text",
"selector": "code"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "core/column",
"category": "common",
"attributes": {
"verticalAlignment": {
"type": "string"
},
"width": {
"type": "number",
"min": 0,
"max": 100
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "core/columns",
"category": "layout",
"attributes": {
"verticalAlignment": {
"type": "string"
},
"backgroundColor": {
"type": "string"
},
"customBackgroundColor": {
"type": "string"
},
"customTextColor" : {
"type": "string"
},
"textColor": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"name": "core/cover",
"category": "common",
"attributes": {
"url": {
"type": "string"
},
"id": {
"type": "number"
},
"hasParallax": {
"type": "boolean",
"default": false
},
"dimRatio": {
"type": "number",
"default": 50
},
"overlayColor": {
"type": "string"
},
"customOverlayColor": {
"type": "string"
},
"backgroundType": {
"type": "string",
"default": "image"
},
"focalPoint": {
"type": "object"
},
"minHeight": {
"type": "number"
},
"gradient": {
"type": "string"
},
"customGradient": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "core/file",
"category": "common",
"attributes": {
"id": {
"type": "number"
},
"href": {
"type": "string"
},
"fileName": {
"type": "string",
"source": "html",
"selector": "a:not([download])"
},
"textLinkHref": {
"type": "string",
"source": "attribute",
"selector": "a:not([download])",
"attribute": "href"
},
"textLinkTarget": {
"type": "string",
"source": "attribute",
"selector": "a:not([download])",
"attribute": "target"
},
"showDownloadButton": {
"type": "boolean",
"default": true
},
"downloadButtonText": {
"type": "string",
"source": "html",
"selector": "a[download]"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"name": "core/gallery",
"category": "common",
"attributes": {
"images": {
"type": "array",
"default": [],
"source": "query",
"selector": ".blocks-gallery-item",
"query": {
"url": {
"source": "attribute",
"selector": "img",
"attribute": "src"
},
"fullUrl": {
"source": "attribute",
"selector": "img",
"attribute": "data-full-url"
},
"link": {
"source": "attribute",
"selector": "img",
"attribute": "data-link"
},
"alt": {
"source": "attribute",
"selector": "img",
"attribute": "alt",
"default": ""
},
"id": {
"source": "attribute",
"selector": "img",
"attribute": "data-id"
},
"caption": {
"type": "string",
"source": "html",
"selector": ".blocks-gallery-item__caption"
}
}
},
"ids": {
"type": "array",
"items": {
"type": "number"
},
"default": []
},
"columns": {
"type": "number",
"minimum": 1,
"maximum": 8
},
"caption": {
"type": "string",
"source": "html",
"selector": ".blocks-gallery-caption"
},
"imageCrop": {
"type": "boolean",
"default": true
},
"linkTo": {
"type": "string",
"default": "none"
},
"sizeSlug": {
"type": "string",
"default": "large"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "core/group",
"category": "layout",
"attributes": {
"backgroundColor": {
"type": "string"
},
"customBackgroundColor": {
"type": "string"
},
"textColor": {
"type": "string"
},
"customTextColor": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"name": "core/heading",
"category": "common",
"attributes": {
"align": {
"type": "string"
},
"content": {
"type": "string",
"source": "html",
"selector": "h1,h2,h3,h4,h5,h6",
"default": ""
},
"level": {
"type": "number",
"default": 2
},
"placeholder": {
"type": "string"
},
"textColor": {
"type": "string"
},
"customTextColor": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "core/html",
"category": "formatting",
"attributes": {
"content": {
"type": "string",
"source": "html"
}
}
}
Loading

0 comments on commit 03b2179

Please sign in to comment.