Browse Source

Lebab obj-shorthand

pull/72/merge
Artur Arseniev 9 years ago
parent
commit
9ae58b63ff
  1. 2
      src/asset_manager/index.js
  2. 4
      src/asset_manager/view/AssetImageView.js
  3. 2
      src/asset_manager/view/AssetsView.js
  4. 2
      src/block_manager/view/BlocksView.js
  5. 4
      src/canvas/view/CanvasView.js
  6. 2
      src/code_manager/model/HtmlGenerator.js
  7. 2
      src/code_manager/model/JsGenerator.js
  8. 2
      src/commands/index.js
  9. 6
      src/commands/view/ExportTemplate.js
  10. 6
      src/commands/view/SelectComponent.js
  11. 2
      src/commands/view/SelectPosition.js
  12. 2
      src/css_composer/index.js
  13. 2
      src/css_composer/view/CssRulesView.js
  14. 8
      src/dom_components/index.js
  15. 2
      src/dom_components/model/ComponentImage.js
  16. 2
      src/dom_components/view/ComponentsView.js
  17. 6
      src/domain_abstract/ui/InputNumber.js
  18. 2
      src/domain_abstract/view/DomainViews.js
  19. 4
      src/grapesjs/index.js
  20. 2
      src/modal_dialog/index.js
  21. 4
      src/navigator/index.js
  22. 2
      src/navigator/view/ItemView.js
  23. 4
      src/navigator/view/ItemsView.js
  24. 6
      src/panels/index.js
  25. 2
      src/panels/view/ButtonsView.js
  26. 2
      src/panels/view/PanelsView.js
  27. 6
      src/parser/model/ParserCss.js
  28. 2
      src/rich_text_editor/index.js
  29. 2
      src/rich_text_editor/view/CommandButtonsView.js
  30. 2
      src/selector_manager/index.js
  31. 2
      src/selector_manager/view/ClassTagsView.js
  32. 2
      src/style_manager/index.js
  33. 2
      src/style_manager/view/LayersView.js
  34. 2
      src/style_manager/view/PropertiesView.js
  35. 2
      src/style_manager/view/SectorsView.js
  36. 2
      src/trait_manager/index.js
  37. 4
      src/utils/index.js

2
src/asset_manager/index.js

