Skip to content

Commit

Permalink
Merge branch 'v1.1' into renovate/all
Browse files Browse the repository at this point in the history
  • Loading branch information
MarioRodriguezS committed Apr 22, 2024
2 parents 8a3a198 + f9c2548 commit e319103
Show file tree
Hide file tree
Showing 8 changed files with 2,432 additions and 2,519 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ jobs:
disable-sudo: true
egress-policy: block
allowed-endpoints: >
api.github.com:443
*.github.com:443
github.com:443
*.githubapp.com:443
*.githubusercontent.com:443
- name: Checkout repository
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
Expand Down
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ At this point, you're waiting on us. We like to at least comment on pull request
business days (typically, one business day). We may suggest some changes, improvements or
alternatives.

# Stale issues

To ensure that our issue tracker remains organized and relevant, we have implemented a policy for handling Stale issues. Please review the following guidelines:

1. **Marking as Stale**: Issues will be automatically marked as **Stale** after 60 days of inactivity.
2. **Closing Stale Issues**: After an issue has been marked as Stale, a comment will be posted on the issue indicating that it will be closed if there is no further activity or information provided within a specified period.

Thank you for helping us maintain a clean and efficient issue tracker!

## Additional resources

* [EditorJS](https://editorjs.io/)
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ const editor = new EditorJS({
});
```

Select the block, drag the toolbar settings button and drop it at the desired position.
Select the block, drag the toolbar settings button, and drop it at the desired position.

You can optionally provide a second parameter to customize the indicator border style. If no parameter is provided, the default border style `1px dashed #aaa` is used.

If you're already using [editorjs-undo](https://github.com/kommitters/editorjs-undo), then your code will look somewhat like this:

Expand Down
2 changes: 1 addition & 1 deletion dist/bundle.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"email": "oss@kommit.co"
},
"devDependencies": {
"@babel/core": "^7.3.4",
"@babel/core": "^7.17.8",
"@babel/preset-env": "^7.10.1",
"babel-jest": "^29.0.0",
"babel-loader": "^9.0.0",
Expand All @@ -35,9 +35,9 @@
"jest": "^29.0.0",
"jest-environment-jsdom": "^29.3.1",
"nock": "^13.0.0",
"style-loader": "^4.0.0",
"style-loader": "^3.3.0",
"svg-inline-loader": "^0.8.2",
"webpack": "^5.52.0",
"webpack": "^5.76.0",
"webpack-cli": "^5.0.0"
},
"jest": {
Expand Down
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

.ce-block--drop-target .ce-block__content:after {
background: none;
}
}
9 changes: 7 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ export default class DragDrop {
* @param editor: object
* editor — Editor.js instance object
*/
constructor({ configuration, blocks, toolbar, save }, borderStyle) {
constructor({
configuration,
blocks,
toolbar,
save,
}, borderStyle) {
this.toolbar = toolbar;
this.borderStyle = borderStyle || '1px dashed #aaa';
this.api = blocks;
Expand Down Expand Up @@ -82,7 +87,7 @@ export default class DragDrop {
blockContent.style.removeProperty('border-bottom');
} else {
const index = Object.keys(allBlocks).find((key) => allBlocks[key] === blockFocused);
if (index > this.startBlock) blockContent.style.borderBottom = this.borderStyle || borderStyle;
if (index > this.startBlock) blockContent.style.borderBottom = this.borderStyle;
else blockContent.style.borderTop = this.borderStyle;
}
});
Expand Down
4,915 changes: 2,405 additions & 2,510 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit e319103

Please sign in to comment.