dynamic / silverstripe-flexslider

tests/FlexSliderTest.php

Indentation +18 added lines, -18 removed lines

@@ -2,26 +2,26 @@
 
 class FlexSliderTest extends FunctionalTest
 {
-    protected static $fixture_file = 'flexslider/tests/FlexSliderTest.yml';
-    protected static $disable_themes = true;
-    protected static $use_draft_site = false;
+	protected static $fixture_file = 'flexslider/tests/FlexSliderTest.yml';
+	protected static $disable_themes = true;
+	protected static $use_draft_site = false;
 
-    public function setUp()
-    {
-        parent::setUp();
+	public function setUp()
+	{
+		parent::setUp();
 
-        ini_set('display_errors', 1);
-        ini_set('log_errors', 1);
-        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-    }
+		ini_set('display_errors', 1);
+		ini_set('log_errors', 1);
+		error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+	}
 
-    public function logOut()
-    {
-        $this->session()->clear('loggedInAs');
-        $this->session()->clear('logInWithPermission');
-    }
+	public function logOut()
+	{
+		$this->session()->clear('loggedInAs');
+		$this->session()->clear('logInWithPermission');
+	}
 
-    public function testFlexSlider()
-    {
-    }
+	public function testFlexSlider()
+	{
+	}
 }

code/FlexSliderExtension.php

Indentation +22 added lines, -22 removed lines

