From 48d44c0a301d20e68931135417afe50f6a64179d Mon Sep 17 00:00:00 2001 From: ddejongh Date: Fri, 19 Jun 2015 11:01:06 +0200 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar Conflicts: js/routes.js --- js/components/register_piece.js | 65 ++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/js/components/register_piece.js b/js/components/register_piece.js index 77ef24c3..78c6c783 100644 --- a/js/components/register_piece.js +++ b/js/components/register_piece.js @@ -2,10 +2,73 @@ import React from 'react'; +import AppConstants from '../constants/application_constants'; +import fineUploader from 'fineUploader'; + +import ReactS3FineUploader from 'ReactS3FineUploader'; + let RegisterPiece = React.createClass( { render() { return ( - test +
+ Upload is not functional in IE7 as IE7 has no support for CORS!' + }} + formatFileName={(name) => {// fix maybe + if (name !== undefined && name.length > 26) { + name = name.slice(0, 15) + '...' + name.slice(-15); + } + return name; + }} + multiple={true}/> +
); } });