Browse Source

Make ComponentTextView fetch content from getChildrenContainer on RTE chnage

pull/79/merge v0.5.15
Artur Arseniev 10 years ago
parent
commit
7d8997fae1
  1. 2
      bower.json
  2. 8
      dist/grapes.min.js
  3. 2
      package.json
  4. 10
      src/dom_components/view/ComponentTextView.js

2
bower.json

@ -1,7 +1,7 @@
{ {
"name": "grapesjs", "name": "grapesjs",
"description": "Open source Web Template Editor", "description": "Open source Web Template Editor",
"version": "0.5.12", "version": "0.5.15",
"author": "Artur Arseniev", "author": "Artur Arseniev",
"homepage": "http://grapesjs.com", "homepage": "http://grapesjs.com",
"main": [ "main": [

8
dist/grapes.min.js

File diff suppressed because one or more lines are too long

2
package.json

@ -1,7 +1,7 @@
{ {
"name": "grapesjs", "name": "grapesjs",
"description": "Open source Web Template Editor", "description": "Open source Web Template Editor",
"version": "0.5.12", "version": "0.5.15",
"author": "Artur Arseniev", "author": "Artur Arseniev",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"homepage": "http://grapesjs.com", "homepage": "http://grapesjs.com",

10
src/dom_components/view/ComponentTextView.js

@ -48,9 +48,10 @@ define(['backbone', './ComponentView'],
try { try {
this.rte.detach(this, this.activeRte); this.rte.detach(this, this.activeRte);
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
model.set('content', this.el.innerHTML); var el = this.getChildrenContainer();
model.set('content', el.innerHTML);
} }
if(!this.rte.customRte && editable) { if(!this.rte.customRte && editable) {
@ -73,13 +74,14 @@ define(['backbone', './ComponentView'],
* Parse content and re-render it * Parse content and re-render it
* @private * @private
*/ */
parseRender: function(){ parseRender: function() {
var el = this.getChildrenContainer();
var comps = this.model.get('components'); var comps = this.model.get('components');
var opts = {silent: true}; var opts = {silent: true};
// Avoid re-render on reset with silent option // Avoid re-render on reset with silent option
comps.reset(null, opts); comps.reset(null, opts);
comps.add(this.$el.html(), opts); comps.add(el.innerHTML, opts);
this.model.set('content', ''); this.model.set('content', '');
this.render(); this.render();

Loading…
Cancel
Save