From c22e3ec06e8ba9adb51738a138c7afe4300eac73 Mon Sep 17 00:00:00 2001 From: Juan Date: Wed, 26 Feb 2020 18:17:47 +0100 Subject: [PATCH 1/3] making the external assets form optional --- src/asset_manager/config/config.js | 5 ++++- src/asset_manager/view/AssetsView.js | 23 +++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/asset_manager/config/config.js b/src/asset_manager/config/config.js index 1cd564537..866c83fbc 100644 --- a/src/asset_manager/config/config.js +++ b/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 }; diff --git a/src/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js index ae098d451..53748e711 100644 --- a/src/asset_manager/view/AssetsView.js +++ b/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 = ` +
+
+ +
+ +
+
+ `; + } + return `
-
-
- -
- -
-
+ ${form}
From 377ed274848d218ab0082e075fbadbe8335c8a58 Mon Sep 17 00:00:00 2001 From: Juan Date: Tue, 3 Mar 2020 09:55:38 +0100 Subject: [PATCH 2/3] Adding tests for the optional assets url input --- src/asset_manager/view/AssetsView.js | 2 +- test/specs/asset_manager/view/AssetsView.js | 65 ++++++++++++++++++--- 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/src/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js index 53748e711..6e00630f8 100644 --- a/src/asset_manager/view/AssetsView.js +++ b/src/asset_manager/view/AssetsView.js @@ -56,7 +56,7 @@ export default Backbone.View.extend({ const url = input.value.trim(); const handleAdd = this.config.handleAdd; - if (!url) { + if (!url || !input) { return; } diff --git a/test/specs/asset_manager/view/AssetsView.js b/test/specs/asset_manager/view/AssetsView.js index 328bbc188..853e8edb2 100644 --- a/test/specs/asset_manager/view/AssetsView.js +++ b/test/specs/asset_manager/view/AssetsView.js @@ -14,7 +14,6 @@ describe('AssetsView', () => { globalCollection: new Assets([]), fu: new FileUploader({}) }); - obj = obj; document.body.innerHTML = '
'; 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 = '
'; + 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 = '
'; + 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'); }); }); From 937ea6cb1c74c815fb8a87726c09ada761879ecc Mon Sep 17 00:00:00 2001 From: Juan Date: Wed, 4 Mar 2020 08:57:41 +0100 Subject: [PATCH 3/3] removing missplaced validation --- src/asset_manager/view/AssetsView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js index 6e00630f8..a7fbd7b53 100644 --- a/src/asset_manager/view/AssetsView.js +++ b/src/asset_manager/view/AssetsView.js @@ -53,10 +53,10 @@ 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 || !input) { + if (!url) { return; }