From 3f0028cecc73529541cb9371c92727d7218b8c37 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 9 Aug 2019 16:40:02 +0200
Subject: [PATCH] Add counters

---
 .../js/jquery.fileupload-ui.js                |   2 +-
 src/Form/ComposeType.php                      |   3 +-
 templates/fediplan/schedule.html.twig         | 103 ++++++++----------
 3 files changed, 48 insertions(+), 60 deletions(-)

diff --git a/public/js/jQuery-File-Upload-10.1.0/js/jquery.fileupload-ui.js b/public/js/jQuery-File-Upload-10.1.0/js/jquery.fileupload-ui.js
index 4135345..a1b2326 100644
--- a/public/js/jQuery-File-Upload-10.1.0/js/jquery.fileupload-ui.js
+++ b/public/js/jQuery-File-Upload-10.1.0/js/jquery.fileupload-ui.js
@@ -182,7 +182,7 @@
           deferred;
         if (data.context) {
           data.context.each(function(index) {
-            var file = files[index] || { error: 'Empty file upload result' };
+            var file = files[index];
             deferred = that._addFinishedDeferreds();
             that._transition($(this)).done(function() {
               var node = $(this);
diff --git a/src/Form/ComposeType.php b/src/Form/ComposeType.php
index 096164b..352cbee 100644
--- a/src/Form/ComposeType.php
+++ b/src/Form/ComposeType.php
@@ -13,6 +13,7 @@ use App\SocialEntity\Compose;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -33,7 +34,7 @@ class ComposeType extends AbstractType {
     {
 
         $builder->add('content_warning');
-        $builder->add('content');
+        $builder->add('content', TextareaType::class);
         $builder->add('visibility', ChoiceType::class,
             [
                 'choices' => [
diff --git a/templates/fediplan/schedule.html.twig b/templates/fediplan/schedule.html.twig
index a56666b..4a07e08 100644
--- a/templates/fediplan/schedule.html.twig
+++ b/templates/fediplan/schedule.html.twig
@@ -41,6 +41,13 @@
                 </div>
             </div>
 
+            <div class="row">
+                <div class=" col-md-6">
+                    <div class="form-group has-feedback">
+                        Counter: <span id="count"></span>
+                    </div>
+                </div>
+            </div>
             <div class="row">
                 <div class=" col-md-3">
                     <div class="form-group has-feedback">
@@ -106,15 +113,6 @@
                             <i class="glyphicon glyphicon-upload"></i>
                             <span>Start upload</span>
                         </button>
-                        <button type="reset" class="btn btn-warning cancel">
-                            <i class="glyphicon glyphicon-ban-circle"></i>
-                            <span>Cancel upload</span>
-                        </button>
-                        <button type="button" class="btn btn-danger delete">
-                            <i class="glyphicon glyphicon-trash"></i>
-                            <span>Delete selected</span>
-                        </button>
-                        <input type="checkbox" class="toggle" />
                         <!-- The global file processing state -->
                         <span class="fileupload-process"></span>
                     </div>
@@ -202,12 +200,6 @@
                           <span>Start</span>
                       </button>
                   {% } %}
-                  {% if (!i) { %}
-                      <button class="btn btn-warning cancel">
-                          <i class="glyphicon glyphicon-ban-circle"></i>
-                          <span>Cancel</span>
-                      </button>
-                  {% } %}
               </td>
           </tr>
       {% } %}
@@ -314,8 +306,19 @@
             $('#fileupload').fileupload({
                 // Uncomment the following to send cross-domain cookies:
                 //xhrFields: {withCredentials: true},
+                doka: Doka.create({ utils: ['crop', 'filter', 'color', 'resize'] }),
+                edit:
+                    Doka.supported() &&
+                    function(file) {
+                        return this.doka.edit(file).then(function(output) {
+                            return output && output.file;
+                        });
+                    },
                 beforeSend: function ( xhr ) {
                     setHeader(xhr);
+                },
+                success: function (data) {
+
                 },
                 url: 'https://{{ instance }}/api/v1/media'
             });
@@ -327,53 +330,37 @@
                 window.location.href.replace(/\/[^/]*$/, '/cors/result.html?%s')
             );
 
-            if (window.location.hostname === 'blueimp.github.io') {
-                // Demo settings:
-                $('#fileupload').fileupload('option', {
-                    url: '//jquery-file-upload.appspot.com/',
-                    // Enable image resizing, except for Android and Opera,
-                    // which actually support image resizing, but fail to
-                    // send Blob objects via XHR requests:
-                    disableImageResize: /Android(?!.*Chrome)|Opera/.test(
-                        window.navigator.userAgent
-                    ),
-                    maxFileSize: 999000,
-                    acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
-                });
-                // Upload server status check for browsers with CORS support:
-                if ($.support.cors) {
-                    $.ajax({
-                        url: '//jquery-file-upload.appspot.com/',
-                        type: 'HEAD'
-                    }).fail(function() {
-                        $('<div class="alert alert-danger"/>')
-                            .text('Upload server currently unavailable - ' + new Date())
-                            .appendTo('#fileupload');
-                    });
-                }
-            } else {
-                // Load existing files:
-                $('#fileupload').addClass('fileupload-processing');
-                $.ajax({
-                    // Uncomment the following to send cross-domain cookies:
-                    //xhrFields: {withCredentials: true},
-                    url: $('#fileupload').fileupload('option', 'url'),
-                    dataType: 'json',
-                    context: $('#fileupload')[0]
+            // Load existing files:
+            $('#fileupload').addClass('fileupload-processing');
+            $.ajax({
+                // Uncomment the following to send cross-domain cookies:
+                //xhrFields: {withCredentials: true},
+                url: $('#fileupload').fileupload('option', 'url'),
+                dataType: 'json',
+                context: $('#fileupload')[0]
+            })
+                .always(function() {
+                    $(this).removeClass('fileupload-processing');
                 })
-                    .always(function() {
-                        $(this).removeClass('fileupload-processing');
-                    })
-                    .done(function(result) {
-                        $(this)
-                            .fileupload('option', 'done')
-                            // eslint-disable-next-line new-cap
-                            .call(this, $.Event('done'), { result: result });
-                    });
-            }
+                .done(function(result) {
+                    $(this)
+                        .fileupload('option', 'done')
+                        // eslint-disable-next-line new-cap
+                        .call(this, $.Event('done'), { result: result });
+                });
         });
         var setHeader = function (xhr) {
             xhr.setRequestHeader('Authorization', '{{ token }}');
         };
     </script>
+
+    <script type="text/javascript">
+        $("#compose_content").keyup(function(){
+            inputText = $(this).val();
+            inputText = inputText
+                .replace(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g, 'xxxxxxxxxxxxxxxxxxxxxxx')
+                .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '$1@$3');
+            $("#count").text(inputText.length);
+        });
+    </script>
 {% endblock %}