tsai
/
grapesjs
mirror of https://github.com/artf/grapesjs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Bump v0.9.1

pull/187/head v0.9.1
Artur Arseniev 9 years ago
parent
2c31c5575b
commit
f6d30a5475
4 changed files with 43 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      dist/grapes.min.js
  2. 48
      index.html
  3. 2
      package.json
  4. 15
      src/dom_components/view/ComponentView.js

6
dist/grapes.min.js
View File

File diff suppressed because one or more lines are too long

48
index.html
View File

@ -14,7 +14,7 @@
<body> <body>
<div id="gjs" style="height:0px; overflow:hidden;"> <div id="gjs" style="height:0px; overflow:hidden;">
<header class="header-banner"> <header class="header-banner">
<div class="container-width" data-gjs-droppable=".blk-row"> <div class="container-width">
<div class="logo-container"> <div class="logo-container">
<div class="logo">GrapesJS</div> <div class="logo">GrapesJS</div>
</div> </div>
@ -786,6 +786,14 @@
height: 75px; height: 75px;
} }
.cell30 {
width: 30%;
}
.cell70 {
width: 70%;
}
@media (max-width: 768px){ @media (max-width: 768px){
.foot-form-cont{ .foot-form-cont{
width:400px; width:400px;
@ -794,7 +802,7 @@
width: auto; width: auto;
} }
.cell { .cell, .cell30, .cell70 {
width: 100%; width: 100%;
display: block; display: block;
} }
@ -911,8 +919,8 @@
category: 'Basic', category: 'Basic',
attributes: {class:'gjs-fonts gjs-f-b37'}, attributes: {class:'gjs-fonts gjs-f-b37'},
content: `<div class="row" data-gjs-droppable=".cell" data-gjs-custom-name="Row"> content: `<div class="row" data-gjs-droppable=".cell" data-gjs-custom-name="Row">
<div class="cell" data-gjs-draggable=".row" style="width:30%" data-gjs-custom-name="Cell"></div> <div class="cell cell30" data-gjs-draggable=".row" data-gjs-custom-name="Cell"></div>
<div class="cell" data-gjs-draggable=".row" style="width:70%" data-gjs-custom-name="Cell"></div> <div class="cell cell70" data-gjs-draggable=".row" data-gjs-custom-name="Cell"></div>
</div>`, </div>`,
},{ },{
id: 'hero', id: 'hero',
@ -1267,22 +1275,22 @@
}]); }]);
var bm = editor.BlockManager; var bm = editor.BlockManager;
bm.add('link-block', { bm.add('link-block', {
label: 'Link Block', label: 'Link Block',
attributes: {class:'fa fa-link'}, attributes: {class:'fa fa-link'},
category: 'Basic', category: 'Basic',
content: { content: {
type:'link', type:'link',
editable: false, editable: false,
droppable: true, droppable: true,
style:{ style:{
display: 'inline-block', display: 'inline-block',
padding: '5px', padding: '5px',
'min-height': '50px', 'min-height': '50px',
'min-width': '50px' 'min-width': '50px'
} }
}, },
}); });
/* /*
// Store and load events // Store and load events

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "grapesjs", "name": "grapesjs",
"description": "Free and Open Source Web Builder Framework", "description": "Free and Open Source Web Builder Framework",
"version": "0.8.21", "version": "0.9.1",
"author": "Artur Arseniev", "author": "Artur Arseniev",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"homepage": "http://grapesjs.com", "homepage": "http://grapesjs.com",

15
src/dom_components/view/ComponentView.js
View File

@ -107,21 +107,28 @@ module.exports = Backbone.View.extend({
var selectedCls = pfx + 'selected'; var selectedCls = pfx + 'selected';
var selectedParentCls = selectedCls + '-parent'; var selectedParentCls = selectedCls + '-parent';
var freezedCls = `${ppfx}freezed`; var freezedCls = `${ppfx}freezed`;
var actualCls = el.getAttribute('class'); var actualCls = el.getAttribute('class') || '';
var cls = '';
switch (status) { switch (status) {
case 'selected': case 'selected':
el.setAttribute('class', `${actualCls} ${selectedCls}`); cls = `${actualCls} ${selectedCls}`;
break; break;
case 'selected-parent': case 'selected-parent':
el.setAttribute('class', `${actualCls} ${selectedParentCls}`); cls = `${actualCls} ${selectedParentCls}`;
break; break;
case 'freezed': case 'freezed':
el.setAttribute('class', `${actualCls} ${freezedCls}`); cls = `${actualCls} ${freezedCls}`;
break; break;
default: default:
this.$el.removeClass(`${selectedCls} ${selectedParentCls} ${freezedCls}`); this.$el.removeClass(`${selectedCls} ${selectedParentCls} ${freezedCls}`);
} }
cls = cls.trim();
if (cls) {
el.setAttribute('class', cls);
}
}, },
/** /**

Write Preview
Loading…
Cancel
Save