From e064857382e59b9536a61377478ec89248f92221 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 22 Dec 2016 14:34:48 +0100 Subject: [PATCH] Fix the missing text configuration in Asset Manager (#26) --- src/asset_manager/config/config.js | 3 ++- src/asset_manager/main.js | 3 ++- src/asset_manager/template/assets.html | 4 ++-- src/asset_manager/view/AssetsView.js | 3 ++- src/asset_manager/view/FileUploader.js | 8 ++++---- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/asset_manager/config/config.js b/src/asset_manager/config/config.js index 300fdff34..6ee2ad3ff 100644 --- a/src/asset_manager/config/config.js +++ b/src/asset_manager/config/config.js @@ -1,6 +1,5 @@ define(function () { return { - // Default assets assets: [], @@ -13,5 +12,7 @@ define(function () { // Text on upload input uploadText: 'Drop files here or click to upload', + // Label for the add button + addBtnText: 'Add image', }; }); diff --git a/src/asset_manager/main.js b/src/asset_manager/main.js index 55ceda53c..70b09a5e6 100644 --- a/src/asset_manager/main.js +++ b/src/asset_manager/main.js @@ -16,6 +16,7 @@ * @param {Object} config Configurations * @param {Array} [config.assets=[]] Default assets * @param {String} [config.uploadText='Drop files here or click to upload'] Upload text + * @param {String} [config.addBtnText='Add image'] Text for the add button * @param {String} [config.upload=''] Where to send upload data. Expects as return a JSON with asset/s object * as: {data: [{src:'...'}, {src:'...'}]} * @return {this} @@ -219,4 +220,4 @@ define(function(require) { }; }; -}); \ No newline at end of file +}); diff --git a/src/asset_manager/template/assets.html b/src/asset_manager/template/assets.html index 597b99ade..755c899fb 100644 --- a/src/asset_manager/template/assets.html +++ b/src/asset_manager/template/assets.html @@ -2,9 +2,9 @@
- +
- +