wnagrodzki/fediplan
1
0
Fork 0
mirror of https://framagit.org/tom79/fediplan.git synced 2025-04-05 21:51:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add counters

Browse source
This commit is contained in:
Thomas 2019-08-09 16:40:02 +02:00
parent f110074d69
commit 3f0028cecc
3 changed files with 48 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/jQuery-File-Upload-10.1.0/js/jquery.fileupload-ui.js vendored
View file

@ -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);

3
src/Form/ComposeType.php
View file

@ -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' => [

69
templates/fediplan/schedule.html.twig
View file

@ -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,31 +330,6 @@
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({
@ -370,10 +348,19 @@
// 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 %}