Browse Source

Merge branch 'dev' of https://github.com/artf/grapesjs into dev

pull/2997/head
Artur Arseniev 6 years ago
parent
commit
912e5d5d46
  1. 2
      docs/modules/Traits.md
  2. 6
      package-lock.json
  3. 3
      src/style_manager/model/Property.js

2
docs/modules/Traits.md

@ -299,7 +299,7 @@ editor.TraitManager.addType('href-next', {
createInput({ trait }) { createInput({ trait }) {
// Here we can decide to use properties from the trait // Here we can decide to use properties from the trait
const traitOpts = trait.get('options') || []; const traitOpts = trait.get('options') || [];
const options = traitOpts.lenght ? traitOpts : [ const options = traitOpts.length ? traitOpts : [
{ id: 'url', name: 'URL' }, { id: 'url', name: 'URL' },
{ id: 'email', name: 'Email' }, { id: 'email', name: 'Email' },
]; ];

6
package-lock.json

@ -14052,9 +14052,9 @@
"dev": true "dev": true
}, },
"prismjs": { "prismjs": {
"version": "1.20.0", "version": "1.21.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.21.0.tgz",
"integrity": "sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==", "integrity": "sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==",
"dev": true, "dev": true,
"requires": { "requires": {
"clipboard": "^2.0.0" "clipboard": "^2.0.0"

3
src/style_manager/model/Property.js

@ -202,7 +202,8 @@ const Property = Backbone.Model.extend(
} }
if (fn && hasValue) { if (fn && hasValue) {
value = `${fn}(${value})`; const fnParameter = fn === 'url' ? `'${value}'` : value;
value = `${fn}(${fnParameter})`;
} }
if (hasValue && this.get('important')) { if (hasValue && this.get('important')) {

Loading…
Cancel
Save