Browse Source

Fix tests

pull/2385/head
Artur Arseniev 7 years ago
parent
commit
52ee89e648
  1. 5
      src/asset_manager/view/AssetsView.js
  2. 9
      src/asset_manager/view/FileUploader.js
  3. 3
      src/block_manager/view/BlockView.js
  4. 4
      src/device_manager/view/DevicesView.js
  5. 2
      src/panels/view/ButtonView.js
  6. 12
      src/selector_manager/view/ClassTagsView.js
  7. 2
      src/style_manager/view/LayerView.js
  8. 2
      src/style_manager/view/PropertyView.js
  9. 2
      src/style_manager/view/SectorView.js
  10. 10
      test/specs/asset_manager/view/FileUploader.js

5
src/asset_manager/view/AssetsView.js

@ -11,9 +11,10 @@ export default Backbone.View.extend({
<div class="${pfx}assets-header">
<form class="${pfx}add-asset">
<div class="${ppfx}field ${pfx}add-field">
<input placeholder="${em.t('assets.inputPlh')}"/>
<input placeholder="${em && em.t('assets.inputPlh')}"/>
</div>
<button class="${ppfx}btn-prim">${em.t('assets.addButton')}</button>
<button class="${ppfx}btn-prim">${em &&
em.t('assets.addButton')}</button>
<div style="clear:both"></div>
</form>
</div>

9
src/asset_manager/view/FileUploader.js

@ -246,17 +246,18 @@ export default Backbone.View.extend(
},
render() {
this.$el.html(
const { $el, pfx, em } = this;
$el.html(
this.template({
title: this.em.t('assets.uploadTitle'),
title: em && em.t('assets.uploadTitle'),
uploadId: this.uploadId,
disabled: this.disabled,
multiUpload: this.multiUpload,
pfx: this.pfx
pfx
})
);
this.initDrop();
this.$el.attr('class', this.pfx + 'file-uploader');
$el.attr('class', pfx + 'file-uploader');
return this;
}
},

3
src/block_manager/view/BlockView.js

@ -139,7 +139,8 @@ export default Backbone.View.extend({
render() {
const { em, el, ppfx, model } = this;
const className = `${ppfx}block`;
const label = em.t(`blocks.labels.${model.id}`) || model.get('label');
const label =
(em && em.t(`blocks.labels.${model.id}`)) || model.get('label');
const render = model.get('render');
const media = model.get('media');
el.className += ` ${className} ${ppfx}one-bg ${ppfx}four-color-h`;

4
src/device_manager/view/DevicesView.js

@ -72,7 +72,7 @@ export default Backbone.View.extend({
collection.each(device => {
const { name, id } = device.attributes;
const label = em.t(`deviceManager.devices.${id}`) || name;
const label = (em && em.t && em.t(`deviceManager.devices.${id}`)) || name;
result += `<option value="${name}">${label}</option>`;
});
@ -84,7 +84,7 @@ export default Backbone.View.extend({
$el.html(
this.template({
ppfx,
deviceLabel: em.t('deviceManager.device')
deviceLabel: em && em.t && em.t('deviceManager.device')
})
);
this.devicesEl = $el.find(`.${ppfx}devices`);

2
src/panels/view/ButtonView.js

@ -57,7 +57,7 @@ export default Backbone.View.extend({
updateAttributes() {
const { em, model, $el } = this;
const attr = model.get('attributes') || {};
const title = em && em.t(`panels.buttons.titles.${model.id}`);
const title = em && em.t && em.t(`panels.buttons.titles.${model.id}`);
$el.attr(attr);
title && $el.attr({ title });

12
src/selector_manager/view/ClassTagsView.js

@ -94,11 +94,13 @@ export default Backbone.View.extend({
let result = [];
states.forEach(state =>
result.push(`<option value="${state.name}">
${em.t(`selectorManager.states.${state.name}`) ||
state.label ||
state.name}
</option>`)
result.push(
`<option value="${state.name}">${em.t(
`selectorManager.states.${state.name}`
) ||
state.label ||
state.name}</option>`
)
);
return result.join('');

2
src/style_manager/view/LayerView.js

@ -11,7 +11,7 @@ export default Backbone.View.extend({
template(model) {
const { pfx, ppfx, em } = this;
const label = `${em.t('styleManager.layer')} ${model.get('index')}`;
const label = `${em && em.t('styleManager.layer')} ${model.get('index')}`;
return `
<div id="${pfx}move" class="${ppfx}no-touch-actions" data-move-layer>

2
src/style_manager/view/PropertyView.js

@ -22,7 +22,7 @@ export default Backbone.View.extend({
const { pfx, em } = this;
const { parent } = model;
const { icon = '', info = '', id, name } = model.attributes;
const label = em.t(`styleManager.properties.${id}`) || name;
const label = (em && em.t(`styleManager.properties.${id}`)) || name;
return `
<span class="${pfx}icon ${icon}" title="${info}">

2
src/style_manager/view/SectorView.js

@ -81,7 +81,7 @@ export default Backbone.View.extend({
render() {
const { pfx, model, em, $el } = this;
const { id, name } = model.attributes;
const label = em.t(`styleManager.sectors.${id}`) || name;
const label = (em && em.t(`styleManager.sectors.${id}`)) || name;
$el.html(this.template({ pfx, label }));
this.$caret = $el.find(`#${pfx}caret`);
this.renderProperties();

10
test/specs/asset_manager/view/FileUploader.js

@ -40,16 +40,6 @@ describe('File Uploader', () => {
});
describe('Interprets configurations correctly', () => {
test('Has correct title', () => {
var view = new FileUploader({
config: {
uploadText: 'Test'
}
});
view.render();
expect(view.$el.find('#title').html()).toEqual('Test');
});
test('Could be disabled', () => {
var view = new FileUploader({
config: {

Loading…
Cancel
Save