From b36c83c7ad0f2744b63695deea011b9dcb79b6c9 Mon Sep 17 00:00:00 2001 From: Margaret Eker Date: Tue, 13 Nov 2018 15:37:18 -0600 Subject: [PATCH 1/3] Fix broken link in UI Components Guide --- .../v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md | 2 +- .../v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guides/v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md b/guides/v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md index 4a0fd9e1ef6..0edb0c7b135 100644 --- a/guides/v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md +++ b/guides/v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md @@ -48,7 +48,7 @@ When the request for my_page comes, the server does the following: Now it is the client's turn to process this JSON and generate the UI component's instances. The flow is following: -1. RequireJS requires `Magento_Ui/js/core/app` and passes [JSON configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html#declarative-notation-using-the-script-typetextx-magento-init--tag-decl_tag) as an parameter. +1. RequireJS requires `Magento_Ui/js/core/app` and passes [JSON configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html#decl_tag) as an parameter. 2. The `Magento_Ui/js/core/app` calls `layout.js `and passes the UI component’s configuration into the layout: `/view/base/web/js/core/renderer/layout.js`. 3. `layout.js` creates instances of UI components. That means that each UI component’s configuration must have an explicitly declared `component` property in JSON. This property references the `.js` file. For example, our form has the component declared in JSON like this: `"my_form":{"component":"Magento_Ui/js/form/form"}` So the instance of this class is created, and properties from the JSON overwrites the properties from the UI component’s `defaults` property. Then resulting properties become the first-level properties of the newly created UI component's instance, and the original `defaults` property is deleted. diff --git a/guides/v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md b/guides/v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md index 69346169e4c..d1c0f5fd27c 100644 --- a/guides/v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md +++ b/guides/v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md @@ -48,7 +48,7 @@ When the request for my_page comes, the server does the following: Now it is the client's turn to process this JSON and generate the UI component's instances. The flow is following: -1. RequireJS requires `Magento_Ui/js/core/app` and passes [JSON configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html#declarative-notation-using-the-script-typetextx-magento-init--tag-decl_tag) as an parameter. +1. RequireJS requires `Magento_Ui/js/core/app` and passes [JSON configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html#decl_tag) as an parameter. 2. The `Magento_Ui/js/core/app` calls `layout.js `and passes the UI component’s configuration into the layout: `/view/base/web/js/core/renderer/layout.js`. 3. `layout.js` creates instances of UI components. That means that each UI component’s configuration must have an explicitly declared `component` property in JSON. This property references the `.js` file. For example, our form has the component declared in JSON like this: `"my_form":{"component":"Magento_Ui/js/form/form"}` So the instance of this class is created, and properties from the JSON overwrites the properties from the UI component’s `defaults` property. Then resulting properties become the first-level properties of the newly created UI component's instance, and the original `defaults` property is deleted. From db381f56f0df2b600a01ffb534d711e9e13d80b8 Mon Sep 17 00:00:00 2001 From: Margaret Eker Date: Tue, 13 Nov 2018 15:54:19 -0600 Subject: [PATCH 2/3] Grammar fix --- .../v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md b/guides/v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md index 0edb0c7b135..580da3afa80 100644 --- a/guides/v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md +++ b/guides/v2.1/ui_comp_guide/concepts/ui_comp_config_flow_concept.md @@ -48,7 +48,7 @@ When the request for my_page comes, the server does the following: Now it is the client's turn to process this JSON and generate the UI component's instances. The flow is following: -1. RequireJS requires `Magento_Ui/js/core/app` and passes [JSON configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html#decl_tag) as an parameter. +1. RequireJS requires `Magento_Ui/js/core/app` and passes [JSON configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html#decl_tag) as a parameter. 2. The `Magento_Ui/js/core/app` calls `layout.js `and passes the UI component’s configuration into the layout: `/view/base/web/js/core/renderer/layout.js`. 3. `layout.js` creates instances of UI components. That means that each UI component’s configuration must have an explicitly declared `component` property in JSON. This property references the `.js` file. For example, our form has the component declared in JSON like this: `"my_form":{"component":"Magento_Ui/js/form/form"}` So the instance of this class is created, and properties from the JSON overwrites the properties from the UI component’s `defaults` property. Then resulting properties become the first-level properties of the newly created UI component's instance, and the original `defaults` property is deleted. From acfb66959c5d2b700848ff51f05f78dd7c59bae9 Mon Sep 17 00:00:00 2001 From: Margaret Eker Date: Tue, 13 Nov 2018 15:54:39 -0600 Subject: [PATCH 3/3] Grammar fix --- .../v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md b/guides/v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md index d1c0f5fd27c..0ce79cbbac1 100644 --- a/guides/v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md +++ b/guides/v2.2/ui_comp_guide/concepts/ui_comp_config_flow_concept.md @@ -48,7 +48,7 @@ When the request for my_page comes, the server does the following: Now it is the client's turn to process this JSON and generate the UI component's instances. The flow is following: -1. RequireJS requires `Magento_Ui/js/core/app` and passes [JSON configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html#decl_tag) as an parameter. +1. RequireJS requires `Magento_Ui/js/core/app` and passes [JSON configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js_init.html#decl_tag) as a parameter. 2. The `Magento_Ui/js/core/app` calls `layout.js `and passes the UI component’s configuration into the layout: `/view/base/web/js/core/renderer/layout.js`. 3. `layout.js` creates instances of UI components. That means that each UI component’s configuration must have an explicitly declared `component` property in JSON. This property references the `.js` file. For example, our form has the component declared in JSON like this: `"my_form":{"component":"Magento_Ui/js/form/form"}` So the instance of this class is created, and properties from the JSON overwrites the properties from the UI component’s `defaults` property. Then resulting properties become the first-level properties of the newly created UI component's instance, and the original `defaults` property is deleted.