Skip to content

Commit

Permalink
Update to Froala 2.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Guionniere committed Feb 6, 2017
1 parent 679eb34 commit 86e6f3c
Show file tree
Hide file tree
Showing 257 changed files with 5,581 additions and 384 deletions.
21 changes: 21 additions & 0 deletions Controller/MediaController.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,25 @@ public function uploadFileAction(Request $p_request)
// }
}

/**
* Upload a video.
* @param \Symfony\Component\HttpFoundation\Request $p_request
* @return \Symfony\Component\HttpFoundation\JsonResponse
*/
public function uploadVideoAction(Request $p_request)
{
$mediaManager = $this->get( "kms_froala_editor.media_manager" );
$path = $p_request->request->get( "path" );
$folder = $p_request->request->get( "folder" );
$rootDir = $this->get( "kernel" )->getRootDir();
$basePath = $p_request->getBasePath();
// ------------------------- DECLARE ---------------------------//

// FIXME
// if( $request->isXmlHttpRequest() == true )
// {
return $mediaManager->uploadVideo( $p_request->files, $rootDir, $basePath, $folder, $path );
// }
}

}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ kms_froala_editor:
# Default: "/upload".
fileUploadFolder: "/my/upload/folder"
# The file upload URL base.
# The file upload URL base.
# Usage: if you are using URL rewritting for your assets.
# Default: same value as provided as folder.
fileUploadPath: "/my/upload/path"
Expand Down
7 changes: 6 additions & 1 deletion Resources/config/routing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@ kms_froala_editor_load_images:
# File upload
kms_froala_editor_upload_file:
path: /upload_file
defaults: { _controller: KMSFroalaEditorBundle:Media:uploadFile }
defaults: { _controller: KMSFroalaEditorBundle:Media:uploadFile }

# Video upload
kms_froala_editor_upload_video:
path: /upload_video
defaults: { _controller: KMSFroalaEditorBundle:Media:uploadVideo }
7 changes: 0 additions & 7 deletions Resources/public/froala_editor_2.4.0/css/themes/dark.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions Resources/public/froala_editor_2.4.0/css/themes/gray.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions Resources/public/froala_editor_2.4.0/css/themes/red.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions Resources/public/froala_editor_2.4.0/css/themes/royal.min.css

This file was deleted.

12 changes: 0 additions & 12 deletions Resources/public/froala_editor_2.4.0/js/froala_editor.min.js

This file was deleted.

20 changes: 0 additions & 20 deletions Resources/public/froala_editor_2.4.0/js/froala_editor.pkgd.min.js

This file was deleted.

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions Resources/public/froala_editor_2.4.0/js/plugins/forms.min.js

This file was deleted.

Loading

0 comments on commit 86e6f3c

Please sign in to comment.