Skip to content

Commit 2d1a359

Browse files
committed
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
2 parents 64ac23d + 1a465f5 commit 2d1a359

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

docs/api/components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Read more about this in [Define New Component][17]
179179

180180
* `type` **[string][15]** Component ID
181181

182-
Returns **[Object][12]** Component type defintion, eg. `{ model: ..., view: ... }`
182+
Returns **[Object][12]** Component type definition, eg. `{ model: ..., view: ... }`
183183

184184
## removeType
185185

docs/modules/Commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ The Commands module offers also a set of events that you can use to intercept th
264264

265265
### Intercept run and stop
266266

267-
By using our previosly created `my-command-modal` command let's see which events we can listen to
267+
By using our previously created `my-command-modal` command let's see which events we can listen to
268268

269269
```js
270270
editor.on('run:my-command-modal', () => {

docs/modules/Components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ If you want to know how to create Components with javascript attached (eg. count
872872
If you're importing big chunks of HTML string into the editor (eg. defined via Blocks) JSX might be a great compromise between perfomances and code readibility as it allows you to skip the parsing and the component recognition steps by keeping the HTML syntax.
873873
By default, GrapesJS understands objects generated from React JSX preset, so, if you're working in the React app probably you're already using JSX and you don't need to do anything else, your environment is already configured to parse JSX in javascript files.
874874

875-
So, intead of writing this:
875+
So, instead of writing this:
876876
```js
877877
// I'm adding a string, so the parsing and the component recognition steps will be executed
878878
editor.addComponents(`<div>

src/dom_components/config/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default {
1515
storeWrapper: 0,
1616

1717
/**
18-
* You can setup a custom component definiton processor before adding it into the editor.
18+
* You can setup a custom component definition processor before adding it into the editor.
1919
* It might be useful to transform custom objects (es. some framework specific JSX) to GrapesJS component one.
2020
* This custom function will be executed on ANY new added component to the editor so make smart checks/conditions
2121
* to avoid doing useless executions

src/dom_components/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ export default () => {
564564
* Get component type.
565565
* Read more about this in [Define New Component](https://grapesjs.com/docs/modules/Components.html#define-new-component)
566566
* @param {string} type Component ID
567-
* @return {Object} Component type defintion, eg. `{ model: ..., view: ... }`
567+
* @return {Object} Component type definition, eg. `{ model: ..., view: ... }`
568568
*/
569569
getType(type) {
570570
var df = componentTypes;

src/dom_components/model/Component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ export default class Component extends Model.extend(Styleable) {
850850
addedInstances: addedInstances.map(c => c.cid),
851851
added: m.cid
852852
});
853-
// Here, before appending a new symbol, I have to ensure there are no previosly
853+
// Here, before appending a new symbol, I have to ensure there are no previously
854854
// created symbols (eg. used mainly when drag components around)
855855
toUp.forEach(symb => {
856856
const symbTop = symb.__getSymbTop();

src/navigator/config/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default {
2626

2727
// Scroll to selected component in Canvas when it's selected in Layers
2828
// true, false or `scrollIntoView`-like options,
29-
// `block: 'nearest'` avoids the issue of window scolling
29+
// `block: 'nearest'` avoids the issue of window scrolling
3030
scrollCanvas: { behavior: 'smooth', block: 'nearest' },
3131

3232
// Scroll to selected component in Layers when it's selected in Canvas

src/storage_manager/config/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default {
5959

6060
// Pass custom options to fetch API (remote storage)
6161
// You can pass a simple object: { someOption: 'someValue' }
62-
// or a function wich returns and object to add:
62+
// or a function which returns and object to add:
6363
// currentOpts => {
6464
// return currentOpts.method === 'post' ? { method: 'patch' } : {};
6565
// }

src/utils/Sorter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ export default Backbone.View.extend({
854854
/**
855855
* Get children dimensions
856856
* @param {HTMLELement} el Element root
857-
* @retun {Array}
857+
* @return {Array}
858858
* */
859859
getChildrenDim(trg) {
860860
const dims = [];
@@ -920,7 +920,7 @@ export default Backbone.View.extend({
920920
* @param {Array<Array>} dims Dimensions of nodes to parse
921921
* @param {number} posX X coordindate
922922
* @param {number} posY Y coordindate
923-
* @retun {Object}
923+
* @return {Object}
924924
* */
925925
findPosition(dims, posX, posY) {
926926
var result = { index: 0, indexEl: 0, method: 'before' };

test/specs/grapesjs/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ describe('GrapesJS', () => {
506506
editor.selectToggle([el1, el2, el3]);
507507
expect(editor.getSelected()).toBe(el2);
508508
expect(editor.getSelectedAll().length).toBe(2);
509-
// Add mutiple
509+
// Add multiple
510510
editor.selectAdd([el2, el3]);
511511
expect(editor.getSelected()).toBe(el3);
512512
expect(editor.getSelectedAll().length).toBe(3);

0 commit comments

Comments
 (0)