From f781d06112ad333ee0d97b1d484f35c89aeb4ce7 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sat, 9 May 2015 01:03:51 +0200 Subject: [PATCH] refactoring, clone, cypher --- src/Gist/Controller/EditController.php | 6 +- src/Gist/Form/AbstractForm.php | 5 ++ src/Gist/Form/CloneGistForm.php | 60 ++----------------- src/Gist/Form/CreateGistForm.php | 2 +- src/Gist/Resources/views/Edit/clone.html.twig | 7 --- src/Gist/Resources/views/View/view.html.twig | 23 ++----- web/app/js/app.js | 8 ++- 7 files changed, 24 insertions(+), 87 deletions(-) diff --git a/src/Gist/Controller/EditController.php b/src/Gist/Controller/EditController.php index e794292..b023be0 100644 --- a/src/Gist/Controller/EditController.php +++ b/src/Gist/Controller/EditController.php @@ -24,7 +24,7 @@ class EditController extends Controller ); $form = new CreateGistForm($app['form.factory'], $app['translator'], $data); - $form = $form->build(); + $form = $form->build()->getForm(); if ($request->isMethod('post')) { $form->submit($request); @@ -54,7 +54,7 @@ class EditController extends Controller ); $form = new CloneGistForm($app['form.factory'], $app['translator'], $data); - $form = $form->build(); + $form = $form->build()->getForm(); if ($request->isMethod('post')) { $form->submit($request); @@ -63,7 +63,7 @@ class EditController extends Controller try { $gist = $app['gist']->commit($viewOptions['gist'], $form->getData()); } catch (GitException $e) { - + $gist = $viewOptions['gist']; } $history = $app['gist']->getHistory($gist); diff --git a/src/Gist/Form/AbstractForm.php b/src/Gist/Form/AbstractForm.php index cee27f8..93d7721 100644 --- a/src/Gist/Form/AbstractForm.php +++ b/src/Gist/Form/AbstractForm.php @@ -22,5 +22,10 @@ abstract class AbstractForm $this->builder = $formFactory->createBuilder('form', $data); } + public function getForm() + { + return $this->builder->getForm(); + } + abstract public function build(array $options = array()); } diff --git a/src/Gist/Form/CloneGistForm.php b/src/Gist/Form/CloneGistForm.php index dcaddce..ecf4438 100644 --- a/src/Gist/Form/CloneGistForm.php +++ b/src/Gist/Form/CloneGistForm.php @@ -2,70 +2,18 @@ namespace Gist\Form; -use Symfony\Component\Validator\Constraints\NotBlank; - /** * Class CreateGistForm * @author Simon Vieille */ -class CloneGistForm extends AbstractForm +class CloneGistForm extends CreateGistForm { public function build(array $options = array()) { - $this->builder->add( - 'content', - 'textarea', - array( - 'required' => true, - 'attr' => array( - 'class' => 'form-control', - 'rows' => 10, - ), - 'constraints' => array( - new NotBlank(array( - 'message' => $this->translator->trans('form.error.not_blank'), - )), - ), - ) - ); + parent::build($options); - $this->builder->add( - 'type', - 'choice', - array( - 'required' => true, - 'choices' => $this->getTypes(), - 'constraints' => array( - new NotBlank(), - ), - ) - ); + $this->builder->remove('cipher'); - return $this->builder->getForm(); - } - - protected function getTypes() - { - $types = array( - 'xml' => '', - 'css' => '', - 'javascript' => '', - 'php' => '', - 'sql' => '', - 'yaml'=> '', - 'perl' => '', - 'c' => '', - 'asp' => '', - 'python' => '', - 'bash' => '', - 'actionscript3' => '', - 'text' => '', - ); - - foreach ($types as $k => $v) { - $types[$k] = $this->translator->trans('form.type.choice.'.$k); - } - - return $types; + return $this->builder; } } diff --git a/src/Gist/Form/CreateGistForm.php b/src/Gist/Form/CreateGistForm.php index 6d5b640..1bf58eb 100644 --- a/src/Gist/Form/CreateGistForm.php +++ b/src/Gist/Form/CreateGistForm.php @@ -65,7 +65,7 @@ class CreateGistForm extends AbstractForm ) ); - return $this->builder->getForm(); + return $this->builder; } protected function getTypes() diff --git a/src/Gist/Resources/views/Edit/clone.html.twig b/src/Gist/Resources/views/Edit/clone.html.twig index 85147a4..9a416f6 100644 --- a/src/Gist/Resources/views/Edit/clone.html.twig +++ b/src/Gist/Resources/views/Edit/clone.html.twig @@ -41,13 +41,6 @@ {% endfor %} -
- -

diff --git a/src/Gist/Resources/views/View/view.html.twig b/src/Gist/Resources/views/View/view.html.twig index edc28af..9116925 100644 --- a/src/Gist/Resources/views/View/view.html.twig +++ b/src/Gist/Resources/views/View/view.html.twig @@ -35,6 +35,10 @@

{% if not gist.cipher %}
+ + {{ commit|slice(0, 10) }} + + {{ 'gist.action.raw'|trans }} @@ -51,29 +55,14 @@ {% endif %} {{ gist.title ? gist.title : 'gist.untitled'|trans }} +
-
- - {{ commit|slice(0, 10) }} - -
-
-
-
- -
-
-
-
{% if gist.cipher %} - 
{{ raw_content|raw }}
+ 
{{ raw_content|raw }}
{% else %} {{ content|raw }} {% endif %} diff --git a/web/app/js/app.js b/web/app/js/app.js index 6ecc1d4..797bab0 100644 --- a/web/app/js/app.js +++ b/web/app/js/app.js @@ -95,7 +95,9 @@ var mainEditorEvents = function() { } var viewerEvents = function() { - if (0 === $('.syntaxhighlighter').length) { + var $render = $('.syntaxhighlighter'); + + if (0 === $render.length) { return; } @@ -104,10 +106,10 @@ var viewerEvents = function() { var parts = url.split('#key='); if (parts.length === 2) { - var decrypted = CryptoJS.AES.decrypt($('.syntaxhighlighter').html(), parts[1], { + var decrypted = CryptoJS.AES.decrypt($render.html(), parts[1], { format: JsonFormatter }); - $('.syntaxhighlighter').text(decrypted.toString(CryptoJS.enc.Utf8)); + $render.text(decrypted.toString(CryptoJS.enc.Utf8)); SyntaxHighlighter.all(); } });