From a26e8f78139e2d5e9dd1b715d3f006c7cfe026e8 Mon Sep 17 00:00:00 2001 From: diminator Date: Thu, 2 Jul 2015 18:40:54 +0200 Subject: [PATCH 1/3] test without cors --- js/components/ascribe_uploader/react_s3_fine_uploader.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js index 0b20886d..6c625791 100644 --- a/js/components/ascribe_uploader/react_s3_fine_uploader.js +++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js @@ -106,10 +106,10 @@ var ReactS3FineUploader = React.createClass({ isBrowserPreviewCapable: fineUploader.supportedFeatures.imagePreviews } }, - cors: { - expected: true, - sendCredentials: true - }, + //cors: { + // expected: true, + // sendCredentials: true + //}, chunking: { enabled: true }, From fbba3f4670c322f0fd775478ac7295565a540d1f Mon Sep 17 00:00:00 2001 From: diminator Date: Thu, 2 Jul 2015 18:54:47 +0200 Subject: [PATCH 2/3] staging with cors without uglify and lang error --- gulpfile.js | 4 ++-- js/components/ascribe_uploader/react_s3_fine_uploader.js | 8 ++++---- js/utils/lang_utils.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 25af23bf..d786c29f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -184,8 +184,8 @@ function bundle(watch) { .on('error', notify.onError('Error: <%= error.message %>')) .pipe(gulpif(!argv.production, sourcemaps.write())) // writes .map file .on('error', notify.onError('Error: <%= error.message %>')) - .pipe(gulpif(argv.production, uglify())) - .on('error', notify.onError('Error: <%= error.message %>')) + //.pipe(gulpif(argv.production, uglify())) + //.on('error', notify.onError('Error: <%= error.message %>')) .pipe(gulp.dest('./build/js')) .on('error', notify.onError('Error: <%= error.message %>')) .pipe(browserSync.stream()) diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js index 6c625791..0b20886d 100644 --- a/js/components/ascribe_uploader/react_s3_fine_uploader.js +++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js @@ -106,10 +106,10 @@ var ReactS3FineUploader = React.createClass({ isBrowserPreviewCapable: fineUploader.supportedFeatures.imagePreviews } }, - //cors: { - // expected: true, - // sendCredentials: true - //}, + cors: { + expected: true, + sendCredentials: true + }, chunking: { enabled: true }, diff --git a/js/utils/lang_utils.js b/js/utils/lang_utils.js index 24f82d13..83d51757 100644 --- a/js/utils/lang_utils.js +++ b/js/utils/lang_utils.js @@ -23,7 +23,7 @@ export function getLangText(s, ...args) { } } catch(err) { if(!(s in languages[lang])) { - console.error(new Error('Language-string is not in constants file. Add: "' + s + '" to the "' + lang + '" language file.')); + //console.error(new Error('Language-string is not in constants file. Add: "' + s + '" to the "' + lang + '" language file.')); } else { console.error(err); } From 59cc9cbbcea528e7c5bb24b91cb82594e27d70c7 Mon Sep 17 00:00:00 2001 From: diminator Date: Thu, 2 Jul 2015 19:22:32 +0200 Subject: [PATCH 3/3] coa button --- js/components/edition.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/components/edition.js b/js/components/edition.js index 12352b2e..28bc1e81 100644 --- a/js/components/edition.js +++ b/js/components/edition.js @@ -617,9 +617,11 @@ let CoaDetails = React.createClass({ return (

- + + +