Merge pull request #4 from pixelant/development_new

[TASK] code style PSR2, storage support, main JS rebuild
pixelant · Apr 11, 2017 · a740d01 · a740d01
2 parents dcdc4d0 + b861ecd
commit a740d01
Show file tree

Hide file tree

Showing 68 changed files with 2,398 additions and 1,050 deletions.
diff --git a/Classes/Controller/BaseController.php b/Classes/Controller/BaseController.php
@@ -33,7 +33,8 @@
 /**
  * BaseController
  */
-class BaseController extends ActionController {
+class BaseController extends ActionController
+{
 
     /**
      * feedRepository
@@ -49,7 +50,8 @@ class BaseController extends ActionController {
      * @param string $label
      * @return NULL|string
      */
-    static public function translate($label = '') {
+    public static function translate($label = '')
+    {
         return LocalizationUtility::translate($label, 'pxa_social_feed');
     }
 }
diff --git a/Classes/Controller/FeedsController.php b/Classes/Controller/FeedsController.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pixelant\PxaSocialFeed\Controller;
 
 /***************************************************************
@@ -29,18 +30,61 @@
 /**
  * FeedsController
  */
-class FeedsController extends BaseController {
+class FeedsController extends BaseController
+{
 
     /**
-     * action list
+     * List action
      *
      * @return void
      */
-    public function listAction() {
+    public function listAction()
+    {
         $limit = $this->settings['feedsLimit'] ? intval($this->settings['feedsLimit']) : 10;
 
         $feeds = $this->feedRepository->findFeedsByConfig($this->settings['configuration'], $limit);
 
         $this->view->assign('feeds', $feeds);
     }
+
+    /**
+     * List ajax action
+     * Prepare view for later ajax request
+     *
+     * @return void
+     */
+    public function listAjaxAction()
+    {
+        $this->view->assignMultiple([
+            'configurations' => $this->settings['configuration'],
+            'feedsLimit' => $this->settings['feedsLimit'] ? intval($this->settings['feedsLimit']) : 10
+        ]);
+    }
+
+    /**
+     * Load feed with ajax
+     *
+     * @param string $configurations
+     * @param int $limit
+     * @return void
+     */
+    public function loadFeedAjaxAction($configurations, $limit = 0)
+    {
+        $limit = $limit ? $limit : 10;
+
+        $feeds = $this->feedRepository->findFeedsByConfig($configurations, $limit);
+
+        $this->view->assign('feeds', $feeds);
+
+        header('Content-Type: application/json');
+
+        echo json_encode(
+            [
+                'success' => true,
+                'html' => $this->view->render()
+            ]
+        );
+
+        exit(0);
+    }
 }