259. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:08 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

259.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_SocialFeed/templatesinstagramphotos.phtml2021-07-15 03:30:02 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_SocialFeed/templatesinstagramphotos.phtml2023-02-15 03:42:59 +0000

259.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged5166
Changed314
Inserted113
Removed00

259.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

259.4 Active regular expressions

No regular expressions were active.

259.5 Comparison detail

1 <?php 1 <?php
2 $_enable = $this->getConfig('sw_socialfeeds/instagram_photos/enable'); 2 $_enable = $this->getConfig('sw_socialfeeds/instagram_photos/enable');
3 if($_enable==1){ 3 if($_enable==1){
4     $accesstoken = $this->getConfig('sw_socialfeeds/instagram_photos/accesstocken'); 4     $accesstoken = $this->getConfig('sw_socialfeeds/instagram_photos/accesstocken');
5     $count = $this->getConfig('sw_socialfeeds/instagram_photos/showing_counts') + 1; 5     $count = $this->getConfig('sw_socialfeeds/instagram_photos/showing_counts') + 1;
6     $padding = $this->getData("padding_item")!=''?'padding:'.$this->getData("padding_item").';':''; 6     $padding = $this->getData("padding_item")!=''?'padding:'.$this->getData("padding_item").';':'';
7     $template_type = $this->getData("template_type");  7     $template_type = $this->getData("template_type");
    8     $media_type = $this->getData("media_type");
    9     $album_name = $this->getData("album_name");
8     $desktop = $this->getData("desktop") !='' ? $this->getData("desktop") : '6'; 10     $desktop = $this->getData("desktop") !='' ? $this->getData("desktop") : '6';
9     $tablet = $this->getData("tablet") != '' ? $this->getData("tablet") : '4'; 11     $tablet = $this->getData("tablet") != '' ? $this->getData("tablet") : '4';
10     $mobile = $this->getData("mobile") != '' ? $this->getData("mobile") : '2'; 12     $mobile = $this->getData("mobile") != '' ? $this->getData("mobile") : '2';
11     $margin = $this->getData("margin") != '' ? $this->getData("margin") : '0'; 13     $margin = $this->getData("margin") != '' ? $this->getData("margin") : '0';
12     $desktop_large = $this->getData("desktop_large") != '' ? $this->getData("desktop_large") : $desktop; 14     $desktop_large = $this->getData("desktop_large") != '' ? $this->getData("desktop_large") : $desktop;
13 ?> 15 ?>
14     <div class="insta-items grid-items"> 16     <div class="insta-items grid-items">
15       <?php if($template_type == 'carousel'):?> 17       <?php if($template_type == 'carousel'):?>
16         <div id="instafeed" class="photo-instagrams owl-carousel mb-0" style="opacity:0;"></div> 18         <div id="instafeed" class="photo-instagrams owl-carousel mb-0" style="opacity:0;"></div>
17       <?php else: ?> 19       <?php else: ?>
18         <div id="instafeed" class="photo-instagrams row" style="margin-left: -<?php echo $this->getData("padding_item"); ?>;margin-right: -<?php echo $this->getData("padding_item");?>;opacity:0;"></div> 20         <div id="instafeed" class="photo-instagrams row" style="margin-left: -<?php echo $this->getData("padding_item"); ?>;margin-right: -<?php echo $this->getData("padding_item");?>;opacity:0;"></div>
19       <?php endif;?> 21       <?php endif;?>
20     </div> 22     </div>
21     <script type="text/javascript"> 23     <script type="text/javascript">
22         require([ 24         require([
23             'jquery', 25             'jquery',
24             'imagesloaded', 26             'imagesloaded',
25             'owl.carousel/owl.carousel.min' 27             'owl.carousel/owl.carousel.min'
26         ], function ($) { 28         ], function ($) {
27           var instagram = $('#instafeed'), 29           var instagram = $('#instafeed'),
28               token = '<?php echo $accesstoken;?>', 30               token = '<?php echo $accesstoken;?>',
29               count = '<?php echo $count;?>', 31               count = '<?php echo $count;?>',
30               url = '//graph.instagram.com/me/media?fields=caption,id,media_type,media_url,
permalink,thumbnail_url,timestamp,username&access_token=' + token,
 32               <?php if($media_type == 'album'):?>
    33               media_type = 'CAROUSEL_ALBUM',
    34               <?php else: ?>
    35               media_type = 'IMAGE',
    36               <?php endif; ?>
    37               album_name = '<?php echo $album_name; ?>',
    38               url = '//graph.instagram.com/me/media?fields=caption,id,media_type,media_url,children{media_url,permalink},permalink,thumbnail_url,timestamp,username&access_token=' + token,
31               desktop_large = '<?php echo $desktop_large;?>', 39               desktop_large = '<?php echo $desktop_large;?>',
32               desktop = '<?php echo $desktop;?>', 40               desktop = '<?php echo $desktop;?>',
33               tablet = '<?php echo $tablet;?>', 41               tablet = '<?php echo $tablet;?>',
34               mobile = '<?php echo $mobile;?>', 42               mobile = '<?php echo $mobile;?>',
35               margin = <?php echo $margin;?>; 43               margin = <?php echo $margin;?>;
36           $.ajax({ 44           $.ajax({
37             type: 'GET', 45             type: 'GET',
38             dataType: 'jsonp', 46             dataType: 'jsonp',
39             cache: false, 47             cache: false,
40             url: url, 48             url: url,
41             success: function(data) { 49             success: function(data) {
42               for (var i = 0; i < count; i++) { 50               for (var i = 0; i < count; i++) {
43                 if (data.data[i]) { 51                 if (data.data[i]) {
44                   if(data.data[i].media_type == 
'IMAGE') {
 52                   if(data.data[i].media_type == media_type && media_type == 'IMAGE') {
45                       <?php if($template_type == 'carousel'):?> 53                       <?php if($template_type == 'carousel'):?>
46                         instagram.append("<div class='item insta-item' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].media_url +"' /></a></div>"); 54                         instagram.append("<div class='item insta-item' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].media_url +"' /></a></div>");
47                       <?php else: ?> 55                       <?php else: ?>
48                         instagram.append("<div class='item insta-item item col-xl-2 col-lg-3 col-sm4 col-6' style='<?php echo $padding;?>' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].media_url +"' /></a></div>"); 56                         instagram.append("<div class='item insta-item item col-xl-2 col-lg-3 col-sm4 col-6' style='<?php echo $padding;?>' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].media_url +"' /></a></div>");
49                       <?php endif;?> 57                       <?php endif;?>
50                   } 58                   }
    59                   if(data.data[i].media_type == media_type && media_type == 'CAROUSEL_ALBUM') {
    60                     if( data.data[i].caption != '' && data.data[i].caption == album_name){
    61                       for (var j = 0; j < count; j++) {
    62                         if(data.data[i].children['data'][j]){
    63                           <?php if($template_type == 'carousel'):?>
    64                             instagram.append("<div class='item insta-item' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].children['data'][j].media_url +"' /></a></div>");
    65                           <?php else: ?>
    66                             instagram.append("<div class='item insta-item item col-xl-2 col-lg-3 col-sm4 col-6' style='<?php echo $padding;?>' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].children['data'][j].media_url +"' /></a></div>");
    67                           <?php endif;?>
    68                         }
    69                       }
    70                     }
    71                   }
51                 } 72                 }
52               } 73               }
53               instagram.imagesLoaded().animate({ 'opacity' : 1 }, 500); 74               instagram.imagesLoaded().animate({ 'opacity' : 1 }, 500);
54             <?php if($template_type == 'carousel'):?> 75             <?php if($template_type == 'carousel'):?>
55                 instagram.imagesLoaded(function(){ 76                 instagram.imagesLoaded(function(){
56                   instagram.owlCarousel({ 77                   instagram.owlCarousel({
57                     loop: true, 78                     loop: true,
58                     margin: margin, 79                     margin: margin,
59                     responsiveClass: true, 80                     responsiveClass: true,
60                     nav: false, 81                     nav: false,
61                     autoplay: false, 82                     autoplay: false,
62                     autoplayTimeout: 5000, 83                     autoplayTimeout: 5000,
63                     dots: false, 84                     dots: false,
64                     lazyLoad: false, 85                     lazyLoad: false,
65                     responsive:{ 86                     responsive:{
66                       0:{ 87                       0:{
67                         items:mobile 88                         items:mobile
68                       }, 89                       },
69                       600:{ 90                       600:{
70                         items:tablet 91                         items:tablet
71                       }, 92                       },
72                       1000:{ 93                       1000:{
73                         items:desktop 94                         items:desktop
74                       }, 95                       },
75                       1400:{ 96                       1400:{
76                         items:desktop_large 97                         items:desktop_large
77                       } 98                       }
78                     } 99                     }
79                   }); 100                   });
80                 }); 101                 });
81               <?php endif;?> 102               <?php endif;?>
82             } 103             }
83           }); 104           });
84         }); 105         });
85     </script> 106     </script>
86 <?php }?> 107 <?php }?>