@@ -2,27 +2,27 @@ 
 
 class FlexSliderExtension extends Extension
 {
-    public function onAfterInit()
-    {
+	public function onAfterInit()
+	{
 
-        // Flexslider options
-        $animate = ($this->owner->Animate) ? 'true' : 'false';
-        $loop = ($this->owner->Loop) ? 'true' : 'false';
-        $sync = ($this->owner->ThumbnailNav == true) ? "sync: '#carousel'," : '';
-        $before = (method_exists($this->owner->ClassName, 'flexSliderBeforeAction'))
-            ? $this->owner->flexSliderBeforeAction()
-            : 'function(){}';
-        $after = (method_exists($this->owner->ClassName, 'flexSliderAfterAction'))
-            ? $this->owner->flexSliderAfterAction()
-            : 'function(){}';
-        $speed = (method_exists($this->owner->ClassName, 'setFlexSliderSpeed'))
-            ? $this->owner->setFlexSliderSpeed()
-            : 7000;
+		// Flexslider options
+		$animate = ($this->owner->Animate) ? 'true' : 'false';
+		$loop = ($this->owner->Loop) ? 'true' : 'false';
+		$sync = ($this->owner->ThumbnailNav == true) ? "sync: '#carousel'," : '';
+		$before = (method_exists($this->owner->ClassName, 'flexSliderBeforeAction'))
+			? $this->owner->flexSliderBeforeAction()
+			: 'function(){}';
+		$after = (method_exists($this->owner->ClassName, 'flexSliderAfterAction'))
+			? $this->owner->flexSliderAfterAction()
+			: 'function(){}';
+		$speed = (method_exists($this->owner->ClassName, 'setFlexSliderSpeed'))
+			? $this->owner->setFlexSliderSpeed()
+			: 7000;
 
-        // only call custom script if page has Slides and DataExtension
-        if (Object::has_extension($this->owner->data()->ClassName, 'FlexSlider')) {
-            if ($this->owner->data()->Slides()->exists()) {
-                Requirements::customScript("
+		// only call custom script if page has Slides and DataExtension
+		if (Object::has_extension($this->owner->data()->ClassName, 'FlexSlider')) {
+			if ($this->owner->data()->Slides()->exists()) {
+				Requirements::customScript("
                 (function($) {
                     $(document).ready(function(){
                         $('.flexslider').flexslider({
@@ -45,7 +45,7 @@ 
                         });
                     });
                 }(jQuery));');
-            }
-        }
-    }
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
         // Flexslider options
         $animate = ($this->owner->Animate) ? 'true' : 'false';
         $loop = ($this->owner->Loop) ? 'true' : 'false';
-        $sync = ($this->owner->ThumbnailNav == true) ? "sync: '#carousel'," : '';
+        $sync = ($this->owner->ThumbnailNav==true) ? "sync: '#carousel'," : '';
         $before = (method_exists($this->owner->ClassName, 'flexSliderBeforeAction'))
             ? $this->owner->flexSliderBeforeAction()
             : 'function(){}';

code/SlideImage.php

Indentation +67 added lines, -67 removed lines

@@ -2,84 +2,84 @@
 
 class SlideImage extends DataObject implements PermissionProvider
 {
-    //TODO: move to config.yml
-    private static $defaults = array(
-        'ShowSlide' => true,
-    );
+	//TODO: move to config.yml
+	private static $defaults = array(
+		'ShowSlide' => true,
+	);
 
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-        $ImageField = new UploadField('Image', 'Image');
-        $ImageField->getValidator()->allowedExtensions = array('jpg', 'jpeg', 'gif', 'png');
-        $ImageField->setFolderName('Uploads/SlideImages');
-        $ImageField->setConfig('allowedMaxFileNumber', 1);
-        $ImageField->getValidator()->setAllowedMaxFileSize(FLEXSLIDER_IMAGE_FILE_SIZE_LIMIT);
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+		$ImageField = new UploadField('Image', 'Image');
+		$ImageField->getValidator()->allowedExtensions = array('jpg', 'jpeg', 'gif', 'png');
+		$ImageField->setFolderName('Uploads/SlideImages');
+		$ImageField->setConfig('allowedMaxFileNumber', 1);
+		$ImageField->getValidator()->setAllowedMaxFileSize(FLEXSLIDER_IMAGE_FILE_SIZE_LIMIT);
 
-        $fields->removeByName(array('ShowSlide'));
+		$fields->removeByName(array('ShowSlide'));
 
-        $fields->addFieldsToTab('Root.Main', array(
-            TextField::create('Name')
-                ->setDescription('for internal reference only'),
-            TextField::create('Title')
-                ->setDescription('optional, used in template'),
-            TextareaField::create('Description')
-                ->setDescription('optional, used in template'),
-            TreeDropdownField::create('PageLinkID', 'Choose a page to link to:', 'SiteTree'),
-            $ImageField,
-            CheckboxField::create('ShowSlide')->setTitle('Show Slide')
-                ->setDescription('Include this slide in the slider. Uncheck to hide'),
-        ));
-        $fields->removeByName(array(
-            'SortOrder',
-            'PageID',
-        ));
+		$fields->addFieldsToTab('Root.Main', array(
+			TextField::create('Name')
+				->setDescription('for internal reference only'),
+			TextField::create('Title')
+				->setDescription('optional, used in template'),
+			TextareaField::create('Description')
+				->setDescription('optional, used in template'),
+			TreeDropdownField::create('PageLinkID', 'Choose a page to link to:', 'SiteTree'),
+			$ImageField,
+			CheckboxField::create('ShowSlide')->setTitle('Show Slide')
+				->setDescription('Include this slide in the slider. Uncheck to hide'),
+		));
+		$fields->removeByName(array(
+			'SortOrder',
+			'PageID',
+		));
 
-        $this->extend('updateCMSFields', $fields);
+		$this->extend('updateCMSFields', $fields);
 
-        return $fields;
-    }
+		return $fields;
+	}
 
-    public function validate()
-    {
-        $result = parent::validate();
+	public function validate()
+	{
+		$result = parent::validate();
 
-        if (!$this->Name) {
-            $result->error('A Name is required before you can save');
-        }
+		if (!$this->Name) {
+			$result->error('A Name is required before you can save');
+		}
 
-        if (!$this->ImageID) {
-            $result->error('An Image is required before you can save');
-        }
+		if (!$this->ImageID) {
+			$result->error('An Image is required before you can save');
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function providePermissions()
-    {
-        return array(
-            'Slide_EDIT' => 'Slide Edit',
-            'Slide_DELETE' => 'Slide Delete',
-            'Slide_CREATE' => 'Slide Create',
-        );
-    }
-    public function canCreate($member = null)
-    {
-        return Permission::check('Slide_CREATE');
-    }
+	public function providePermissions()
+	{
+		return array(
+			'Slide_EDIT' => 'Slide Edit',
+			'Slide_DELETE' => 'Slide Delete',
+			'Slide_CREATE' => 'Slide Create',
+		);
+	}
+	public function canCreate($member = null)
+	{
+		return Permission::check('Slide_CREATE');
+	}
 
-    public function canEdit($member = null)
-    {
-        return Permission::check('Slide_EDIT');
-    }
+	public function canEdit($member = null)
+	{
+		return Permission::check('Slide_EDIT');
+	}
 
-    public function canDelete($member = null)
-    {
-        return Permission::check('Slide_DELETE');
-    }
+	public function canDelete($member = null)
+	{
+		return Permission::check('Slide_DELETE');
+	}
 
-    public function canView($member = null)
-    {
-        return true;
-    }
+	public function canView($member = null)
+	{
+		return true;
+	}
 }

tests/SlideImageTest.php

Indentation +91 added lines, -91 removed lines

@@ -2,104 +2,104 @@
 
 class SlideImageTest extends FlexSliderTest
 {
-    protected static $use_draft_site = true;
+	protected static $use_draft_site = true;
 
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testGetCMSFields()
-    {
-        $object = new SlideImage();
-        $fieldset = $object->getCMSFields();
-        $this->assertTrue(is_a($fieldset, 'FieldList'));
-        $this->assertNotNull($fieldset->dataFieldByName('Name'));
-        $this->assertNotNull($fieldset->dataFieldByName('Image'));
-    }
+	public function testGetCMSFields()
+	{
+		$object = new SlideImage();
+		$fieldset = $object->getCMSFields();
+		$this->assertTrue(is_a($fieldset, 'FieldList'));
+		$this->assertNotNull($fieldset->dataFieldByName('Name'));
+		$this->assertNotNull($fieldset->dataFieldByName('Image'));
+	}
 
-    public function testValidateName()
-    {
-        $object = $this->objFromFixture('SlideImage', 'slide1');
-        $object->Name = '';
-        $this->setExpectedException('ValidationException');
-        $object->write();
-    }
+	public function testValidateName()
+	{
+		$object = $this->objFromFixture('SlideImage', 'slide1');
+		$object->Name = '';
+		$this->setExpectedException('ValidationException');
+		$object->write();
+	}
 
-    public function testValidateImage()
-    {
-        $object = $this->objFromFixture('SlideImage', 'slide1');
-        $object->ImageID = '';
-        $this->setExpectedException('ValidationException');
-        $object->write();
-    }
+	public function testValidateImage()
+	{
+		$object = $this->objFromFixture('SlideImage', 'slide1');
+		$object->ImageID = '';
+		$this->setExpectedException('ValidationException');
+		$object->write();
+	}
 
-    public function testCanView()
-    {
-        $object = $this->objFromFixture('SlideImage', 'slide1');
-        $image = $this->objFromFixture('Image', 'image1');
-        $object->ImageID = $image->ID;
-        $object->write();
-        $this->logInWithPermission('ADMIN');
-        $this->assertTrue($object->canView());
-        $this->logOut();
-        $nullMember = Member::create();
-        $nullMember->write();
-        $this->assertTrue($object->canView($nullMember));
-        $nullMember->delete();
-    }
+	public function testCanView()
+	{
+		$object = $this->objFromFixture('SlideImage', 'slide1');
+		$image = $this->objFromFixture('Image', 'image1');
+		$object->ImageID = $image->ID;
+		$object->write();
+		$this->logInWithPermission('ADMIN');
+		$this->assertTrue($object->canView());
+		$this->logOut();
+		$nullMember = Member::create();
+		$nullMember->write();
+		$this->assertTrue($object->canView($nullMember));
+		$nullMember->delete();
+	}
 
-    public function testCanEdit()
-    {
-        $object = $this->objFromFixture('SlideImage', 'slide1');
-        $image = $this->objFromFixture('Image', 'image1');
-        $object->ImageID = $image->ID;
-        $object->write();
-        $objectID = $object->ID;
-        $this->logInWithPermission('ADMIN');
-        $originalName = $object->Name;
-        $this->assertEquals($originalName, 'Hello World');
-        $this->assertTrue($object->canEdit());
-        $object->Name = 'Changed Name';
-        $object->write();
-        $testEdit = SlideImage::get()->byID($objectID);
-        $this->assertEquals($testEdit->Name, 'Changed Name');
-        $this->logOut();
-    }
+	public function testCanEdit()
+	{
+		$object = $this->objFromFixture('SlideImage', 'slide1');
+		$image = $this->objFromFixture('Image', 'image1');
+		$object->ImageID = $image->ID;
+		$object->write();
+		$objectID = $object->ID;
+		$this->logInWithPermission('ADMIN');
+		$originalName = $object->Name;
+		$this->assertEquals($originalName, 'Hello World');
+		$this->assertTrue($object->canEdit());
+		$object->Name = 'Changed Name';
+		$object->write();
+		$testEdit = SlideImage::get()->byID($objectID);
+		$this->assertEquals($testEdit->Name, 'Changed Name');
+		$this->logOut();
+	}
 
-    public function testCanDelete()
-    {
-        $object = $this->objFromFixture('SlideImage', 'slide1');
-        $image = $this->objFromFixture('Image', 'image1');
-        $object->ImageID = $image->ID;
-        $object->write();
-        $this->logInWithPermission('ADMIN');
-        $this->assertTrue($object->canDelete());
-        $checkObject = $object;
-        $object->delete();
-        $this->assertEquals($checkObject->ID, 0);
-    }
+	public function testCanDelete()
+	{
+		$object = $this->objFromFixture('SlideImage', 'slide1');
+		$image = $this->objFromFixture('Image', 'image1');
+		$object->ImageID = $image->ID;
+		$object->write();
+		$this->logInWithPermission('ADMIN');
+		$this->assertTrue($object->canDelete());
+		$checkObject = $object;
+		$object->delete();
+		$this->assertEquals($checkObject->ID, 0);
+	}
 
-    public function testCanCreate()
-    {
-        $object = singleton('SlideImage');
-        $this->logInWithPermission('ADMIN');
-        $this->assertTrue($object->canCreate());
-        $this->logOut();
-        $nullMember = Member::create();
-        $nullMember->write();
-        $this->assertFalse($object->canCreate($nullMember));
-        $nullMember->delete();
-    }
+	public function testCanCreate()
+	{
+		$object = singleton('SlideImage');
+		$this->logInWithPermission('ADMIN');
+		$this->assertTrue($object->canCreate());
+		$this->logOut();
+		$nullMember = Member::create();
+		$nullMember->write();
+		$this->assertFalse($object->canCreate($nullMember));
+		$nullMember->delete();
+	}
 
-    public function testProvidePermissions()
-    {
-        $object = singleton('SlideImage');
-        $expected = array(
-            'Slide_EDIT' => 'Slide Edit',
-            'Slide_DELETE' => 'Slide Delete',
-            'Slide_CREATE' => 'Slide Create',
-        );
-        $this->assertEquals($expected, $object->providePermissions());
-    }
+	public function testProvidePermissions()
+	{
+		$object = singleton('SlideImage');
+		$expected = array(
+			'Slide_EDIT' => 'Slide Edit',
+			'Slide_DELETE' => 'Slide Delete',
+			'Slide_CREATE' => 'Slide Create',
+		);
+		$this->assertEquals($expected, $object->providePermissions());
+	}
 }

tests/FlexSliderDataExtensionTest.php

Indentation +23 added lines, -23 removed lines

@@ -2,31 +2,31 @@
 
 class FlexSliderDataExtensionTest extends FlexSliderTest
 {
-    public function testUpdateCMSFields()
-    {
-        $extension = new FlexSlider();
-        $object = Page::create();
-        $fields = $object->getCMSFields();
-        $extension->updateCMSFields($fields);
-        $this->assertNull($fields->dataFieldByName('Slides'));
+	public function testUpdateCMSFields()
+	{
+		$extension = new FlexSlider();
+		$object = Page::create();
+		$fields = $object->getCMSFields();
+		$extension->updateCMSFields($fields);
+		$this->assertNull($fields->dataFieldByName('Slides'));
 
-        $object->write();
-        $fields = $object->getCMSFields();
-        $extension->updateCMSFields($fields);
-        $this->assertNotNull($fields->dataFieldbyName('Slides'));
-    }
+		$object->write();
+		$fields = $object->getCMSFields();
+		$extension->updateCMSFields($fields);
+		$this->assertNotNull($fields->dataFieldbyName('Slides'));
+	}
 
-    public function testGetSlideshow()
-    {
-        $object = singleton('Page');
-        $object->write();
-        $slide1 = $this->objFromFixture('SlideImage', 'slide1');
-        $image = $this->objFromFixture('Image', 'image1');
-        $slide1->ImageID = $image->ID;
-        $object->Slides()->add($slide1);
-        $slides = $object->SlideShow();
-        $this->assertInstanceOf('DataList', $slides);
-    }
+	public function testGetSlideshow()
+	{
+		$object = singleton('Page');
+		$object->write();
+		$slide1 = $this->objFromFixture('SlideImage', 'slide1');
+		$image = $this->objFromFixture('Image', 'image1');
+		$slide1->ImageID = $image->ID;
+		$object->Slides()->add($slide1);
+		$slides = $object->SlideShow();
+		$this->assertInstanceOf('DataList', $slides);
+	}
 }
 
 

code/FlexSlider.php

Indentation +51 added lines, -51 removed lines

@@ -2,61 +2,61 @@
 
 class FlexSlider extends DataExtension
 {
-    public static $db = array(
-        'Animation' => "Enum('slide, fade', 'slide')",
-        'Loop' => 'Boolean',
-        'Animate' => 'Boolean',
-        'ThumbnailNav' => 'Boolean',
-    );
+	public static $db = array(
+		'Animation' => "Enum('slide, fade', 'slide')",
+		'Loop' => 'Boolean',
+		'Animate' => 'Boolean',
+		'ThumbnailNav' => 'Boolean',
+	);
 
-    public static $has_many = array(
-        'Slides' => 'SlideImage',
-    );
+	public static $has_many = array(
+		'Slides' => 'SlideImage',
+	);
 
-    public static $defaults = array(
-        'Loop' => '1',
-        'Animate' => '1',
-    );
+	public static $defaults = array(
+		'Loop' => '1',
+		'Animate' => '1',
+	);
 
-    public function populateDefaults()
-    {
-        parent::populateDefaults();
-        $this->Loop = 1;
-        $this->Animate = 1;
-    }
+	public function populateDefaults()
+	{
+		parent::populateDefaults();
+		$this->Loop = 1;
+		$this->Animate = 1;
+	}
 
-    public function updateCMSFields(FieldList $fields)
-    {
-        // Slides
-        if ($this->owner->ID) {
-            $config = GridFieldConfig_RecordEditor::create();
-            if (class_exists('GridFieldSortableRows')) {
-                $config->addComponent(new GridFieldSortableRows('SortOrder'));
-            }
-            if (class_exists('GridFieldBulkUpload')) {
-                $config->addComponent(new GridFieldBulkUpload());
-                $config->addComponent(new GridFieldBulkManager());
-            }
-            $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-            $config->removeComponentsByType('GridFieldDeleteAction');
-            $config->addComponent(new GridFieldDeleteAction(false));
-            $SlidesField = GridField::create('Slides', 'Slides', $this->owner->Slides()->sort('SortOrder'), $config);
+	public function updateCMSFields(FieldList $fields)
+	{
+		// Slides
+		if ($this->owner->ID) {
+			$config = GridFieldConfig_RecordEditor::create();
+			if (class_exists('GridFieldSortableRows')) {
+				$config->addComponent(new GridFieldSortableRows('SortOrder'));
+			}
+			if (class_exists('GridFieldBulkUpload')) {
+				$config->addComponent(new GridFieldBulkUpload());
+				$config->addComponent(new GridFieldBulkManager());
+			}
+			$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
+			$config->removeComponentsByType('GridFieldDeleteAction');
+			$config->addComponent(new GridFieldDeleteAction(false));
+			$SlidesField = GridField::create('Slides', 'Slides', $this->owner->Slides()->sort('SortOrder'), $config);
 
-            $fields->addFieldsToTab('Root.Slides', array(
-                HeaderField::create('SliderHD', 'Slides', 3),
-                $SlidesField,
-                ToggleCompositeField::create('ConfigHD', 'Slider Settings', array(
-                    CheckboxField::create('Animate', 'Animate automatically'),
-                    DropdownField::create('Animation', 'Animation option', $this->owner->dbObject('Animation')->enumValues()),
-                    CheckboxField::create('Loop', 'Loop the carousel'),
-                    //CheckboxField::create('ThumbnailNav', 'Thumbnail Navigation'),
-                )),
-            ));
-        }
-    }
+			$fields->addFieldsToTab('Root.Slides', array(
+				HeaderField::create('SliderHD', 'Slides', 3),
+				$SlidesField,
+				ToggleCompositeField::create('ConfigHD', 'Slider Settings', array(
+					CheckboxField::create('Animate', 'Animate automatically'),
+					DropdownField::create('Animation', 'Animation option', $this->owner->dbObject('Animation')->enumValues()),
+					CheckboxField::create('Loop', 'Loop the carousel'),
+					//CheckboxField::create('ThumbnailNav', 'Thumbnail Navigation'),
+				)),
+			));
+		}
+	}
 
-    public function SlideShow()
-    {
-        return $this->owner->Slides()->filter(array('ShowSlide' => 1))->sort('SortOrder');
-    }
+	public function SlideShow()
+	{
+		return $this->owner->Slides()->filter(array('ShowSlide' => 1))->sort('SortOrder');
+	}
 }