Browse Source

Bump v0.14.20

pull/1189/head v0.14.20
Artur Arseniev 8 years ago
parent
commit
a950f95961
  1. 23
      dist/grapes.js
  2. 4
      dist/grapes.min.js

23
dist/grapes.js

@ -5016,7 +5016,7 @@ var Component = Backbone.Model.extend(_Styleable2.default).extend({
var defaults = this.defaults; var defaults = this.defaults;
(0, _underscore.forEach)(defaults, function (value, key) { (0, _underscore.forEach)(defaults, function (value, key) {
if (key !== 'type' && obj[key] === value) { if (['type', 'content'].indexOf(key) === -1 && obj[key] === value) {
delete obj[key]; delete obj[key];
} }
}); });
@ -24515,6 +24515,7 @@ module.exports = _backbone2.default.View.extend({
}, },
removeChildren: function removeChildren(removed) { removeChildren: function removeChildren(removed) {
var view = removed.view; var view = removed.view;
if (!view) return;
view.remove.apply(view); view.remove.apply(view);
var children = view.childrenView; var children = view.childrenView;
children && children.stopListening(); children && children.stopListening();
@ -24793,6 +24794,7 @@ module.exports = ComponentView.extend({
toggleEvents: function toggleEvents(enable) { toggleEvents: function toggleEvents(enable) {
var method = enable ? 'on' : 'off'; var method = enable ? 'on' : 'off';
var mixins = { on: _mixins.on, off: _mixins.off }; var mixins = { on: _mixins.on, off: _mixins.off };
this.em.setEditing(enable);
// The ownerDocument is from the frame // The ownerDocument is from the frame
var elDocs = [this.el.ownerDocument, document]; var elDocs = [this.el.ownerDocument, document];
@ -26611,6 +26613,7 @@ var $ = Backbone.$;
module.exports = Backbone.Model.extend({ module.exports = Backbone.Model.extend({
defaults: function defaults() { defaults: function defaults() {
return { return {
editing: 0,
selected: new Collection(), selected: new Collection(),
clipboard: null, clipboard: null,
designerMode: false, designerMode: false,
@ -27259,6 +27262,13 @@ module.exports = Backbone.Model.extend({
this.stopListening(); this.stopListening();
$(this.config.el).empty().attr(this.attrsOrig); $(this.config.el).empty().attr(this.attrsOrig);
}, },
setEditing: function setEditing(value) {
this.set('editing', value);
return this;
},
isEditing: function isEditing() {
return !!this.get('editing');
},
/** /**
@ -42578,7 +42588,7 @@ module.exports = _backbone2.default.View.extend({
body.removeChild(dummy); body.removeChild(dummy);
this.propTarget = target; this.propTarget = target;
var coll = this.collection; var coll = this.collection;
var events = 'component:selected component:update:classes component:update:state change:device'; var events = 'component:toggled component:update:classes component:update:state change:device';
this.listenTo(coll, 'add', this.addTo); this.listenTo(coll, 'add', this.addTo);
this.listenTo(coll, 'reset', this.render); this.listenTo(coll, 'reset', this.render);
this.listenTo(this.target, events, this.targetUpdated); this.listenTo(this.target, events, this.targetUpdated);
@ -46694,6 +46704,7 @@ module.exports = __webpack_require__(0).View.extend({
}, },
removeChildren: function removeChildren(removed) { removeChildren: function removeChildren(removed) {
var view = removed.viewLayer; var view = removed.viewLayer;
if (!view) return;
view.remove.apply(view); view.remove.apply(view);
}, },
@ -49799,7 +49810,7 @@ module.exports = {
module.exports = { module.exports = {
run: function run(ed) { run: function run(ed) {
if (!ed.Canvas.hasFocus()) return; if (!ed.Canvas.hasFocus() || ed.getModel().isEditing()) return;
var toSelect = []; var toSelect = [];
ed.getSelectedAll().forEach(function (component) { ed.getSelectedAll().forEach(function (component) {
@ -49822,7 +49833,7 @@ module.exports = {
module.exports = { module.exports = {
run: function run(ed) { run: function run(ed) {
if (!ed.Canvas.hasFocus()) return; if (!ed.Canvas.hasFocus() || ed.getModel().isEditing()) return;
var toSelect = []; var toSelect = [];
ed.getSelectedAll().forEach(function (component) { ed.getSelectedAll().forEach(function (component) {
@ -49845,7 +49856,7 @@ module.exports = {
module.exports = { module.exports = {
run: function run(ed) { run: function run(ed) {
if (!ed.Canvas.hasFocus()) return; if (!ed.Canvas.hasFocus() || ed.getModel().isEditing()) return;
var toSelect = []; var toSelect = [];
ed.getSelectedAll().forEach(function (component) { ed.getSelectedAll().forEach(function (component) {
@ -49867,7 +49878,7 @@ module.exports = {
module.exports = { module.exports = {
run: function run(ed) { run: function run(ed) {
if (!ed.Canvas.hasFocus()) return; if (!ed.Canvas.hasFocus() || ed.getModel().isEditing()) return;
var toSelect = []; var toSelect = [];
ed.getSelectedAll().forEach(function (component) { ed.getSelectedAll().forEach(function (component) {

4
dist/grapes.min.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save