Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/artf/grapesjs into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
artf committed Jun 3, 2019
2 parents a8944a0 + 7037e28 commit 60c1755
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Shows a funding button via Open Collective

open_collective: grapesjs
6 changes: 3 additions & 3 deletions src/dom_components/model/Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -757,12 +757,12 @@ const Component = Backbone.Model.extend(Styleable).extend(
* @param {Options} opts Options for the add
* @return {Array} Array of added traits
* @example
* component.addTrat('title', { at: 1 }); // Add title trait (`at` option is the position index)
* component.addTrat({
* component.addTrait('title', { at: 1 }); // Add title trait (`at` option is the position index)
* component.addTrait({
* type: 'checkbox',
* name: 'disabled',
* });
* component.addTrat(['title', {...}, ...]);
* component.addTrait(['title', {...}, ...]);
*/
addTrait(trait, opts = {}) {
const { em } = this;
Expand Down

0 comments on commit 60c1755

Please sign in to comment.