Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

同步 #1

Merged
merged 469 commits into from
May 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
469 commits
Select commit Hold shift + click to select a range
98597eb
Sync common selectors with state and media
artf Dec 17, 2019
7f77a37
Add new tag to multiple selection
artf Dec 17, 2019
e1923b7
Remove selectors from multiple selection
artf Dec 17, 2019
b6a69ec
Add render option in Selector Manager for a custom template
artf Dec 17, 2019
62e2d2e
Update tag layout
artf Dec 17, 2019
dc67108
Allow to customize icons in tags
artf Dec 18, 2019
f581d25
Add selector:remove event
artf Dec 18, 2019
489bcaa
Add selector:update event
artf Dec 18, 2019
02defce
Add selector:state event
artf Dec 18, 2019
59f0e25
Added new methods to handle state selector
artf Dec 18, 2019
e80a0c5
Add SelectorManager.select method and update StyleManager.setTarget r…
artf Dec 19, 2019
64c674d
Update componentChanged for multiple selection
artf Dec 20, 2019
3564e94
Adjust getName for rule names
artf Dec 20, 2019
a8450e5
Update state change handler in ClassTagsView
artf Dec 20, 2019
1ed1910
Filter the selection in SelectorManager select
artf Dec 22, 2019
7d863c9
Update tests in CodeManager
artf Dec 23, 2019
b1de60f
Update DomComponents tests
artf Dec 23, 2019
aaf9721
Update Selectors states
artf Dec 23, 2019
f82374a
Add tests to _commonSelectors
artf Dec 24, 2019
9db1005
Add tests to getCommonSelectors
artf Dec 24, 2019
e32a55d
Update state get function
artf Dec 24, 2019
b262cad
Add tests to updateSelection
artf Dec 24, 2019
42b8922
Update selectors laouyt
artf Dec 24, 2019
f91f02f
Disable componentFirst option
artf Dec 24, 2019
627353b
Add destroy to RichTextEditor
artf Dec 25, 2019
748eb86
Add destroy method to RTE module
artf Dec 25, 2019
0a0e230
Destroy RTE module
artf Dec 25, 2019
3464b1b
Destroy RTE module when `editor.destroy` is called (#2471)
artf Dec 25, 2019
d09d5d6
Adjust checkSync
artf Dec 26, 2019
af5a6d1
Clear targets in SectorsView
artf Dec 26, 2019
af6de78
Improve SelectorManager and introduce component-first selection (#2474)
artf Dec 26, 2019
26de1c4
Bump handlebars from 4.2.0 to 4.5.3
dependabot[bot] Dec 26, 2019
c7febbf
Update Components-js.md
ackvf Dec 30, 2019
44a52a5
Read avoidInlineStyle from config not from attributes
emilsedgh Jan 1, 2020
851847c
Use custom-name on layer name edit
artf Jan 1, 2020
7cdd45f
Merge branch 'master' into issue-2207
emilsedgh Jan 1, 2020
dabbe71
Bump handlebars from 4.2.0 to 4.5.3 (#2475)
artf Jan 2, 2020
e5da2b3
Update Components-js.md (#2479)
artf Jan 2, 2020
00143fb
Read avoidInlineStyle from config not from attributes (#2485)
artf Jan 2, 2020
f703ce7
Define the variable before using it
emilsedgh Jan 2, 2020
50d3a0b
Calibrate the coordinates based on frame position. (#2375)
artf Jan 2, 2020
ea19ee4
Exit from onMove when no target is found. Fixes #2478
artf Jan 4, 2020
57b2ce5
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Jan 4, 2020
49acab8
Fix parent sorter issue
artf Jan 5, 2020
57aa733
Update lock.yml
artf Jan 5, 2020
670c4ef
Bump v0.15.10
artf Jan 5, 2020
8ba9355
refreshing the visibility on property load, to avoid unwanted visible…
jcamejo Jan 8, 2020
b2d68e3
Show computed values in stack stypes
artf Jan 11, 2020
db2b625
Improve style updates on stack types
artf Jan 11, 2020
57595d9
Don't accept empty value as a valid one in SM
artf Jan 11, 2020
14f17a7
Update comment about clear in PropertyView
artf Jan 11, 2020
f671610
Reset status on value clear
artf Jan 11, 2020
a0eb6a6
Avoid none default value for the background style property
artf Jan 11, 2020
917bb23
Update getName function
artf Jan 12, 2020
4f007f3
Refreshing the visibility of the property, to avoid unwanted vi… (#2497)
artf Jan 12, 2020
b79a02d
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Jan 12, 2020
14d659e
Fix Selector Manager styles for Firefox/IE/Edge. Closes #2490
artf Jan 12, 2020
ed54a76
Update video attributes on render. Closes #2501
artf Jan 12, 2020
0d38f05
Adjust tests
artf Jan 15, 2020
f0f5e75
Build
artf Jan 15, 2020
4fc4a09
Build min
artf Jan 15, 2020
a63b80d
Use logger for errors in text component
artf Jan 18, 2020
4b77caf
Avoid useless attributes on nodes inside text components. Closes #2508
artf Jan 19, 2020
472185d
Merge branch 'dev' into multi-frame
artf Jan 19, 2020
0aa4639
Fix scrollIntoView
artf Jan 19, 2020
0ba1539
Update frameview
artf Jan 20, 2020
31b879b
Remove logs
artf Jan 20, 2020
fb6d9db
Put FramesView creation in CanvasView init
artf Jan 20, 2020
4c0a398
Update runDefault command in Editor
artf Jan 20, 2020
948d2f1
Change event on input event in Text component view
artf Jan 20, 2020
96a4f84
Trigger RTE toolbar update on component updates
artf Jan 20, 2020
f38d149
Hide some elements when the component is selected
artf Jan 20, 2020
b0b942b
Center iframe
artf Jan 21, 2020
7632e35
Update current frame on canvas render
artf Jan 21, 2020
ef336ae
Animate iframe on size change
artf Jan 21, 2020
11392dd
Clean CanvasView
artf Jan 21, 2020
47433f6
Add debounce in updateDim to prevent double changes
artf Jan 21, 2020
07607e4
Clear cached components on frame resize
artf Jan 21, 2020
5686c33
Remove frame instance from model on remove
artf Jan 21, 2020
79682ff
Update frame wrapper edges
artf Jan 21, 2020
2fee4e2
Add onRender property to Frame
artf Jan 21, 2020
9e6d308
Update string
artf Jan 21, 2020
36a4c90
Adjust frames loading order
artf Jan 21, 2020
d6bac55
Move loaded listener in editor
artf Jan 21, 2020
759df27
Adjust tests in ClassManager
artf Jan 22, 2020
796dac9
Added `style:update` event for StyleManager
artf Jan 22, 2020
71a39dd
Add also style:update:id event
artf Jan 22, 2020
5f1a524
Rerender style property on name change
artf Jan 22, 2020
5710b6f
Build
artf Jan 23, 2020
ce0a034
Merge branch 'dev' into multi-frame
artf Jan 23, 2020
c7fa9d6
Update style manager on frame resize
artf Jan 23, 2020
8b315e4
Canvas refactoring for Multi Frame (#2524)
artf Jan 23, 2020
ce42fb5
Build
artf Jan 25, 2020
f9b27d8
Emit event on frame resize
artf Feb 1, 2020
8724ae9
Fix global tools position on frame resize
artf Feb 1, 2020
331d642
Improve selection boxes
artf Feb 2, 2020
5d2a6d4
Update selection box on window resize
artf Feb 2, 2020
ffd6b65
Update comment
artf Feb 2, 2020
cc00194
Add new `component:drag` events #2500
artf Feb 2, 2020
75b4783
Trigger `component:drag` events in Layers. Closes #2528
artf Feb 2, 2020
6074584
Trigger component:drag event in all DragModes
artf Feb 2, 2020
398eeab
Centralize drag event
artf Feb 2, 2020
034ab3c
Add component:drag in docs
artf Feb 2, 2020
73e3837
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Feb 4, 2020
6cf7992
Build
artf Feb 8, 2020
c3e808c
Add new component to handle better inner SVG elements
artf Feb 12, 2020
f049ab0
Remove logs
artf Feb 12, 2020
cdbdb72
Fix drag issues on esc key
artf Feb 12, 2020
a1aefcb
Fix property extend in PropertySelect
artf Feb 12, 2020
e02b533
Pass correctly undoManager options
artf Feb 13, 2020
ea2f795
Update style on block drop in absolute mode
artf Feb 13, 2020
bb1bfde
Create de.js
chickahoona Feb 17, 2020
f4e9a46
Build
artf Feb 17, 2020
2fa8e24
Fix bug toggling preview
Skedog Feb 19, 2020
9c24108
Inital cleanup
artf Feb 20, 2020
3544531
Add sectors silently
artf Feb 20, 2020
7817945
Update cash-dom and cleanup extender
artf Feb 21, 2020
0d4a2d4
Fix get current JS container from CanvasView
artf Feb 24, 2020
7b196aa
Added German translation (#2578)
artf Feb 24, 2020
1b6d489
Better clear on destroy
artf Feb 24, 2020
823f0b3
Fix get current JS container from CanvasView
artf Feb 24, 2020
c22e3ec
making the external assets form optional
jcamejo Feb 26, 2020
fa39e61
Search alternative style target
artf Feb 26, 2020
198298d
Search alternative style target for not detached props
artf Feb 27, 2020
2e3912f
Update stack style parser
artf Feb 27, 2020
16bbbc7
Improve style parsing for not detached properties
artf Feb 27, 2020
b61ff2e
Search alternaive device target for detached properties
artf Feb 27, 2020
181fa91
Improve also style parsing for detached properties
artf Feb 27, 2020
4431164
Avoid style property status in inner composite types
artf Feb 28, 2020
131a718
Trim values in layers
artf Feb 28, 2020
26813df
Build
artf Feb 28, 2020
f1c72e1
Fix parent style selecting for detached style properties
artf Mar 1, 2020
223f4fe
Pass resultValue to getLayersFromTarget
artf Mar 1, 2020
d8bf63c
Build
artf Mar 1, 2020
1214bbd
Merge pull request #2589 from Skedog/patch-1
artf Mar 1, 2020
3dcffff
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Mar 1, 2020
4c1e74c
Update preview command
artf Mar 1, 2020
ff50488
Preserve the display value on layer hide #2571
artf Mar 1, 2020
84fa97b
Check for href in appendStyles. Fixes #2605
artf Mar 2, 2020
c8ed330
Merge remote-tracking branch 'github/dev' into optional-url-input
jcamejo Mar 3, 2020
377ed27
Adding tests for the optional assets url input
jcamejo Mar 3, 2020
37fe867
Update cash-dom
artf Mar 3, 2020
83754dd
Avoid false positive warnings with traits. Closes #2615
artf Mar 3, 2020
937ea6c
removing missplaced validation
jcamejo Mar 4, 2020
7c1abb5
Merge remote-tracking branch 'github/dev' into optional-url-input
jcamejo Mar 4, 2020
ba27279
Fix ComponentImage's default src not being base64 encoded. Fixes #2619
Mar 4, 2020
626adff
Merge pull request #2602 from jcamejo/optional-url-input
artf Mar 5, 2020
26a108d
Update find method in Component
artf Mar 5, 2020
0523f18
Fix tests
artf Mar 5, 2020
60508ae
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Mar 5, 2020
104f521
Merge pull request #2620 from mcottret/fix/fix-default-image-placehol…
artf Mar 5, 2020
b3033f0
Fix paths
artf Mar 5, 2020
dba5707
Prevent parent selection
artf Mar 8, 2020
a009696
Update SelectComponent
artf Mar 9, 2020
e18a336
Bump v0.16.2
artf Mar 9, 2020
90aa757
fix: replace static bg colors with scss var
yuzhva Mar 9, 2020
32daafd
Escape selectors in CSS code. Fixes #2624
artf Mar 9, 2020
85b7b82
Merge pull request #2633 from YUzhva/fix/style-color-to-var
artf Mar 9, 2020
f96e463
Avoid multiple change events on style property change
artf Mar 12, 2020
1cb5992
Add the translations for dutch language
jorisros Mar 12, 2020
8990199
Make the radio style type work properly in stack
artf Mar 12, 2020
8d233c0
Set new added layers as active
artf Mar 12, 2020
015ab20
Bump acorn from 5.7.3 to 5.7.4
dependabot[bot] Mar 13, 2020
afe843c
Added Persian language
majidh1 Mar 14, 2020
08d78ef
Support default values for detached styles
artf Mar 14, 2020
c56fbc9
Add splitValues helper function to style Property
artf Mar 15, 2020
aeb98b2
Make splitValues work with nested parenthesis
artf Mar 15, 2020
500b431
Improve style preview
artf Mar 15, 2020
d9288f4
Added Brazilian Portuguese language support (#2652)
Joaovjs Mar 15, 2020
0f219fc
Pass parent ref to layers properties
artf Mar 15, 2020
07cc122
Adding placeholder color into a css variable
jcamejo Mar 17, 2020
6aa00b2
Adding placeholder color as an optional value
jcamejo Mar 17, 2020
f225f22
Avoid rendering of private CSS properties
artf Mar 17, 2020
5f09b2c
Improve preview in style layer for detached properties
artf Mar 17, 2020
237926b
Update getFullValue to return the default
artf Mar 17, 2020
57ce2aa
Merge pull request #2643 from jorisros/feature/add-language-nl
artf Mar 18, 2020
d78578f
Merge pull request #2648 from artf/dependabot/npm_and_yarn/acorn-5.7.4
artf Mar 18, 2020
115df42
Merge pull request #2649 from majidh1/dev
artf Mar 18, 2020
7a80547
Fix custom panels not being hidden in preview mode. Fixes artf/grapes…
Mar 19, 2020
ea7cf5f
Add initBaseColorPicker to the editor
artf Mar 19, 2020
9b46fe3
Add `prepend` option to the stack style manager type
artf Mar 19, 2020
633ecf0
Fixed tests
artf Mar 20, 2020
abed236
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Mar 20, 2020
7678b1b
Merge pull request #2669 from mcottret/fix/fix-custom-panels-preview
artf Mar 20, 2020
1f08a08
Remove dots
artf Mar 20, 2020
19cb1cd
fix fa i18n file
artf Mar 21, 2020
1ef2da8
Bump v0.16.3
artf Mar 21, 2020
4fb2aa7
Update canvas tools on input event trigger in components
artf Mar 22, 2020
d587edc
Build
artf Mar 22, 2020
4c95b96
fix name of file pt
Joaovjs Mar 25, 2020
2d148ae
Fix borders not always toggling back when exiting preview. Fixes artf…
Mar 27, 2020
2fb6b3a
Update color picker value when user changes value from input. Fix #2683
longdoan7421 Apr 1, 2020
fce333b
closing color picker if click event happens on canvas, saving the cur…
jcamejo Apr 1, 2020
864068e
Merge pull request #2689 from mcottret/fix/fix-preview-borders-toggling
artf Apr 1, 2020
398509f
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Apr 1, 2020
55493d6
Put the visibility key in a variable
artf Apr 1, 2020
432c480
Update tests
artf Apr 1, 2020
ce81833
Merge pull request #2653 from Joaovjs/pt-language
artf Apr 1, 2020
dba6c83
adding placeholder color and orientation as a CSS class
jcamejo Apr 2, 2020
f65f0d5
Removing unused variables
jcamejo Apr 2, 2020
e060b82
Merge pull request #2695 from jcamejo/color-picker-close-fix Fixes #2467
artf Apr 3, 2020
86778e4
Ensure view on element render
artf Apr 6, 2020
a7b4e64
Merge branch 'fix-leaks' into test-fix-leaks
artf Apr 7, 2020
9806b55
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Apr 7, 2020
af602c3
Merge pull request #2662 from jcamejo/placeholder-color-option
artf Apr 7, 2020
a6cef8d
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Apr 7, 2020
40f443f
Fix bug color picker doesn't update value whenever PropertyView render
longdoan7421 Apr 7, 2020
7edd5b4
Fix style layers memory leaks
artf Apr 8, 2020
7be7554
Update DomainView
artf Apr 8, 2020
54749e2
Fix layers issue on component change
artf Apr 8, 2020
fdf6ad3
Avoid stack element update
artf Apr 8, 2020
aba7c5f
Fix issues with stack property
artf Apr 8, 2020
9cc99f4
Fix PropertyColorView tests
artf Apr 9, 2020
1dd5cc9
Fix ComponentsView tests
artf Apr 9, 2020
0490d42
Limit max stack UndoManager
artf Apr 9, 2020
8a8ce37
Add `closestType` method to Component
artf Apr 9, 2020
7d76db1
Fixes to detached layers
artf Apr 10, 2020
5ea45b7
Improve style property updates
artf Apr 10, 2020
4e14525
Update property
artf Apr 12, 2020
ae3ec0f
Build
artf Apr 12, 2020
864b7fa
Add modules aliases
artf Apr 12, 2020
89087ff
Init refactor
artf Apr 12, 2020
9c435a0
Refactor editor
artf Apr 13, 2020
e08d23c
Move model related stuff from ComponentsView to Components
artf Apr 13, 2020
936e30c
Add getStackGroup method to UndoManager
artf Apr 13, 2020
d9c5ff9
Fix for undo manager
artf Apr 13, 2020
d7e7629
Improve ensure models
artf Apr 13, 2020
ff9d6c6
Fix tests
artf Apr 13, 2020
338bf57
Update canvas
artf Apr 14, 2020
24a27f6
Build
artf Apr 14, 2020
9a3d0e1
Fix TableRow model component. Closes #2697
artf Apr 15, 2020
e094ecd
Merge pull request #2694 from longdoan7421/fix/color-picker-issue
artf Apr 16, 2020
0dba07f
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
artf Apr 16, 2020
09c4e3d
Add `disable` property to blocks
artf Apr 16, 2020
c50c057
Build
artf Apr 16, 2020
ef0e440
Fix custom classes for blocks
artf Apr 17, 2020
254f4de
Add getModelsFromEl for reference
artf Apr 17, 2020
a4058e1
Update NL locale file
artf Apr 22, 2020
d03257d
Add .npmignore
artf Apr 22, 2020
6b21205
Build 0.16.12
artf Apr 22, 2020
995b1ba
Update API docs file
artf Apr 22, 2020
51bbb8d
Update deps
artf Apr 23, 2020
1161250
Update vuepress
artf Apr 23, 2020
80dec9d
Add google analytics plugin to vuepress
artf Apr 23, 2020
e7a3608
bs.js
nedim1511 Apr 25, 2020
20aad8d
Merge pull request #2736 from nedim1511/patch-1
artf Apr 28, 2020
3cba682
fix: sass error when using main.scss in project
8byr0 Apr 30, 2020
bfe9e76
Merge pull request #2747 from 8byr0/patch-1
artf May 6, 2020
1582740
Checking for inputs on the main document as well as the frame. Fix fo…
mattdeigh May 7, 2020
fbfa812
Merge pull request #2756 from mattdeigh/space-trap
artf May 12, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ daysUntilLock: 365
skipCreatedBefore: false

# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
exemptLabels: []
exemptLabels:
- no-locking
- help-wanted

# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: outdated
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ images/
private/
vendor/
coverage/
/locale/
node_modules/
bower_components/
grapesjs-*.tgz
Expand Down
29 changes: 29 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.DS_Store
.settings/
.sass-cache/
.project
.idea
npm-debug.log*
yarn-error.log
yarn.lock
style/.sass-cache/
stats.json

img/
images/
private/
vendor/
coverage/
node_modules/
bower_components/
grapesjs-*.tgz
_index.html
index.html
docs
.github
test
.editorconfig
.eslintrc
.travis.yml
*.md
webpack.config.js
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ $ npm test
* [grapesjs-component-countdown](https://github.com/artf/grapesjs-component-countdown) - Simple countdown component
* [grapesjs-style-gradient](https://github.com/artf/grapesjs-style-gradient) - Add `gradient` type input to the Style Manager
* [grapesjs-style-filter](https://github.com/artf/grapesjs-style-filter) - Add `filter` type input to the Style Manager
* [grapesjs-style-bg](https://github.com/artf/grapesjs-style-bg) - Full-stack background style property type, with the possibility to add images, colors, and gradients
* [grapesjs-blocks-flexbox](https://github.com/artf/grapesjs-blocks-flexbox) - Add the flexbox block
* [grapesjs-lory-slider](https://github.com/artf/grapesjs-lory-slider) - Slider component by using [lory](https://github.com/meandmax/lory)
* [grapesjs-tabs](https://github.com/artf/grapesjs-tabs) - Simple tabs component
Expand All @@ -191,6 +192,7 @@ $ npm test
* [grapesjs-indexeddb](https://github.com/artf/grapesjs-indexeddb) - Storage wrapper for IndexedDB
* [grapesjs-firestore](https://github.com/artf/grapesjs-firestore) - Storage wrapper for [Cloud Firestore](https://firebase.google.com/docs/firestore)
* [grapesjs-parser-postcss](https://github.com/artf/grapesjs-parser-postcss) - Custom CSS parser for GrapesJS by using [PostCSS](https://github.com/postcss/postcss)
* [grapesjs-typed](https://github.com/artf/grapesjs-typed) - Typed component made by wrapping Typed.js library

### Presets
* [grapesjs-preset-webpage](https://github.com/artf/grapesjs-preset-webpage) - Webpage Builder
Expand Down
5 changes: 1 addition & 4 deletions dist/css/grapes.min.css

Large diffs are not rendered by default.

Binary file removed dist/fonts/FontAwesome.otf
Binary file not shown.
Binary file removed dist/fonts/fontawesome-webfont.eot
Binary file not shown.
2,671 changes: 0 additions & 2,671 deletions dist/fonts/fontawesome-webfont.svg

This file was deleted.

Binary file removed dist/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed dist/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file removed dist/fonts/fontawesome-webfont.woff2
Binary file not shown.
Loading