Browse Source

Merge branch 'dev' of https://github.com/artf/grapesjs into dev

pull/2633/head
Artur Arseniev 6 years ago
parent
commit
60508ae06e
  1. 5
      src/asset_manager/config/config.js
  2. 25
      src/asset_manager/view/AssetsView.js
  3. 65
      test/specs/asset_manager/view/AssetsView.js

5
src/asset_manager/config/config.js

@ -97,5 +97,8 @@ export default {
// var stopUpload = true;
// if(stopUpload) return false;
// }
beforeUpload: null
beforeUpload: null,
// Toggles visiblity of assets url input
showUrlInput: true
};

25
src/asset_manager/view/AssetsView.js

@ -6,17 +6,24 @@ export default Backbone.View.extend({
},
template({ pfx, ppfx, em, ...view }) {
let form = '';
if (this.config.showUrlInput) {
form = `
<form class="${pfx}add-asset">
<div class="${ppfx}field ${pfx}add-field">
<input placeholder="${em && em.t('assetManager.inputPlh')}"/>
</div>
<button class="${ppfx}btn-prim">${em &&
em.t('assetManager.addButton')}</button>
<div style="clear:both"></div>
</form>
`;
}
return `
<div class="${pfx}assets-cont">
<div class="${pfx}assets-header">
<form class="${pfx}add-asset">
<div class="${ppfx}field ${pfx}add-field">
<input placeholder="${em && em.t('assetManager.inputPlh')}"/>
</div>
<button class="${ppfx}btn-prim">${em &&
em.t('assetManager.addButton')}</button>
<div style="clear:both"></div>
</form>
${form}
</div>
<div class="${pfx}assets" data-el="assets"></div>
<div style="clear:both"></div>
@ -46,7 +53,7 @@ export default Backbone.View.extend({
handleSubmit(e) {
e.preventDefault();
const input = this.getAddInput();
const url = input.value.trim();
const url = input && input.value.trim();
const handleAdd = this.config.handleAdd;
if (!url) {

65
test/specs/asset_manager/view/AssetsView.js

@ -14,7 +14,6 @@ describe('AssetsView', () => {
globalCollection: new Assets([]),
fu: new FileUploader({})
});
obj = obj;
document.body.innerHTML = '<div id="fixtures"></div>';
obj.render();
document.body.querySelector('#fixtures').appendChild(obj.el);
@ -68,16 +67,64 @@ describe('AssetsView', () => {
expect(obj.getAssetsEl()).toBeTruthy();
});
test('Returns not empty url input', () => {
expect(obj.getAddInput()).toBeTruthy();
describe('Assets input is enabled', () => {
var obj;
var coll;
coll = new Assets([]);
beforeEach(() => {
var config = {
showUrlInput: true
};
obj = new AssetsView({
config: config,
collection: coll,
globalCollection: new Assets([]),
fu: new FileUploader({})
});
document.body.innerHTML = '<div id="fixtures"></div>';
obj.render();
document.body.querySelector('#fixtures').appendChild(obj.el);
});
test('Returns not empty url input', () => {
expect(obj.getAddInput()).toBeTruthy();
});
test('Add image asset from input string', () => {
obj.getAddInput().value = 'test';
obj.handleSubmit({
preventDefault() {}
});
var asset = obj.options.globalCollection.at(0);
expect(asset.get('src')).toEqual('test');
});
});
test('Add image asset from input string', () => {
obj.getAddInput().value = 'test';
obj.handleSubmit({
preventDefault() {}
describe('Assets inputs is disabled', () => {
var obj;
var coll;
beforeEach(() => {
var config = {
showUrlInput: false
};
coll = new Assets([]);
obj = new AssetsView({
config: config,
collection: coll,
globalCollection: new Assets([]),
fu: new FileUploader({})
});
document.body.innerHTML = '<div id="fixtures"></div>';
obj.render();
document.body.querySelector('#fixtures').appendChild(obj.el);
});
test('No presence of url input', () => {
expect(obj.getAddInput()).toBeFalsy();
});
var asset = obj.options.globalCollection.at(0);
expect(asset.get('src')).toEqual('test');
});
});

Loading…
Cancel
Save