Browse Source

Fix regressions

pull/1874/head
Artur Arseniev 8 years ago
parent
commit
f2dc62905a
  1. 2
      src/device_manager/model/Device.js
  2. 4
      src/style_manager/model/Property.js
  3. 1
      test/specs/device_manager/view/DevicesView.js
  4. 2
      test/specs/dom_components/model/Component.js
  5. 3
      test/specs/dom_components/view/ComponentImageView.js

2
src/device_manager/model/Device.js

@ -32,7 +32,7 @@ module.exports = Backbone.Model.extend({
}, },
checkUnit(prop) { checkUnit(prop) {
const pr = this.get(prop); const pr = this.get(prop) || '';
const noUnit = (parseFloat(pr) || 0).toString() === pr.toString(); const noUnit = (parseFloat(pr) || 0).toString() === pr.toString();
noUnit && this.set(prop, `${pr}px`); noUnit && this.set(prop, `${pr}px`);
} }

4
src/style_manager/model/Property.js

@ -43,8 +43,8 @@ const Property = require('backbone').Model.extend(
}, },
initialize(props = {}, opts = {}) { initialize(props = {}, opts = {}) {
const id = this.get('id'); const id = this.get('id') || '';
const name = this.get('name'); const name = this.get('name') || '';
!this.get('property') && !this.get('property') &&
this.set('property', (name || id).replace(/ /g, '-')); this.set('property', (name || id).replace(/ /g, '-'));
const prop = this.get('property'); const prop = this.get('property');

1
test/specs/device_manager/view/DevicesView.js

@ -9,6 +9,7 @@ module.exports = {
var model; var model;
var view; var view;
var editorModel; var editorModel;
var em;
beforeEach(() => { beforeEach(() => {
model = new Devices([]); model = new Devices([]);

2
test/specs/dom_components/model/Component.js

@ -389,7 +389,7 @@ module.exports = {
}); });
test('ComponentImage toHTML', () => { test('ComponentImage toHTML', () => {
obj = new ComponentImage(); obj = new ComponentImage({ src: '' });
expect(obj.toHTML()).toEqual('<img/>'); expect(obj.toHTML()).toEqual('<img/>');
}); });

3
test/specs/dom_components/view/ComponentImageView.js

@ -1,5 +1,5 @@
const ComponentImageView = require('dom_components/view/ComponentImageView'); const ComponentImageView = require('dom_components/view/ComponentImageView');
const Component = require('dom_components/model/Component'); const Component = require('dom_components/model/ComponentImage');
module.exports = { module.exports = {
run() { run() {
@ -21,7 +21,6 @@ module.exports = {
}); });
test('Component empty', () => { test('Component empty', () => {
expect(view.el.getAttribute('onmousedown')).toEqual('return false');
expect(view.el.getAttribute('class')).toEqual(view.classEmpty); expect(view.el.getAttribute('class')).toEqual(view.classEmpty);
}); });

Loading…
Cancel
Save