diff --git a/src/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js index 35fda2847..41ee33893 100644 --- a/src/asset_manager/view/AssetsView.js +++ b/src/asset_manager/view/AssetsView.js @@ -11,9 +11,10 @@ export default Backbone.View.extend({
- +
- +
diff --git a/src/asset_manager/view/FileUploader.js b/src/asset_manager/view/FileUploader.js index 2610ef799..f43fa1cda 100644 --- a/src/asset_manager/view/FileUploader.js +++ b/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; } }, diff --git a/src/block_manager/view/BlockView.js b/src/block_manager/view/BlockView.js index e21a1daf4..37fa70b0d 100644 --- a/src/block_manager/view/BlockView.js +++ b/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`; diff --git a/src/device_manager/view/DevicesView.js b/src/device_manager/view/DevicesView.js index dde772cee..e3ba72222 100644 --- a/src/device_manager/view/DevicesView.js +++ b/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 += ``; }); @@ -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`); diff --git a/src/panels/view/ButtonView.js b/src/panels/view/ButtonView.js index f450ddcf3..d9d2caf17 100644 --- a/src/panels/view/ButtonView.js +++ b/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 }); diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js index bb83555c3..cdab8e0af 100644 --- a/src/selector_manager/view/ClassTagsView.js +++ b/src/selector_manager/view/ClassTagsView.js @@ -94,11 +94,13 @@ export default Backbone.View.extend({ let result = []; states.forEach(state => - result.push(``) + result.push( + `` + ) ); return result.join(''); diff --git a/src/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js index 6efda2edc..523b45786 100644 --- a/src/style_manager/view/LayerView.js +++ b/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 `
diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js index 47c999061..0a8712a18 100644 --- a/src/style_manager/view/PropertyView.js +++ b/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 ` diff --git a/src/style_manager/view/SectorView.js b/src/style_manager/view/SectorView.js index 745900c57..af31a13a8 100644 --- a/src/style_manager/view/SectorView.js +++ b/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(); diff --git a/test/specs/asset_manager/view/FileUploader.js b/test/specs/asset_manager/view/FileUploader.js index 914dd9b47..ff78d3950 100644 --- a/test/specs/asset_manager/view/FileUploader.js +++ b/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: {