WordPress.org
Get WordPress

Plugin Directory

Changeset 1825761


Ignore:
Timestamp:
02/21/2018 01:14:32 AM (8 years ago)
Author:
jssor
Message:

version 3.1.15

Location:
jssor-slider/trunk
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • jssor-slider/trunk/config/config.php

    r1820989 r1825761  
    1414
    1515if (!defined('WP_JSSOR_SLIDER_VERSION')) {
    16     define('WP_JSSOR_SLIDER_VERSION', '3.1.14');
     16    define('WP_JSSOR_SLIDER_VERSION', '3.1.15');
    1717}
    1818
    1919if (!defined('WP_JSSOR_MIN_JS_VERSION')) {
    20     define('WP_JSSOR_MIN_JS_VERSION', '27.0.4');
     20    define('WP_JSSOR_MIN_JS_VERSION', '27.0.3');
    2121}
    2222

  • jssor-slider/trunk/includes/bll/class-jssor-slider-slider.php

    r1813491 r1825761  
    10141014            }
    10151015        }
    1016         if (!empty($slide_json_model->thumb) && !empty($slide_json_model->thumb->images)) {
     1016        if (isset($slide_json_model->thumb) && !empty($slide_json_model->thumb) && isset($slide_json_model->thumb->images) && !empty($slide_json_model->thumb->images)) {
    10171017            foreach ($slide_json_model->thumb->images as $t_key => $t_value) {
    10181018                if (!empty($t_value)) {

  • jssor-slider/trunk/includes/bll/gencode/class-wjssl-slider-build-converter.php

    r1813491 r1825761  
    14401440                    }
    14411441
    1442                     $layerHas3dMotion = $layerHas3dMotion || $childHas3dMotion;
     1442                    //$layerHas3dMotion = $layerHas3dMotion || $childHas3dMotion;
    14431443                    $runtimeLayer->has3dMotion = $layerHas3dMotion;
    14441444                    $layersHas3dMotion = $layersHas3dMotion || $layerHas3dMotion;

  • jssor-slider/trunk/includes/bll/gencode/class-wjssl-slider-code-document.php

    r1813491 r1825761  
    386386            #endregion
    387387            #endregion
     388
    388389            #region child elements
     390
     391            $has3dMotion = false;
     392
    389393            if (!empty($runtimeLayer->children))
    390394            {
    … …  
    395399                    {
    396400                        $layerNode->appendChild($childLayerNode);
    397                     }
    398                 }
    399             }
     401
     402                        $has3dMotion = $has3dMotion || $runtimeLayer->has3dMotion;
     403                    }
     404                }
     405            }
     406
    400407            #endregion
    401408        }
    … …  
    439446            $slideNode->setAttribute("data-b", $runtimeSlide->slideoBreakIndex);
    440447        }
    441         //$perspective
    442         //$perspective origin
    443         if (WjsslSliderBuildHelper::HasValue($runtimeSlide->pDepth))
    444         {
    445             $perspective = ($runtimeDocument->Layouts->layout->slideWidth + $runtimeDocument->Layouts->layout->slideHeight) * $runtimeSlide->pDepth / 2;
    446             $slideNode->setAttribute("data-p", $perspective);
    447             $this->BuildPercentAttribute($slideNode, "data-po", $runtimeSlide->poX, $runtimeSlide->poY);
    448         }
    449448        if (WjsslSliderBuildHelper::HasValue($runtimeSlide->idle))
    450449        {
    … …  
    465464        #endregion
    466465        #endregion
     466
    467467        #region child elements
    468         foreach ($runtimeSlide->layers as $runtimeLayer)
    469         {
    470             $layerNode = $this->BuildLayerNode($runtimeLayer, !$isLinkSlide, $runtimeDocument, $htmlDocument);
    471             if (!empty($layerNode))
    472             {
    473                 $slideNode->appendChild($layerNode);
    474             }
    475         }
     468
     469        $has3dMotion = false;
     470
     471        if(WjsslSliderBuildHelper::HasValue($runtimeSlide->layers)) {
     472            foreach ($runtimeSlide->layers as $runtimeLayer)
     473            {
     474                $layerNode = $this->BuildLayerNode($runtimeLayer, !$isLinkSlide, $runtimeDocument, $htmlDocument);
     475                if (!empty($layerNode))
     476                {
     477                    $slideNode->appendChild($layerNode);
     478
     479                    $has3dMotion = $has3dMotion || $runtimeLayer->has3dMotion;
     480                }
     481            }
     482        }
     483
    476484        $runtimeThumbnails = $runtimeDocument->Layouts->thumbnails;
     485
    477486        if (!empty($runtimeThumbnails))
    478487        {
    … …  
    493502                    }
    494503                }
     504
    495505                if (!WjsslSliderBuildHelper::EmptyOrWhiteSpace($runtimeSlide->image))
    496506                {
    … …  
    503513                    }
    504514                }
     515
    505516                $thumbnailNodeString = null;
    506                 if (!WjsslSliderBuildHelper::EmptyOrWhiteSpace($thumbnailSkin->itemHtml)){
     517                if (!WjsslSliderBuildHelper::EmptyOrWhiteSpace($thumbnailSkin->itemHtml)) {
    507518                    $skinId = WjsslSliderBuildHelper::GetSkinId($runtimeThumbnails, $thumbnailSkin);
    508519                    $thumbnailNodeString = WjsslSliderBuildHelper::BuildFromThumbnailItemTemplate($htmlDocument, $thumbnailSkin->itemHtml, array($skinId, $runtimeThumbnails->itemWidth, $runtimeThumbnails->itemHeight), $images, $contents);
    509520                }
     521
    510522                $slideThumbnailNodes = WjsslSliderBuildHelper::LoadHTML($thumbnailNodeString, $htmlDocument);
    511523                foreach($slideThumbnailNodes as $node)
    … …  
    517529            }
    518530        }
    519         #endregion
     531
     532        #endregion
     533
     534        #region perspective/perspective origin attribute
     535
     536        if (WjsslSliderBuildHelper::HasValue($runtimeSlide->pDepth) && $has3dMotion)
     537        {
     538            $perspective = ($runtimeDocument->Layouts->layout->slideWidth + $runtimeDocument->Layouts->layout->slideHeight) * $runtimeSlide->pDepth / 2;
     539            $slideNode->setAttribute("data-p", $perspective);
     540            $this->BuildPercentAttribute($slideNode, "data-po", $runtimeSlide->poX, $runtimeSlide->poY);
     541        }
     542
     543        //#endregion
     544
    520545        return $slideNode;
    521546    }
    … …  
    540565        $slidesNode->setAttribute("style", $slidesNodeCss);
    541566        #endregion
     567
    542568        #region child elements
     569
    543570        $this->_ArraySlideNodes = array();
     571
    544572        //slides elements
    545         foreach ($runtimeDocument->Slides as $i=>$runtimeSlide)
    546         {
    547             $slideNode = $this->BuildSlideNode($i, $runtimeSlide, $runtimeDocument, $htmlDocument);
    548             //WjsslSliderBuildHelper::AlterJssorRes_Html($slideNode);
    549             array_push($this->_ArraySlideNodes, $slideNode);
    550             $slidesNode->appendChild($slideNode);
    551         }
    552         #endregion
     573        if(isset($runtimeDocument->Slides) && !empty($runtimeDocument->Slides)) {
     574            foreach ($runtimeDocument->Slides as $i=>$runtimeSlide)
     575            {
     576                $slideNode = $this->BuildSlideNode($i, $runtimeSlide, $runtimeDocument, $htmlDocument);
     577                //WjsslSliderBuildHelper::AlterJssorRes_Html($slideNode);
     578                array_push($this->_ArraySlideNodes, $slideNode);
     579                $slidesNode->appendChild($slideNode);
     580            }
     581        }
     582
     583        #endregion
     584
    553585        $this->_SlidesNode = $slidesNode;
    554586    }

  • jssor-slider/trunk/jssor-slider.php

    r1820989 r1825761  
    1212 * Plugin URI:        https://www.jssor.com
    1313 * Description:       Touch swipe responsive image/content slider/slideshow/carousel/gallery/banner by jssor.com
    14  * Version:           3.1.14
     14 * Version:           3.1.15
    1515 * Author:            Jssor
    1616 * Author URI:        https://profiles.wordpress.org/jssor

  • jssor-slider/trunk/readme.txt

    r1820989 r1825761  
    8989
    9090== Changelog ==
     91
     92= Version 3.1.15 / (2018-02-21) =
     93- Change: code generation for slide with no 3d layer animation
     94- Rollback: jssor slider 27.0.3
    9195
    9296= Version 3.1.14 / (2018-02-13) =
Note: See TracChangeset for help on using the changeset viewer.