147. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2024-03-04 14:38:51 +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.

147.1 Files compared

#LocationFileLast Modified
1/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.7/app/design/frontend/Smartwave/porto/Magento_Theme/web/jstheme.js2023-07-01 08:59:57 +0000
2/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.8/app/design/frontend/Smartwave/porto/Magento_Theme/web/jstheme.js2024-01-30 03:09:17 +0000

147.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged3406
Changed00
Inserted25
Removed00

147.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

147.4 Active regular expressions

No regular expressions were active.

147.5 Comparison detail

1 /** 1 /**
2  * Copyright © 2015 Magento. All rights reserved. 2  * Copyright © 2015 Magento. All rights reserved.
3  * See COPYING.txt for license details. 3  * See COPYING.txt for license details.
4  */ 4  */
5 require([ 5 require([
6     'jquery', 6     'jquery',
7     'mage/smart-keyboard-handler', 7     'mage/smart-keyboard-handler',
8     'mage/mage', 8     'mage/mage',
9     'domReady!' 9     'domReady!'
10 ], function ($, keyboardHandler) { 10 ], function ($, keyboardHandler) {
11     'use strict'; 11     'use strict';
12     $(document).ready(function(){ 12     $(document).ready(function(){
13         $('.cart-summary').mage('sticky', { 13         $('.cart-summary').mage('sticky', {
14             container: '#maincontent' 14             container: '#maincontent'
15         }); 15         });
16  16 
17         $('.panel.header .header.links').clone().appendTo('#store\\.links'); 17         $('.panel.header .header.links').clone().appendTo('#store\\.links');
18     }); 18     });
19     keyboardHandler.apply(); 19     keyboardHandler.apply();
20 }); 20 });
21 require([ 21 require([
22     'jquery' 22     'jquery'
23 ], function ($) { 23 ], function ($) {
24     (function() { 24     (function() {
25         var ev = new $.Event('classadded'), 25         var ev = new $.Event('classadded'),
26             orig = $.fn.addClass; 26             orig = $.fn.addClass;
27         $.fn.addClass = function() { 27         $.fn.addClass = function() {
28             $(this).trigger(ev, arguments); 28             $(this).trigger(ev, arguments);
29             return orig.apply(this, arguments); 29             return orig.apply(this, arguments);
30         } 30         }
31     })(); 31     })();
32     $.fn.extend({ 32     $.fn.extend({
33         scrollToMe: function(){ 33         scrollToMe: function(){
34             if($(this).length){ 34             if($(this).length){
35                 var top = $(this).offset().top - 100; 35                 var top = $(this).offset().top - 100;
36                 $('html,body').animate({scrollTop: top}, 300); 36                 $('html,body').animate({scrollTop: top}, 300);
37             } 37             }
38         }, 38         },
39         scrollToJustMe: function(){ 39         scrollToJustMe: function(){
40             if($(this).length){ 40             if($(this).length){
41                 var top = jQuery(this).offset().top; 41                 var top = jQuery(this).offset().top;
42                 $('html,body').animate({scrollTop: top}, 300); 42                 $('html,body').animate({scrollTop: top}, 300);
43             } 43             }
44         } 44         }
45     }); 45     });
46     $(document).ready(function(){ 46     $(document).ready(function(){
47         var windowScroll_t; 47         var windowScroll_t;
48         $(window).scroll(function(){ 48         $(window).scroll(function(){
49             clearTimeout(windowScroll_t); 49             clearTimeout(windowScroll_t);
50             windowScroll_t = setTimeout(function(){ 50             windowScroll_t = setTimeout(function(){
51                 if(jQuery(this).scrollTop() > 100){ 51                 if(jQuery(this).scrollTop() > 100){
52                     $('#totop').fadeIn(); 52                     $('#totop').fadeIn();
53                 }else{ 53                 }else{
54                     $('#totop').fadeOut(); 54                     $('#totop').fadeOut();
55                 } 55                 }
56             }, 500); 56             }, 500);
57         }); 57         });
58         $('#totop').off("click").on("click",function(){ 58         $('#totop').off("click").on("click",function(){
59             $('html, body').animate({scrollTop: 0}, 600); 59             $('html, body').animate({scrollTop: 0}, 600);
60         }); 60         });
61         if ($('body').hasClass('checkout-cart-index')) { 61         if ($('body').hasClass('checkout-cart-index')) {
62             if ($('#co-shipping-method-form .fieldset.rates').length > 0 && $('#co-shipping-method-form .fieldset.rates :checked').length === 0) { 62             if ($('#co-shipping-method-form .fieldset.rates').length > 0 && $('#co-shipping-method-form .fieldset.rates :checked').length === 0) {
63                 $('#block-shipping').on('collapsiblecreate', function () { 63                 $('#block-shipping').on('collapsiblecreate', function () {
64                     $('#block-shipping').collapsible('forceActivate'); 64                     $('#block-shipping').collapsible('forceActivate');
65                 }); 65                 });
66             } 66             }
67         } 67         }
68         $(".products-grid .weltpixel-quickview").each(function(){ 68         $(".products-grid .weltpixel-quickview").each(function(){
    69             $(this).parent().parent().addClass('has-quickview');
    70             if($(this).parents('.product-type-advanced').find(".product-item-photo.porto-tb-featured-image .icon-absolute").length > 0){
    71               $(this).appendTo($(this).parents('.product-type-advanced').find(".product-item-photo .porto-tb-featured-image .product-item-inner .product-item-actions"));
    72             }else{
69             $(this).appendTo($(this).parent().parent().children(".product-item-photo")); 73               $(this).appendTo($(this).parent().parent().children(".product-item-photo"));
    74             }
70         }); 75         });
71         $(".word-rotate").each(function() { 76         $(".word-rotate").each(function() {
72  77 
73             var $this = $(this), 78             var $this = $(this),
74                 itemsWrapper = $(this).find(".word-rotate-items"), 79                 itemsWrapper = $(this).find(".word-rotate-items"),
75                 items = itemsWrapper.find("> span"), 80                 items = itemsWrapper.find("> span"),
76                 firstItem = items.eq(0), 81                 firstItem = items.eq(0),
77                 firstItemClone = firstItem.clone(), 82                 firstItemClone = firstItem.clone(),
78                 itemHeight = 0, 83                 itemHeight = 0,
79                 currentItem = 1, 84                 currentItem = 1,
80                 currentTop = 0; 85                 currentTop = 0;
81  86 
82             itemHeight = firstItem.height(); 87             itemHeight = firstItem.height();
83  88 
84             itemsWrapper.append(firstItemClone); 89             itemsWrapper.append(firstItemClone);
85  90 
86             $this 91             $this
87                 .height(itemHeight) 92                 .height(itemHeight)
88                 .addClass("active"); 93                 .addClass("active");
89  94 
90             setInterval(function() { 95             setInterval(function() {
91                 currentTop = (currentItem * itemHeight); 96                 currentTop = (currentItem * itemHeight);
92  97 
93                 itemsWrapper.animate({ 98                 itemsWrapper.animate({
94                     top: -(currentTop) + "px" 99                     top: -(currentTop) + "px"
95                 }, 300, function() { 100                 }, 300, function() {
96                     currentItem++; 101                     currentItem++;
97                     if(currentItem > items.length) { 102                     if(currentItem > items.length) {
98                         itemsWrapper.css("top", 0); 103                         itemsWrapper.css("top", 0);
99                         currentItem = 1; 104                         currentItem = 1;
100                     } 105                     }
101                 }); 106                 });
102  107 
103             }, 2000); 108             }, 2000);
104  109 
105         }); 110         });
106         $(".top-links-icon").off("click").on("click", function(e){ 111         $(".top-links-icon").off("click").on("click", function(e){
107             if($(this).parent().children("ul.links").hasClass("show")) { 112             if($(this).parent().children("ul.links").hasClass("show")) {
108                 $(this).parent().children("ul.links").removeClass("show"); 113                 $(this).parent().children("ul.links").removeClass("show");
109             } else { 114             } else {
110                 $(this).parent().children("ul.links").addClass("show"); 115                 $(this).parent().children("ul.links").addClass("show");
111             } 116             }
112             e.stopPropagation(); 117             e.stopPropagation();
113         }); 118         });
114         $(".top-links-icon").parent().click(function(e){ 119         $(".top-links-icon").parent().click(function(e){
115             e.stopPropagation(); 120             e.stopPropagation();
116         }); 121         });
117         $(".search-toggle-icon").click(function(e){ 122         $(".search-toggle-icon").click(function(e){
118             if($(this).parent().children(".block-search").hasClass("show")) { 123             if($(this).parent().children(".block-search").hasClass("show")) {
119                 $(this).parent().children(".block-search").removeClass("show"); 124                 $(this).parent().children(".block-search").removeClass("show");
120                 $(this).removeClass('open'); 125                 $(this).removeClass('open');
121             } else { 126             } else {
122                 $(this).parent().children(".block-search").addClass("show"); 127                 $(this).parent().children(".block-search").addClass("show");
123                 $(this).addClass('open'); 128                 $(this).addClass('open');
124             } 129             }
125             e.stopPropagation(); 130             e.stopPropagation();
126         }); 131         });
127         $(".search-toggle-icon").parent().click(function(e){ 132         $(".search-toggle-icon").parent().click(function(e){
128             e.stopPropagation(); 133             e.stopPropagation();
129         }); 134         });
130         $("html,body").click(function(){ 135         $("html,body").click(function(){
131             $(".search-toggle-icon").parent().children(".block-search").removeClass("show"); 136             $(".search-toggle-icon").parent().children(".block-search").removeClass("show");
132             $('.autocomplete-suggestions').hide(); 137             $('.autocomplete-suggestions').hide();
133             $(".search-toggle-icon").removeClass('open'); 138             $(".search-toggle-icon").removeClass('open');
134             $(".top-links-icon").parent().children("ul.links").removeClass("show"); 139             $(".top-links-icon").parent().children("ul.links").removeClass("show");
135         }); 140         });
136  141 
137         /********************* Qty Holder **************************/ 142         /********************* Qty Holder **************************/
138         $(document).on("click", ".qtyplus", function(e) { 143         $(document).on("click", ".qtyplus", function(e) {
139             // Stop acting like a button 144             // Stop acting like a button
140             e.preventDefault(); 145             e.preventDefault();
141             // Get its current value 146             // Get its current value
142             var currentVal = parseInt($(this).parents('form').find('input[name="qty"]').val()); 147             var currentVal = parseInt($(this).parents('form').find('input[name="qty"]').val());
143             // If is not undefined 148             // If is not undefined
144             if (!isNaN(currentVal)) { 149             if (!isNaN(currentVal)) {
145                 // Increment 150                 // Increment
146                 $(this).parents('form').find('input[name="qty"]').val(currentVal + 1); 151                 $(this).parents('form').find('input[name="qty"]').val(currentVal + 1);
147             } else { 152             } else {
148                 // Otherwise put a 0 there 153                 // Otherwise put a 0 there
149                 $(this).parents('form').find('input[name="qty"]').val(0); 154                 $(this).parents('form').find('input[name="qty"]').val(0);
150             } 155             }
151         }); 156         });
152         // This button will decrement the value till 0 157         // This button will decrement the value till 0
153         $(document).on("click", ".qtyminus", function(e) { 158         $(document).on("click", ".qtyminus", function(e) {
154             // Stop acting like a button 159             // Stop acting like a button
155             e.preventDefault(); 160             e.preventDefault();
156             // Get the field name 161             // Get the field name
157             fieldName = $(this).attr('field'); 162             fieldName = $(this).attr('field');
158             // Get its current value 163             // Get its current value
159             var currentVal = parseInt($(this).parents('form').find('input[name="qty"]').val()); 164             var currentVal = parseInt($(this).parents('form').find('input[name="qty"]').val());
160             // If it isn't undefined or its greater than 0 165             // If it isn't undefined or its greater than 0
161             if (!isNaN(currentVal) && currentVal > 0) { 166             if (!isNaN(currentVal) && currentVal > 0) {
162                 // Decrement one 167                 // Decrement one
163                 $(this).parents('form').find('input[name="qty"]').val(currentVal - 1); 168                 $(this).parents('form').find('input[name="qty"]').val(currentVal - 1);
164             } else { 169             } else {
165                 // Otherwise put a 0 there 170                 // Otherwise put a 0 there
166                 $(this).parents('form').find('input[name="qty"]').val(0); 171                 $(this).parents('form').find('input[name="qty"]').val(0);
167             } 172             }
168         }); 173         });
169         $(".qty-inc").unbind('click').click(function(){ 174         $(".qty-inc").unbind('click').click(function(){
170             if($(this).parents('.field.qty,.control.qty').find("input.input-text.qty").is(':enabled')){ 175             if($(this).parents('.field.qty,.control.qty').find("input.input-text.qty").is(':enabled')){
171                 $(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val((+$(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val() + 1) || 0); 176                 $(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val((+$(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val() + 1) || 0);
172                 $(this).parents('.field.qty,.control.qty').find("input.input-text.qty").trigger('change'); 177                 $(this).parents('.field.qty,.control.qty').find("input.input-text.qty").trigger('change');
173                 $(this).focus(); 178                 $(this).focus();
174             } 179             }
175         }); 180         });
176         $(".qty-dec").unbind('click').click(function(){ 181         $(".qty-dec").unbind('click').click(function(){
177             if($(this).parents('.field.qty,.control.qty').find("input.input-text.qty").is(':enabled')){ 182             if($(this).parents('.field.qty,.control.qty').find("input.input-text.qty").is(':enabled')){
178                 $(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val(($(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val() - 1 > 0) ? ($(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val() - 1) : 0); 183                 $(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val(($(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val() - 1 > 0) ? ($(this).parents('.field.qty,.control.qty').find("input.input-text.qty").val() - 1) : 0);
179                 $(this).parents('.field.qty,.control.qty').find("input.input-text.qty").trigger('change'); 184                 $(this).parents('.field.qty,.control.qty').find("input.input-text.qty").trigger('change');
180                 $(this).focus(); 185                 $(this).focus();
181             } 186             }
182         }); 187         });
183     }); 188     });
184 }); 189 });
185 require([ 190 require([
186     'jquery', 191     'jquery',
187     'lazyload' 192     'lazyload'
188 ], function ($) { 193 ], function ($) {
189     $(document).ready(function(){ 194     $(document).ready(function(){
190         $("img.porto-lazyload:not(.porto-lazyload-loaded)").lazyload({effect:"fadeIn", effect_speed: 400 }); 195         $("img.porto-lazyload:not(.porto-lazyload-loaded)").lazyload({effect:"fadeIn", effect_speed: 400 });
191         if ($('.porto-lazyload:not(.porto-lazyload-loaded)').closest('.owl-carousel').length) { 196         if ($('.porto-lazyload:not(.porto-lazyload-loaded)').closest('.owl-carousel').length) {
192             $('.porto-lazyload:not(.porto-lazyload-loaded)').closest('.owl-carousel').on('initialized.owl.carousel', function() { 197             $('.porto-lazyload:not(.porto-lazyload-loaded)').closest('.owl-carousel').on('initialized.owl.carousel', function() {
193                 $(this).find('.porto-lazyload:not(.porto-lazyload-loaded)').trigger('appear'); 198                 $(this).find('.porto-lazyload:not(.porto-lazyload-loaded)').trigger('appear');
194             }); 199             });
195             $('.porto-lazyload:not(.porto-lazyload-loaded)').closest('.owl-carousel').on('changed.owl.carousel', function() { 200             $('.porto-lazyload:not(.porto-lazyload-loaded)').closest('.owl-carousel').on('changed.owl.carousel', function() {
196                 $(this).find('.porto-lazyload:not(.porto-lazyload-loaded)').trigger('appear'); 201                 $(this).find('.porto-lazyload:not(.porto-lazyload-loaded)').trigger('appear');
197             }); 202             });
198         } 203         }
199         window.setTimeout(function(){ 204         window.setTimeout(function(){
200             $('.sidebar-filterproducts').find('.porto-lazyload:not(.porto-lazyload-loaded)').trigger('appear'); 205             $('.sidebar-filterproducts').find('.porto-lazyload:not(.porto-lazyload-loaded)').trigger('appear');
201         },500); 206         },500);
202     }); 207     });
203 }); 208 });

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.