dynamic / silverstripe-flexslider

src/ORM/FlexSlider.php

Spacing +31 added lines, -31 removed lines

@@ -108,63 +108,63 @@ 
             ]);
             $SlidesField = GridField::create(
                 'Slides',
-                _t(__CLASS__ . '.SLIDES', 'Slides'),
+                _t(__CLASS__.'.SLIDES', 'Slides'),
                 $this->owner->Slides()->sort('SortOrder'),
                 $config
             );
 
-            $slideTitle = $this->owner->stat('slide_tab_title') ?: _t(__CLASS__ . '.SLIDES', 'Slides');
+            $slideTitle = $this->owner->stat('slide_tab_title') ?: _t(__CLASS__.'.SLIDES', 'Slides');
 
             $animations = [];
             $animationOptions = $this->owner->dbObject('Animation')->getEnum();
             foreach ($animationOptions as $value) {
-                $animations[$value] = _t(__CLASS__ . ".$value", $value);
+                $animations[$value] = _t(__CLASS__.".$value", $value);
             }
 
             $fields->addFieldsToTab("Root.{$slideTitle}", [
                 $SlidesField,
-                ToggleCompositeField::create('ConfigHD', _t(__CLASS__ . '.SettingsLabel', 'Slider Settings'), [
+                ToggleCompositeField::create('ConfigHD', _t(__CLASS__.'.SettingsLabel', 'Slider Settings'), [
                     DropdownField::create(
                         'Animation',
-                        _t(__CLASS__ . '.ANIMATION_OPTION', 'Animation option'),
+                        _t(__CLASS__.'.ANIMATION_OPTION', 'Animation option'),
                         $animations
                     ),
                     CheckboxField::create(
                         'Animate',
-                        _t(__CLASS__ . '.ANIMATE', 'Animate automatically')
+                        _t(__CLASS__.'.ANIMATE', 'Animate automatically')
                     ),
                     CheckboxField::create(
                         'Loop',
-                        _t(__CLASS__ . '.LOOP', 'Loop the carousel')
+                        _t(__CLASS__.'.LOOP', 'Loop the carousel')
                     ),
                     CheckboxField::create(
                         'SliderControlNav',
-                        _t(__CLASS__ . '.CONTROL_NAV', 'Show ControlNav')
+                        _t(__CLASS__.'.CONTROL_NAV', 'Show ControlNav')
                     ),
                     CheckboxField::create(
                         'SliderDirectionNav',
-                        _t(__CLASS__ . '.DIRECTION_NAV', 'Show DirectionNav')
+                        _t(__CLASS__.'.DIRECTION_NAV', 'Show DirectionNav')
                     ),
                     CheckboxField::create(
                         'ThumbnailNav',
-                        _t(__CLASS__ . '.THUMBNAIL_NAV', 'Thumbnail Navigation')
+                        _t(__CLASS__.'.THUMBNAIL_NAV', 'Thumbnail Navigation')
                     ),
                     //DisplayLogicWrapper::create(
                     CheckboxField::create(
                         'CarouselControlNav',
-                        _t(__CLASS__ . '.CAROUSEL_CONTROL_NAV', 'Show Carousel ControlNav')
+                        _t(__CLASS__.'.CAROUSEL_CONTROL_NAV', 'Show Carousel ControlNav')
                     ),
                     CheckboxField::create(
                         'CarouselDirectionNav',
-                        _t(__CLASS__ . '.CAROUSEL_DIRECTION_NAV', 'Show Carousel DirectionNav')
+                        _t(__CLASS__.'.CAROUSEL_DIRECTION_NAV', 'Show Carousel DirectionNav')
                     ),
                     NumericField::create(
                         'CarouselThumbnailCt',
-                        _t(__CLASS__ . '.CAROUSEL_THUMBNAIL_COUNT', 'Number of thumbnails')
+                        _t(__CLASS__.'.CAROUSEL_THUMBNAIL_COUNT', 'Number of thumbnails')
                     ),
                     NumericField::create(
                         'FlexSliderSpeed',
-                        _t(__CLASS__ . '.SLIDER_SPEED', 'Slider Speed')
+                        _t(__CLASS__.'.SLIDER_SPEED', 'Slider Speed')
                     )
                         ->setDescription('In Seconds')
                         ->setScale(2),
@@ -211,7 +211,7 @@ 
         }
 
         // Flexslider options
-        $sync = ($this->owner->ThumbnailNav == true) ? "sync: '.fs-carousel:eq('+index+')'," : '';
+        $sync = ($this->owner->ThumbnailNav==true) ? "sync: '.fs-carousel:eq('+index+')'," : '';
 
         $before = $this->owner->hasMethod('flexSliderBeforeAction')
             ? $this->owner->flexSliderBeforeAction()
@@ -230,18 +230,18 @@ 
 
                          if(jQuery('.fs-carousel').eq(index).length) {
                              jQuery('.fs-carousel').eq(index).flexslider({
-                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean() . ",
+                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean().",
                                 animation: 'slide',
-                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean() . ",
-                                controlNav: " . $this->owner->obj('CarouselControlNav')->NiceAsBoolean() . ",
-                                directionNav: " . $this->owner->obj('CarouselDirectionNav')->NiceAsBoolean() . ",
+                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean().",
+                                controlNav: " . $this->owner->obj('CarouselControlNav')->NiceAsBoolean().",
+                                directionNav: " . $this->owner->obj('CarouselDirectionNav')->NiceAsBoolean().",
                                 prevText: '',
                                 nextText: '',
                                 pausePlay: false,
                                 asNavFor: '.flexslider:eq('+index+')',
-                                minItems: " . $this->owner->obj('CarouselThumbnailCt') . ",
-                                maxItems: " . $this->owner->obj('CarouselThumbnailCt') . ",
-                                move: " . $this->owner->obj('CarouselThumbnailCt') . ",
+                                minItems: " . $this->owner->obj('CarouselThumbnailCt').",
+                                maxItems: " . $this->owner->obj('CarouselThumbnailCt').",
+                                move: " . $this->owner->obj('CarouselThumbnailCt').",
                                 itemWidth: 100,
                                 itemMargin: 10
                               });
@@ -249,22 +249,22 @@ 
 
                         if(jQuery('.flexslider').eq(index).length){
                             jQuery('.flexslider').eq(index).flexslider({
-                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean() . ",
-                                animation: '" . $this->owner->Animation . "',
-                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean() . ",
-                                controlNav: " . $this->owner->obj('SliderControlNav')->NiceAsBoolean() . ",
-                                directionNav: " . $this->owner->obj('SliderDirectionNav')->NiceAsBoolean() . ",
+                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean().",
+                                animation: '" . $this->owner->Animation."',
+                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean().",
+                                controlNav: " . $this->owner->obj('SliderControlNav')->NiceAsBoolean().",
+                                directionNav: " . $this->owner->obj('SliderDirectionNav')->NiceAsBoolean().",
                                 prevText: '',
                                 nextText: '',
                                 pauseOnAction: true,
                                 pauseOnHover: true,
-                                " . $sync . "
+                                " . $sync."
                                 start: function(slider){
                                   $('body').removeClass('loading');
                                 },
-                                before: " . $before . ',
-                                after: ' . $after . ',
-                                slideshowSpeed: ' . $speed . '
+                                before: " . $before.',
+                                after: ' . $after.',
+                                slideshowSpeed: ' . $speed.'
                             });
                         }
                     })

Indentation +199 added lines, -199 removed lines

@@ -37,194 +37,194 @@ 
  */
 class FlexSlider extends DataExtension
 {
-    use Configurable;
+	use Configurable;
 
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Animation' => "Enum('slide, fade', 'slide')",
-        'Loop' => 'Boolean',
-        'Animate' => 'Boolean',
-        'ThumbnailNav' => 'Boolean',
-        'SliderControlNav' => 'Boolean',
-        'SliderDirectionNav' => 'Boolean',
-        'CarouselControlNav' => 'Boolean',
-        'CarouselDirectionNav' => 'Boolean',
-        'CarouselThumbnailCt' => 'Int',
-        'FlexSliderSpeed' => 'Double',
-    ];
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Animation' => "Enum('slide, fade', 'slide')",
+		'Loop' => 'Boolean',
+		'Animate' => 'Boolean',
+		'ThumbnailNav' => 'Boolean',
+		'SliderControlNav' => 'Boolean',
+		'SliderDirectionNav' => 'Boolean',
+		'CarouselControlNav' => 'Boolean',
+		'CarouselDirectionNav' => 'Boolean',
+		'CarouselThumbnailCt' => 'Int',
+		'FlexSliderSpeed' => 'Double',
+	];
 
-    /**
-     * @var array
-     */
-    private static $has_many = [
-        'Slides' => SlideImage::class,
-    ];
+	/**
+	 * @var array
+	 */
+	private static $has_many = [
+		'Slides' => SlideImage::class,
+	];
 
-    /**
-     *
-     */
-    public function populateDefaults()
-    {
-        $this->owner->Loop = 1;
-        $this->owner->Animate = 1;
-        $this->owner->SliderControlNav = 0;
-        $this->owner->SliderDirectionNav = 1;
-        $this->owner->CarouselControlNav = 0;
-        $this->owner->CarouselDirectionNav = 1;
-        $this->owner->CarouselThumbnailCt = 6;
-        $this->owner->FlexSliderSpeed = $this->getDefaultSpeed();
+	/**
+	 *
+	 */
+	public function populateDefaults()
+	{
+		$this->owner->Loop = 1;
+		$this->owner->Animate = 1;
+		$this->owner->SliderControlNav = 0;
+		$this->owner->SliderDirectionNav = 1;
+		$this->owner->CarouselControlNav = 0;
+		$this->owner->CarouselDirectionNav = 1;
+		$this->owner->CarouselThumbnailCt = 6;
+		$this->owner->FlexSliderSpeed = $this->getDefaultSpeed();
 
-        return parent::populateDefaults();
-    }
+		return parent::populateDefaults();
+	}
 
-    /**
-     * @param FieldList $fields
-     */
-    public function updateCMSFields(FieldList $fields)
-    {
-        $fields->removeByName([
-            'Animation',
-            'Loop',
-            'Animate',
-            'ThumbnailNav',
-            'SliderControlNav',
-            'SliderDirectionNav',
-            'CarouselControlNav',
-            'CarouselDirectionNav',
-            'CarouselThumbnailCt',
-            'FlexSliderSpeed',
-            'Slides',
-        ]);
+	/**
+	 * @param FieldList $fields
+	 */
+	public function updateCMSFields(FieldList $fields)
+	{
+		$fields->removeByName([
+			'Animation',
+			'Loop',
+			'Animate',
+			'ThumbnailNav',
+			'SliderControlNav',
+			'SliderDirectionNav',
+			'CarouselControlNav',
+			'CarouselDirectionNav',
+			'CarouselThumbnailCt',
+			'FlexSliderSpeed',
+			'Slides',
+		]);
 
-        // Slides
-        if ($this->owner->ID) {
-            $config = GridFieldConfig_RecordEditor::create();
-            $config->addComponent(new GridFieldOrderableRows('SortOrder'));
-            $config->removeComponentsByType([
-                GridFieldAddExistingAutocompleter::class,
-                GridFieldDeleteAction::class,
-            ]);
-            $SlidesField = GridField::create(
-                'Slides',
-                _t(__CLASS__ . '.SLIDES', 'Slides'),
-                $this->owner->Slides()->sort('SortOrder'),
-                $config
-            );
+		// Slides
+		if ($this->owner->ID) {
+			$config = GridFieldConfig_RecordEditor::create();
+			$config->addComponent(new GridFieldOrderableRows('SortOrder'));
+			$config->removeComponentsByType([
+				GridFieldAddExistingAutocompleter::class,
+				GridFieldDeleteAction::class,
+			]);
+			$SlidesField = GridField::create(
+				'Slides',
+				_t(__CLASS__ . '.SLIDES', 'Slides'),
+				$this->owner->Slides()->sort('SortOrder'),
+				$config
+			);
 
-            $slideTitle = $this->owner->stat('slide_tab_title') ?: _t(__CLASS__ . '.SLIDES', 'Slides');
+			$slideTitle = $this->owner->stat('slide_tab_title') ?: _t(__CLASS__ . '.SLIDES', 'Slides');
 
-            $animations = [];
-            $animationOptions = $this->owner->dbObject('Animation')->getEnum();
-            foreach ($animationOptions as $value) {
-                $animations[$value] = _t(__CLASS__ . ".$value", $value);
-            }
+			$animations = [];
+			$animationOptions = $this->owner->dbObject('Animation')->getEnum();
+			foreach ($animationOptions as $value) {
+				$animations[$value] = _t(__CLASS__ . ".$value", $value);
+			}
 
-            $fields->addFieldsToTab("Root.{$slideTitle}", [
-                $SlidesField,
-                ToggleCompositeField::create('ConfigHD', _t(__CLASS__ . '.SettingsLabel', 'Slider Settings'), [
-                    DropdownField::create(
-                        'Animation',
-                        _t(__CLASS__ . '.ANIMATION_OPTION', 'Animation option'),
-                        $animations
-                    ),
-                    CheckboxField::create(
-                        'Animate',
-                        _t(__CLASS__ . '.ANIMATE', 'Animate automatically')
-                    ),
-                    CheckboxField::create(
-                        'Loop',
-                        _t(__CLASS__ . '.LOOP', 'Loop the carousel')
-                    ),
-                    CheckboxField::create(
-                        'SliderControlNav',
-                        _t(__CLASS__ . '.CONTROL_NAV', 'Show ControlNav')
-                    ),
-                    CheckboxField::create(
-                        'SliderDirectionNav',
-                        _t(__CLASS__ . '.DIRECTION_NAV', 'Show DirectionNav')
-                    ),
-                    CheckboxField::create(
-                        'ThumbnailNav',
-                        _t(__CLASS__ . '.THUMBNAIL_NAV', 'Thumbnail Navigation')
-                    ),
-                    //DisplayLogicWrapper::create(
-                    CheckboxField::create(
-                        'CarouselControlNav',
-                        _t(__CLASS__ . '.CAROUSEL_CONTROL_NAV', 'Show Carousel ControlNav')
-                    ),
-                    CheckboxField::create(
-                        'CarouselDirectionNav',
-                        _t(__CLASS__ . '.CAROUSEL_DIRECTION_NAV', 'Show Carousel DirectionNav')
-                    ),
-                    NumericField::create(
-                        'CarouselThumbnailCt',
-                        _t(__CLASS__ . '.CAROUSEL_THUMBNAIL_COUNT', 'Number of thumbnails')
-                    ),
-                    NumericField::create(
-                        'FlexSliderSpeed',
-                        _t(__CLASS__ . '.SLIDER_SPEED', 'Slider Speed')
-                    )
-                        ->setDescription('In Seconds')
-                        ->setScale(2),
-                ]),
-            ]);
-        }
-    }
+			$fields->addFieldsToTab("Root.{$slideTitle}", [
+				$SlidesField,
+				ToggleCompositeField::create('ConfigHD', _t(__CLASS__ . '.SettingsLabel', 'Slider Settings'), [
+					DropdownField::create(
+						'Animation',
+						_t(__CLASS__ . '.ANIMATION_OPTION', 'Animation option'),
+						$animations
+					),
+					CheckboxField::create(
+						'Animate',
+						_t(__CLASS__ . '.ANIMATE', 'Animate automatically')
+					),
+					CheckboxField::create(
+						'Loop',
+						_t(__CLASS__ . '.LOOP', 'Loop the carousel')
+					),
+					CheckboxField::create(
+						'SliderControlNav',
+						_t(__CLASS__ . '.CONTROL_NAV', 'Show ControlNav')
+					),
+					CheckboxField::create(
+						'SliderDirectionNav',
+						_t(__CLASS__ . '.DIRECTION_NAV', 'Show DirectionNav')
+					),
+					CheckboxField::create(
+						'ThumbnailNav',
+						_t(__CLASS__ . '.THUMBNAIL_NAV', 'Thumbnail Navigation')
+					),
+					//DisplayLogicWrapper::create(
+					CheckboxField::create(
+						'CarouselControlNav',
+						_t(__CLASS__ . '.CAROUSEL_CONTROL_NAV', 'Show Carousel ControlNav')
+					),
+					CheckboxField::create(
+						'CarouselDirectionNav',
+						_t(__CLASS__ . '.CAROUSEL_DIRECTION_NAV', 'Show Carousel DirectionNav')
+					),
+					NumericField::create(
+						'CarouselThumbnailCt',
+						_t(__CLASS__ . '.CAROUSEL_THUMBNAIL_COUNT', 'Number of thumbnails')
+					),
+					NumericField::create(
+						'FlexSliderSpeed',
+						_t(__CLASS__ . '.SLIDER_SPEED', 'Slider Speed')
+					)
+						->setDescription('In Seconds')
+						->setScale(2),
+				]),
+			]);
+		}
+	}
 
-    /**
-     * @return mixed
-     */
-    public function getSlideShow()
-    {
-        $owner = $this->owner;
+	/**
+	 * @return mixed
+	 */
+	public function getSlideShow()
+	{
+		$owner = $this->owner;
 
-        if (!($owner instanceof SiteTree)) {
-            $this->getCustomScript();
-        }
+		if (!($owner instanceof SiteTree)) {
+			$this->getCustomScript();
+		}
 
-        return $this->owner->Slides()->sort('SortOrder');
-    }
+		return $this->owner->Slides()->sort('SortOrder');
+	}
 
-    /**
-     * add requirements to PageController init()
-     */
-    public function contentcontrollerInit()
-    {
-        // only call custom script if page has Slides and DataExtension
-        if (DataObject::has_extension($this->owner->Classname, FlexSlider::class)) {
-            if ($this->owner->getSlideShow()->exists()) {
-                $this->getCustomScript();
-            }
-        }
-    }
+	/**
+	 * add requirements to PageController init()
+	 */
+	public function contentcontrollerInit()
+	{
+		// only call custom script if page has Slides and DataExtension
+		if (DataObject::has_extension($this->owner->Classname, FlexSlider::class)) {
+			if ($this->owner->getSlideShow()->exists()) {
+				$this->getCustomScript();
+			}
+		}
+	}
 
-    /**
-     *
-     */
-    public function getCustomScript()
-    {
+	/**
+	 *
+	 */
+	public function getCustomScript()
+	{
 
-        if ($this->owner->config('clear_requirements')) {
-            return;
-        }
+		if ($this->owner->config('clear_requirements')) {
+			return;
+		}
 
-        // Flexslider options
-        $sync = ($this->owner->ThumbnailNav == true) ? "sync: '.fs-carousel:eq('+index+')'," : '';
+		// Flexslider options
+		$sync = ($this->owner->ThumbnailNav == true) ? "sync: '.fs-carousel:eq('+index+')'," : '';
 
-        $before = $this->owner->hasMethod('flexSliderBeforeAction')
-            ? $this->owner->flexSliderBeforeAction()
-            : 'function(){}';
+		$before = $this->owner->hasMethod('flexSliderBeforeAction')
+			? $this->owner->flexSliderBeforeAction()
+			: 'function(){}';
 
-        $after = $this->owner->hasMethod('flexSliderAfterAction')
-            ? $this->owner->flexSliderAfterAction()
-            : 'function(){}';
+		$after = $this->owner->hasMethod('flexSliderAfterAction')
+			? $this->owner->flexSliderAfterAction()
+			: 'function(){}';
 
-        $speed = $this->getSlideshowSpeed();
+		$speed = $this->getSlideshowSpeed();
 
-        Requirements::customScript(
-            "(function($) {
+		Requirements::customScript(
+			"(function($) {
                 $(document).ready(function(){
                     jQuery('.flexslider').each(function(index){
 
@@ -270,40 +270,40 @@ 
                     })
                 });
             }(jQuery));',
-            'flexsliderjquery'
-        );
-    }
+			'flexsliderjquery'
+		);
+	}
 
-    /**
-     * @return int
-     */
-    public function getSlideshowSpeed()
-    {
-        $speed = $this->owner->FlexSliderSpeed > 0
-            ? $this->owner->FlexSliderSpeed
-            : $this->getDefaultSpeed();
+	/**
+	 * @return int
+	 */
+	public function getSlideshowSpeed()
+	{
+		$speed = $this->owner->FlexSliderSpeed > 0
+			? $this->owner->FlexSliderSpeed
+			: $this->getDefaultSpeed();
 
-        return $speed * 1000;
-    }
+		return $speed * 1000;
+	}
 
-    /**
-     * @return mixed
-     */
-    protected function getDefaultSpeed()
-    {
-        return $this->owner->config()->get('flex_slider_speed')
-            ?: Config::inst()->get(FlexSlider::class, 'flex_slider_speed');
-    }
+	/**
+	 * @return mixed
+	 */
+	protected function getDefaultSpeed()
+	{
+		return $this->owner->config()->get('flex_slider_speed')
+			?: Config::inst()->get(FlexSlider::class, 'flex_slider_speed');
+	}
 
-    /**
-     *
-     */
-    public function onBeforeWrite()
-    {
-        parent::onBeforeWrite();
+	/**
+	 *
+	 */
+	public function onBeforeWrite()
+	{
+		parent::onBeforeWrite();
 
-        if (!$this->owner->CarouselThumbnailCt) {
-            $this->owner->CarouselThumbnailCt = 6;
-        }
-    }
+		if (!$this->owner->CarouselThumbnailCt) {
+			$this->owner->CarouselThumbnailCt = 6;
+		}
+	}
 }