@ -119,7 +119,7 @@ module.exports = () => {
* var asset = assetManager.get('http://img.jpg');
*/
get(src) {
return assets.where({src: src})[0];
return assets.where({src})[0];
},
/**

4
src/asset_manager/view/AssetImageView.js

@ -96,9 +96,9 @@ module.exports = AssetView.extend({
name = name && name.length > 30 ? name.substring(0, 30)+'...' : name;
dim = dim ? dim + (this.model.get('unitDim') ? this.model.get('unitDim') : ' px' ) : '';
this.$el.html( this.template({
name: name,
name,
src: this.model.get('src'),
dim: dim,
dim,
pfx: this.pfx,
ppfx: this.ppfx
}));

2
src/asset_manager/view/AssetsView.js

@ -109,7 +109,7 @@ module.exports = Backbone.View.extend({
viewObject = AssetImageView;
var view = new viewObject({
model : model,
model,
config : this.config,
});
var rendered = view.render().el;

2
src/block_manager/view/BlocksView.js

@ -91,7 +91,7 @@ module.exports = Backbone.View.extend({
add(model, fragment) {
var frag = fragment || null;
var view = new BlockView({
model: model,
model,
attributes: model.get('attributes'),
}, this.config);
var rendered = view.render().el;

4
src/canvas/view/CanvasView.js

@ -161,8 +161,8 @@ module.exports = Backbone.View.extend({
var top = eo.top + frmOff.top - cvsOff.top;
var left = eo.left + frmOff.left - cvsOff.left;
return {
top: top,
left: left,
top,
left,
height: el.offsetHeight,
width: el.offsetWidth
};

2
src/code_manager/model/HtmlGenerator.js

@ -9,7 +9,7 @@ module.exports = Backbone.Model.extend({
coll.each(m => {
code += m.toHTML({
cssc: cssc
cssc
});
}, this);

2
src/code_manager/model/JsGenerator.js

@ -12,7 +12,7 @@ module.exports = Backbone.Model.extend({
if (script) {
// If the component has scripts we need to expose his ID
var attr = model.get('attributes');
attr = _.extend({}, attr, {id: id});
attr = _.extend({}, attr, {id});
model.set('attributes', attr);
var scrStr = 'function(){' + script + '}';

2
src/commands/index.js

@ -189,7 +189,7 @@ module.exports = () => {
* },
* });
* */
add: add,
add,
/**
* Get command by ID

6
src/commands/view/ExportTemplate.js

@ -28,9 +28,9 @@ module.exports = {
var $input = $('<textarea>'),
editor = this.codeMirror.clone().set({
label : label,
codeName : codeName,
theme : theme,
label,
codeName,
theme,
input : $input[0],
}),

6
src/commands/view/SelectComponent.js

@ -178,7 +178,7 @@ module.exports = {
return;
}
this.editor.runCommand('show-offset', {
el: el,
el,
elPos: pos,
});
},
@ -199,7 +199,7 @@ module.exports = {
*/
showFixedElementOffset(el, pos) {
this.editor.runCommand('show-offset', {
el: el,
el,
elPos: pos,
state: 'Fixed',
});
@ -373,7 +373,7 @@ module.exports = {
var toolbarEl = this.canvas.getToolbarEl();
var toolbarStyle = toolbarEl.style;
var pos = this.canvas.getTargetToElementDim(toolbarEl, el, {
elPos: elPos,
elPos,
event: 'toolbarPosUpdate',
});
var leftPos = pos.left + pos.elementWidth - pos.targetWidth;

2
src/commands/view/SelectPosition.js

@ -35,7 +35,7 @@ module.exports = {
var canvasOff = this.offset(this.canvas.getElement());
var top = frameOff.top - canvasOff.top;
var left = frameOff.left - canvasOff.left;
return { top: top, left: left };
return { top, left };
},
/**

2
src/css_composer/index.js

@ -34,7 +34,7 @@ module.exports = () => {
return {
Selectors: Selectors,
Selectors,
/**
* Name of the module

2
src/css_composer/view/CssRulesView.js

@ -33,7 +33,7 @@ module.exports = Backbone.View.extend({
var viewObject = CssRuleView;
var view = new viewObject({
model: model,
model,
config: this.config,
});
var rendered = view.render().el;

8
src/dom_components/index.js

@ -164,8 +164,8 @@ module.exports = () => {
component = new Component(c.wrapper, {
sm: c.em,
config: c,
defaultTypes: defaultTypes,
componentTypes: componentTypes,
defaultTypes,
componentTypes,
});
component.set({ attributes: {id: 'wrapper'}});
@ -176,8 +176,8 @@ module.exports = () => {
componentView = new ComponentView({
model: component,
config: c,
defaultTypes: defaultTypes,
componentTypes: componentTypes,
defaultTypes,
componentTypes,
});
return this;
},

2
src/dom_components/model/ComponentImage.js

@ -76,7 +76,7 @@ module.exports = Component.extend({
search: el.search,
hash: el.hash,
port: el.port,
query: query,
query,
};
},

2
src/dom_components/view/ComponentsView.js

@ -59,7 +59,7 @@ module.exports = Backbone.View.extend({
//viewObject = dt[type] ? dt[type].view : dt.default.view;
var view = new viewObject({
model: model,
model,
config: this.config,
defaultTypes: dt,
componentTypes: ct,

6
src/domain_abstract/ui/InputNumber.js

@ -234,15 +234,15 @@ module.exports = Backbone.View.extend({
val = val < min ? min : val;
return {
force: force,
force,
value: val,
unit: unit
unit
};
},
render() {
var ppfx = this.ppfx;
this.$el.html(this.template({ppfx: ppfx}));
this.$el.html(this.template({ppfx}));
this.$el.find('.'+ ppfx +'input-holder').html(this.getInputEl());
this.$el.find('.' + ppfx + 'field-units').html(this.getUnitEl());
this.$el.addClass(this.contClass);

2
src/domain_abstract/view/DomainViews.js

@ -38,7 +38,7 @@ module.exports = Backbone.View.extend({
itemView = this.itemsView[typeField];
}
var view = new itemView({
model: model,
model,
config: this.config
}, this.config);
var rendered = view.render().el;

4
src/grapesjs/index.js

@ -12,9 +12,9 @@
return {
editors: editors,
editors,
plugins: plugins,
plugins,
/**
* Initializes an editor based on passed options

2
src/modal_dialog/index.js

@ -48,7 +48,7 @@ module.exports = () => {
model = new ModalM(c);
modal = new ModalView({
model: model,
model,
config: c,
});

4
src/navigator/index.js

@ -10,8 +10,8 @@ function Navigator(collection, c) {
}
var obj = {
collection: collection,
config: config,
collection,
config,
opened: c.opened || {}
};

2
src/navigator/view/ItemView.js

@ -275,7 +275,7 @@ module.exports = Backbone.View.extend({
editBtnCls: this.editBtnCls,
inputNameCls: this.inputNameCls,
caretCls: this.caretCls,
count: count,
count,
visible: vis,
hidable: this.config.hidable,
prefix: pfx,

4
src/navigator/view/ItemsView.js

@ -22,7 +22,7 @@ module.exports = Backbone.View.extend({
containerSel: '.' + pfx + 'items',
itemSel: '.' + pfx + 'item',
ppfx: this.ppfx,
pfx: pfx,
pfx,
nested: 1
});
}
@ -60,7 +60,7 @@ module.exports = Backbone.View.extend({
var viewObject = ItemView;
var view = new viewObject({
model: model,
model,
config: this.config,
sorter: this.sorter,
isCountable: this.isCountable,

6
src/panels/index.js

@ -124,7 +124,7 @@ module.exports = () => {
* var myPanel = panelManager.getPanel('myNewPanel');
*/
getPanel(id) {
var res = panels.where({id: id});
var res = panels.where({id});
return res.length ? res[0] : null;
},
@ -174,7 +174,7 @@ module.exports = () => {
getButton(panelId, id) {
var pn = this.getPanel(panelId);
if(pn){
var res = pn.get('buttons').where({id: id});
var res = pn.get('buttons').where({id});
return res.length ? res[0] : null;
}
return null;
@ -201,7 +201,7 @@ module.exports = () => {
});
},
Panel: Panel,
Panel,
};
};

2
src/panels/view/ButtonsView.js

@ -35,7 +35,7 @@ module.exports = Backbone.View.extend({
var viewObject = ButtonView;
var view = new viewObject({
model : model,
model,
config : this.config,
parentM : this.parentM
});

2
src/panels/view/PanelsView.js

@ -37,7 +37,7 @@ module.exports = Backbone.View.extend({
var viewObject = PanelView;
var view = new viewObject({
model: model,
model,
config: this.config,
});
var rendered = view.render().el;

6
src/parser/model/ParserCss.js

@ -30,8 +30,8 @@ module.exports = config => ({
}
}
return {
result: result,
add: add,
result,
add,
};
},
@ -109,7 +109,7 @@ module.exports = config => ({
result.push({
selectors: [],
selectorsAdd: selsAddStr,
style: style,
style,
});
}
}

2
src/rich_text_editor/index.js

@ -101,7 +101,7 @@ module.exports = () => {
* var cm = rte.get('fontSize');
*/
get(command) {
return commands.where({command: command})[0];
return commands.where({command})[0];
},
/**

2
src/rich_text_editor/view/CommandButtonsView.js

@ -48,7 +48,7 @@ module.exports = Backbone.View.extend({
if(args)
attrs['data-args'] = args;
var view = new viewObj({
model: model,
model,
attributes: attrs,
}, this.config);

2
src/selector_manager/index.js

@ -126,7 +126,7 @@ module.exports = config => {
* var selector = selectorManager.get('selectorName');
* */
get(name) {
return selectors.where({name: name})[0];
return selectors.where({name})[0];
},
/**

2
src/selector_manager/view/ClassTagsView.js

@ -226,7 +226,7 @@ module.exports = Backbone.View.extend({
var fragment = fragmentEl || null;
var view = new ClassTagView({
model: model,
model,
config: this.config,
coll: this.collection,
});

2
src/style_manager/index.js

@ -129,7 +129,7 @@ module.exports = () => {
* var sector = styleManager.getSector('mySector');
* */
getSector(id) {
var res = sectors.where({id: id});
var res = sectors.where({id});
return res.length ? res[0] : null;
},

2
src/style_manager/view/LayersView.js

@ -56,7 +56,7 @@ module.exports = Backbone.View.extend({
}
var view = new viewObject({
model: model,
model,
stackModel: this.stackModel,
config: this.config,
sorter: this.sorter

2
src/style_manager/view/PropertiesView.js

@ -44,7 +44,7 @@ module.exports = Backbone.View.extend({
}
var view = new objView({
model: model,
model,
name: model.get('name'),
id: this.pfx + model.get('property'),
target: this.target,

2
src/style_manager/view/SectorsView.js

@ -103,7 +103,7 @@ module.exports = Backbone.View.extend({
var viewObject = SectorView;
var view = new viewObject({
model: model,
model,
id: this.pfx + model.get('name').replace(' ','_').toLowerCase(),
name: model.get('name'),
properties: model.get('properties'),

2
src/trait_manager/index.js

@ -7,7 +7,7 @@ module.exports = () => {
return {
TraitsView: TraitsView,
TraitsView,
/**
* Name of the module

4
src/utils/index.js

@ -19,8 +19,8 @@ module.exports = () => {
return this;
},
Sorter: Sorter,
Sorter,
Resizer: Resizer,
Resizer,
};
};

Loading…
Cancel
Save