Browse Source

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

pull/506/merge
Artur Arseniev 8 years ago
parent
commit
69dc02a49d
  1. 1
      src/dom_components/model/ComponentImage.js
  2. 2
      src/dom_components/view/ComponentImageView.js
  3. 1
      src/styles/scss/_gjs_inputs.scss

1
src/dom_components/model/ComponentImage.js

@ -8,6 +8,7 @@ module.exports = Component.extend({
src: '',
void: 1,
droppable: 0,
editable: 1,
highlightable: 0,
resizable: 1,
traits: ['alt']

2
src/dom_components/view/ComponentImageView.js

@ -45,7 +45,7 @@ module.exports = ComponentView.extend({
var em = this.opts.config.em;
var editor = em ? em.get('Editor') : '';
if(editor) {
if(editor && this.model.get('editable')) {
editor.runCommand('open-assets', {
target: this.model,
onSelect() {

1
src/styles/scss/_gjs_inputs.scss

@ -83,6 +83,7 @@
.#{$app-prefix}select option,
.#{$clm-prefix}select option,
.#{$sm-prefix}select option,
.#{$app-prefix}fields option,
.#{$sm-prefix}unit option {
background-color: $mainColor;
color: $fontColor;

Loading…
Cancel
Save