Skip to content

added a fifth flexslider type, where a fixed width can be set for each image #37

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

Open
OwenRay wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added a fifth flexslider type, where a fixed width can be set for each image #37

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
1 change: 1 addition & 0 deletions Block/Adminhtml/Preview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public function setStyleSlidePreviewTemplate($styleslideParam)
case SliderModel::STYLESLIDE_FLEXSLIDER_TWO:
case SliderModel::STYLESLIDE_FLEXSLIDER_THREE:
case SliderModel::STYLESLIDE_FLEXSLIDER_FOUR:
case SliderModel::STYLESLIDE_FLEXSLIDER_FIVE:
$this->setTemplate(self::STYLESLIDE_FLEXSLIDER_PREVIEW_TEMPLATE);
break;
}
Expand Down
7 changes: 6 additions & 1 deletion Block/Adminhtml/Slider/Edit/Tab/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,11 @@ public function getMappingFieldDependence()
'fieldNameFrom' => 'style_slide',
'refField' => '1,2,3,4,5',
],
[
'fieldName' => ['width'],
'fieldNameFrom' => 'style_slide',
'refField' => '11',
],
[
'fieldName' => 'category_ids',
'fieldNameFrom' => 'position',
Expand Down Expand Up @@ -476,7 +481,7 @@ public function getMappingFieldDependence()
[
'fieldName' => 'slider_speed',
'fieldNameFrom' => 'style_slide',
'refField' => '5,10,',
'refField' => '5,10,11',
'negative' => true,
],
];
Expand Down
9 changes: 9 additions & 0 deletions Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ public function getSliderModeAvailable()
Slider::STYLESLIDE_FLEXSLIDER_TWO => 'FlexSlider 2',
Slider::STYLESLIDE_FLEXSLIDER_THREE => 'FlexSlider 3',
Slider::STYLESLIDE_FLEXSLIDER_FOUR => 'FlexSlider 4',
Slider::STYLESLIDE_FLEXSLIDER_FIVE => 'FlexSlider 5',
];
}

Expand Down Expand Up @@ -211,6 +212,10 @@ public function getStyleSlider()
'label' => __('FlexSlider 4'),
'value' => Slider::STYLESLIDE_FLEXSLIDER_FOUR,
],
[
'label' => __('FlexSlider 5'),
'value' => Slider::STYLESLIDE_FLEXSLIDER_FIVE,
],
],
],
];
Expand Down Expand Up @@ -463,6 +468,10 @@ public function getCoreSlider()
'label' => __('FlexSlider 4'),
'value' => Slider::STYLESLIDE_FLEXSLIDER_FOUR,
],
[
'label' => __('FlexSlider 5'),
'value' => Slider::STYLESLIDE_FLEXSLIDER_FIVE,
],
];
}
}
1 change: 1 addition & 0 deletions Model/Slider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class Slider extends \Magento\Framework\Model\AbstractModel
const STYLESLIDE_FLEXSLIDER_TWO = 8;
const STYLESLIDE_FLEXSLIDER_THREE = 9;
const STYLESLIDE_FLEXSLIDER_FOUR = 10;
const STYLESLIDE_FLEXSLIDER_FIVE = 11;

/**
* position code of note slider.
Expand Down
10 changes: 10 additions & 0 deletions view/adminhtml/templates/slider/preview/flexslider.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ require(['jquery', 'magestore/flexslider'], function($) {
var STYLESLIDE_FLEXSLIDER_ONE = <?php echo \Magestore\Bannerslider\Model\Slider::STYLESLIDE_FLEXSLIDER_ONE ?>;
var STYLESLIDE_FLEXSLIDER_TWO = <?php echo \Magestore\Bannerslider\Model\Slider::STYLESLIDE_FLEXSLIDER_TWO ?>;
var STYLESLIDE_FLEXSLIDER_THREE = <?php echo \Magestore\Bannerslider\Model\Slider::STYLESLIDE_FLEXSLIDER_THREE ?>;
var STYLESLIDE_FLEXSLIDER_FIVE = <?php echo \Magestore\Bannerslider\Model\Slider::STYLESLIDE_FLEXSLIDER_FIVE ?>;

switch (<?php echo $sliderpreviewId ?>) {
case STYLESLIDE_FLEXSLIDER_ONE:
Expand Down Expand Up @@ -62,6 +63,15 @@ require(['jquery', 'magestore/flexslider'], function($) {
sync: "#carousel"
});
break;
case STYLESLIDE_FLEXSLIDER_FIVE:
$('.flexslider').flexslider({
animation: 'slide',
animationLoop: true,
itemWidth: 200,
slideshow: true,
itemMargin: 5
});
break;
default:
$('.flexslider').flexslider({
animation: "slide",
Expand Down
13 changes: 12 additions & 1 deletion view/frontend/templates/slider/flexslider.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ $bannerCollection = $block->getBannerCollection();
$(slider[0]).find('.slides li,.slides li a,.slides li img').css('height', height + 'px');
}
}

$(document).ready(function($) {
var STYLESLIDE_FLEXSLIDER_ONE = <?php echo \Magestore\Bannerslider\Model\Slider::STYLESLIDE_FLEXSLIDER_ONE ?>;
var STYLESLIDE_FLEXSLIDER_TWO = <?php echo \Magestore\Bannerslider\Model\Slider::STYLESLIDE_FLEXSLIDER_TWO ?>;
var STYLESLIDE_FLEXSLIDER_THREE = <?php echo \Magestore\Bannerslider\Model\Slider::STYLESLIDE_FLEXSLIDER_THREE ?>;
var STYLESLIDE_FLEXSLIDER_FIVE = <?php echo \Magestore\Bannerslider\Model\Slider::STYLESLIDE_FLEXSLIDER_FIVE ?>;

switch (<?php echo $styleSlide ?>) {
case STYLESLIDE_FLEXSLIDER_ONE:
Expand Down Expand Up @@ -90,6 +92,15 @@ $bannerCollection = $block->getBannerCollection();
slideshow: true,
sync: '#'+flexSliderSelector + '-carousel',
slideshowSpeed: <?php echo $slider->getSliderSpeed() ?>,
});
break;
case STYLESLIDE_FLEXSLIDER_FIVE:
$('.' + flexSliderSelector).flexslider({
animation: 'slide',
animationLoop: true,
itemWidth: <?php echo $slider->getWidth() ?>,
slideshow: true,
itemMargin: 5,
start: function (slider) {
fitImageSlider(slider);
}
Expand Down Expand Up @@ -165,4 +176,4 @@ $bannerCollection = $block->getBannerCollection();
.flex-viewport .slides li{
margin-bottom: 0px !important;
}
</style>
</style>