Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added ckeditor image upload functionality #62

Merged
merged 1 commit into from
Jul 19, 2013
Merged

Added ckeditor image upload functionality #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Controller/ImageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,17 @@ public function uploadAction(Request $request)

$this->manager->flush();

return $this->generateUploadResponse($id, $image, $file);
// file upload via CKEditor
if ($request->query->get('CKEditor')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably be configured in the class rather.

$response = $this->generateUploadResponse($id, $image, $file);
$data = "<script type='text/javascript'>window.parent.CKEDITOR.tools.callFunction(" . $request->query->get('CKEditorFuncNum') . ", '" . $response->getTargetUrl() . "', 'success');</script>";

$response = new Response($data);
$response->headers->set('Content-Type', 'text/html');
return $response;
} else {
return $this->generateUploadResponse($id, $image, $file);
}
}

private function processResults($images, $offset)
Expand Down
2 changes: 1 addition & 1 deletion Controller/JsloaderController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function __construct(
* @param string $editor the name of the editor to load, currently only
* hallo and hallo-coffee are supported
*/
public function includeJSFilesAction($editor = 'hallo')
public function includeJSFilesAction($editor = 'ckeditor')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i manually merged and reverted this change for now, until the blocking issues are solved

{
if ($this->securityContext && false === $this->securityContext->isGranted($this->requiredRole)) {
return new Response('');
Expand Down
2 changes: 2 additions & 0 deletions Resources/public/js/init-create-ckeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ jQuery(document).ready(function() {
}
});

window.CKEDITOR.config.filebrowserImageUploadUrl = cmfCreateHalloImageUpload;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and this name is weird. we should probably have a controller service per editor and a specific url and a specific twig name for each of them. this one states it would be for hallo.


window.CKEDITOR.basePath = window.CKEDITOR_BASEPATH;
});