Version Description
- 20 March 2022 =
- Post Carousel: Resolved Autoplay not functioning when Navigation arrows disabled.
Download this release
Release Info
Developer | SiteOrigin |
Plugin | SiteOrigin Widgets Bundle |
Version | 1.32.1 |
Comparing to | |
See all releases |
Code changes from version 1.32.0 to 1.32.1
- base/inc/widgets/base-carousel.class.php +1 -0
- base/inc/widgets/tpl/carousel.php +2 -2
- lang/so-widgets-bundle.pot +4 -4
- readme.txt +5 -2
- so-widgets-bundle.php +2 -2
- widgets/anything-carousel/styles/base.less +17 -16
- widgets/post-carousel/css/style.css +0 -1
- widgets/post-carousel/styles/base.less +22 -15
- widgets/post-carousel/styles/default.less +0 -120
base/inc/widgets/base-carousel.class.php
CHANGED
@@ -431,6 +431,7 @@ abstract class SiteOrigin_Widget_Base_Carousel extends SiteOrigin_Widget {
|
|
431 |
$less_vars['breakpoint_mobile'] = ( ! empty( $instance['responsive']['mobile']['breakpoint'] ) ? $instance['responsive']['mobile']['breakpoint'] : $carousel_settings['breakpoints']['mobile'] ) .'px';
|
432 |
|
433 |
// Navigation.
|
|
|
434 |
$less_vars['navigation_desktop'] = isset( $instance['responsive']['desktop']['navigation'] ) ? ! empty( $instance['responsive']['desktop']['navigation'] ) : $carousel_settings['navigation']['desktop'];
|
435 |
$less_vars['navigation_tablet_landscape'] = isset( $instance['responsive']['tablet']['landscape']['navigation'] ) ? ! empty( $instance['responsive']['tablet']['landscape']['navigation'] ) : $carousel_settings['navigation']['tablet_landscape'];
|
436 |
$less_vars['navigation_tablet_portrait'] = isset( $instance['responsive']['tablet']['portrait']['navigation'] ) ? ! empty( $instance['responsive']['tablet']['portrait']['navigation'] ) : $carousel_settings['navigation']['tablet_portrait'];
|
431 |
$less_vars['breakpoint_mobile'] = ( ! empty( $instance['responsive']['mobile']['breakpoint'] ) ? $instance['responsive']['mobile']['breakpoint'] : $carousel_settings['breakpoints']['mobile'] ) .'px';
|
432 |
|
433 |
// Navigation.
|
434 |
+
$less_vars['navigation_arrows'] = isset( $instance['carousel_settings']['arrows'] ) ? ! empty( $instance['carousel_settings']['arrows'] ) : $carousel_settings['carousel_settings']['arrows'];
|
435 |
$less_vars['navigation_desktop'] = isset( $instance['responsive']['desktop']['navigation'] ) ? ! empty( $instance['responsive']['desktop']['navigation'] ) : $carousel_settings['navigation']['desktop'];
|
436 |
$less_vars['navigation_tablet_landscape'] = isset( $instance['responsive']['tablet']['landscape']['navigation'] ) ? ! empty( $instance['responsive']['tablet']['landscape']['navigation'] ) : $carousel_settings['navigation']['tablet_landscape'];
|
437 |
$less_vars['navigation_tablet_portrait'] = isset( $instance['responsive']['tablet']['portrait']['navigation'] ) ? ! empty( $instance['responsive']['tablet']['portrait']['navigation'] ) : $carousel_settings['navigation']['tablet_portrait'];
|
base/inc/widgets/tpl/carousel.php
CHANGED
@@ -4,9 +4,9 @@
|
|
4 |
echo $args['before_title'] . esc_html( $settings['title'] ) . $args['after_title'];
|
5 |
}
|
6 |
|
7 |
-
if ( $settings['navigation'] == 'title' && $settings['navigation_arrows'] ) {
|
8 |
?>
|
9 |
-
<div class="sow-carousel-navigation">
|
10 |
<?php $this->render_navigation( 'both' ); ?>
|
11 |
</div>
|
12 |
<?php } ?>
|
4 |
echo $args['before_title'] . esc_html( $settings['title'] ) . $args['after_title'];
|
5 |
}
|
6 |
|
7 |
+
if ( $settings['navigation'] == 'title' && ( $settings['navigation_arrows'] || $settings['attributes']['widget'] == 'post' ) ) {
|
8 |
?>
|
9 |
+
<div class="sow-carousel-navigation <?php echo ! $settings['navigation_arrows'] && $settings['attributes']['widget'] == 'post' ? 'sow-carousel-navigation-hidden' : ''; ?>">
|
10 |
<?php $this->render_navigation( 'both' ); ?>
|
11 |
</div>
|
12 |
<?php } ?>
|
lang/so-widgets-bundle.pot
CHANGED
@@ -3241,19 +3241,19 @@ msgstr ""
|
|
3241 |
msgid "Item title"
|
3242 |
msgstr ""
|
3243 |
|
3244 |
-
#: base/inc/widgets/base-carousel.class.php:
|
3245 |
msgid "Next"
|
3246 |
msgstr ""
|
3247 |
|
3248 |
-
#: base/inc/widgets/base-carousel.class.php:
|
3249 |
msgid "Next Posts"
|
3250 |
msgstr ""
|
3251 |
|
3252 |
-
#: base/inc/widgets/base-carousel.class.php:
|
3253 |
msgid "Previous"
|
3254 |
msgstr ""
|
3255 |
|
3256 |
-
#: base/inc/widgets/base-carousel.class.php:
|
3257 |
msgid "Previous Posts"
|
3258 |
msgstr ""
|
3259 |
|
3241 |
msgid "Item title"
|
3242 |
msgstr ""
|
3243 |
|
3244 |
+
#: base/inc/widgets/base-carousel.class.php:471
|
3245 |
msgid "Next"
|
3246 |
msgstr ""
|
3247 |
|
3248 |
+
#: base/inc/widgets/base-carousel.class.php:471
|
3249 |
msgid "Next Posts"
|
3250 |
msgstr ""
|
3251 |
|
3252 |
+
#: base/inc/widgets/base-carousel.class.php:477
|
3253 |
msgid "Previous"
|
3254 |
msgstr ""
|
3255 |
|
3256 |
+
#: base/inc/widgets/base-carousel.class.php:477
|
3257 |
msgid "Previous Posts"
|
3258 |
msgstr ""
|
3259 |
|
readme.txt
CHANGED
@@ -3,8 +3,8 @@ Tags: widget, button, slider, hero, google maps, image, carousel, features, icon
|
|
3 |
Requires at least: 4.2
|
4 |
Tested up to: 5.9
|
5 |
Requires PHP: 5.6.20
|
6 |
-
Stable tag: 1.32.
|
7 |
-
Build time: 2022-03-
|
8 |
License: GPLv3 or later
|
9 |
Contributors: gpriday, braam-genis, alexgso
|
10 |
Donate link: https://siteorigin.com/downloads/premium/
|
@@ -100,6 +100,9 @@ The Widgets Bundle global interface is available at Plugins > SiteOrigin Widgets
|
|
100 |
|
101 |
== Changelog ==
|
102 |
|
|
|
|
|
|
|
103 |
= 1.32.0 - 14 March 2022 =
|
104 |
* Post Carousel: Added a new `Autoplay Continuous Scroll` setting.
|
105 |
* Post Carousel: Resolved a potential item tag notice.
|
3 |
Requires at least: 4.2
|
4 |
Tested up to: 5.9
|
5 |
Requires PHP: 5.6.20
|
6 |
+
Stable tag: 1.32.1
|
7 |
+
Build time: 2022-03-20T17:30:12+02:00
|
8 |
License: GPLv3 or later
|
9 |
Contributors: gpriday, braam-genis, alexgso
|
10 |
Donate link: https://siteorigin.com/downloads/premium/
|
100 |
|
101 |
== Changelog ==
|
102 |
|
103 |
+
= 1.32.1 - 20 March 2022 =
|
104 |
+
* Post Carousel: Resolved Autoplay not functioning when Navigation arrows disabled.
|
105 |
+
|
106 |
= 1.32.0 - 14 March 2022 =
|
107 |
* Post Carousel: Added a new `Autoplay Continuous Scroll` setting.
|
108 |
* Post Carousel: Resolved a potential item tag notice.
|
so-widgets-bundle.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
/*
|
3 |
Plugin Name: SiteOrigin Widgets Bundle
|
4 |
Description: A highly customizable collection of widgets, ready to be used anywhere, neatly bundled into a single plugin.
|
5 |
-
Version: 1.32.
|
6 |
Text Domain: so-widgets-bundle
|
7 |
Domain Path: /lang
|
8 |
Author: SiteOrigin
|
@@ -12,7 +12,7 @@ License: GPL3
|
|
12 |
License URI: https://www.gnu.org/licenses/gpl-3.0.txt
|
13 |
*/
|
14 |
|
15 |
-
define( 'SOW_BUNDLE_VERSION', '1.32.
|
16 |
define( 'SOW_BUNDLE_BASE_FILE', __FILE__ );
|
17 |
|
18 |
// Allow JS suffix to be pre-set.
|
2 |
/*
|
3 |
Plugin Name: SiteOrigin Widgets Bundle
|
4 |
Description: A highly customizable collection of widgets, ready to be used anywhere, neatly bundled into a single plugin.
|
5 |
+
Version: 1.32.1
|
6 |
Text Domain: so-widgets-bundle
|
7 |
Domain Path: /lang
|
8 |
Author: SiteOrigin
|
12 |
License URI: https://www.gnu.org/licenses/gpl-3.0.txt
|
13 |
*/
|
14 |
|
15 |
+
define( 'SOW_BUNDLE_VERSION', '1.32.1' );
|
16 |
define( 'SOW_BUNDLE_BASE_FILE', __FILE__ );
|
17 |
|
18 |
// Allow JS suffix to be pre-set.
|
widgets/anything-carousel/styles/base.less
CHANGED
@@ -69,28 +69,29 @@
|
|
69 |
border-color: @navigation_arrow_color_hover;
|
70 |
}
|
71 |
|
72 |
-
|
73 |
-
|
74 |
-
|
75 |
-
|
|
|
76 |
}
|
77 |
-
}
|
78 |
|
79 |
-
|
80 |
-
|
81 |
-
|
|
|
82 |
}
|
83 |
-
}
|
84 |
|
85 |
-
|
86 |
-
|
87 |
-
|
|
|
88 |
}
|
89 |
-
}
|
90 |
|
91 |
-
|
92 |
-
|
93 |
-
|
|
|
94 |
}
|
95 |
}
|
96 |
}
|
69 |
border-color: @navigation_arrow_color_hover;
|
70 |
}
|
71 |
|
72 |
+
& when ( isnumber( @navigation_arrows ) ) {
|
73 |
+
& when not ( isnumber( @navigation_desktop ) ) {
|
74 |
+
@media (min-width: @breakpoint_tablet_landscape) {
|
75 |
+
display: none;
|
76 |
+
}
|
77 |
}
|
|
|
78 |
|
79 |
+
& when not ( isnumber( @navigation_tablet_landscape ) ) {
|
80 |
+
@media (min-width: @breakpoint_tablet_portrait) and (max-width: @breakpoint_tablet_landscape) {
|
81 |
+
display: none;
|
82 |
+
}
|
83 |
}
|
|
|
84 |
|
85 |
+
& when not ( isnumber( @navigation_tablet_portrait ) ) {
|
86 |
+
@media (min-width: @breakpoint_mobile) and (max-width: @breakpoint_tablet_portrait) {
|
87 |
+
display: none;
|
88 |
+
}
|
89 |
}
|
|
|
90 |
|
91 |
+
& when not ( isnumber( @navigation_mobile ) ) {
|
92 |
+
@media (max-width: @breakpoint_mobile) {
|
93 |
+
display: none;
|
94 |
+
}
|
95 |
}
|
96 |
}
|
97 |
}
|
widgets/post-carousel/css/style.css
DELETED
@@ -1 +0,0 @@
|
|
1 |
-
@font-face{font-family:'post-carousel-arrows';src:url('fonts/carousel-arrows.eot?-95vnmw');src:url('fonts/carousel-arrows.eot?#iefix-95vnmw') format('embedded-opentype'),url('fonts/carousel-arrows.woff?-95vnmw') format('woff'),url('fonts/carousel-arrows.ttf?-95vnmw') format('truetype'),url('fonts/carousel-arrows.svg?-95vnmw#carousel-arrows') format('svg');font-weight:normal;font-style:normal;font-display:block}.so-widget-sow-post-carousel .sow-carousel-title.has-title{align-items:baseline;display:flex}.so-widget-sow-post-carousel .sow-carousel-title.has-title .sow-carousel-navigation{margin-left:auto}body.rtl .so-widget-sow-post-carousel .sow-carousel-title.has-title .sow-carousel-navigation{margin-right:auto;margin-left:initial}.so-widget-sow-post-carousel .sow-carousel-title .widget-title{display:inline-block;padding-right:15px}.so-widget-sow-post-carousel .sow-carousel-title .sow-carousel-navigation{float:right}body.rtl .so-widget-sow-post-carousel .sow-carousel-title .sow-carousel-navigation{float:left}body.rtl .so-widget-sow-post-carousel .sow-carousel-title .sow-carousel-navigation a{margin-left:0;margin-right:2px}.so-widget-sow-post-carousel .sow-carousel-title a.sow-carousel-next,.so-widget-sow-post-carousel .sow-carousel-title a.sow-carousel-previous{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;border-radius:2px;display:block;float:right;font-family:'post-carousel-arrows';font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;line-height:18px;margin-left:2px;margin-top:3px;text-align:center;text-decoration:none;text-transform:none;width:18px}.so-widget-sow-post-carousel .sow-carousel-title a.sow-carousel-previous:before{content:"\e600"}.so-widget-sow-post-carousel .sow-carousel-title a.sow-carousel-next:before{content:"\e601"}.so-widget-sow-post-carousel .sow-carousel-wrapper{left:0;overflow:hidden;position:relative;right:0}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items{zoom:1;margin:0;padding:0;transition:all .45s ease}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items:before{content:'';display:block}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items:after{clear:both;content:'';display:table}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-item{display:block;margin-right:15px}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-item .sow-carousel-thumbnail{line-height:0}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-item .sow-carousel-thumbnail:focus{outline:none}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-item .sow-carousel-thumbnail a{display:block;background-position:center center}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-item .sow-carousel-thumbnail a,.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-item .sow-carousel-thumbnail a span.overlay{transition:all .35s ease}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-item .sow-carousel-thumbnail a span.overlay{display:block;width:100%;height:100%;opacity:0;position:static}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-item .sow-carousel-default-thumbnail{display:block;background:#E8E8E8;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #E0E0E0), color-stop(1, #E8E8E8));background:-ms-linear-gradient(bottom, #E0E0E0, #E8E8E8);background:-moz-linear-gradient(center bottom, #E0E0E0 0%, #E8E8E8 100%);background:-o-linear-gradient(#E8E8E8, #E0E0E0)}.so-widget-sow-post-carousel .sow-carousel-wrapper .sow-carousel-items .sow-carousel-loading{display:block;background:url(images/carousel-loader.gif) #F6F6F6 center center no-repeat;margin:0}
|
|
widgets/post-carousel/styles/base.less
CHANGED
@@ -14,6 +14,7 @@
|
|
14 |
@breakpoint_tablet_landscape: default;
|
15 |
@breakpoint_tablet_portrait: default;
|
16 |
@breakpoint_mobile: default;
|
|
|
17 |
@navigation_desktop: default;
|
18 |
@navigation_tablet_landscape: default;
|
19 |
@navigation_tablet_portrait: default;
|
@@ -24,6 +25,10 @@
|
|
24 |
|
25 |
.sow-carousel-title {
|
26 |
|
|
|
|
|
|
|
|
|
27 |
a.sow-carousel-next,
|
28 |
a.sow-carousel-previous {
|
29 |
background: @navigation_background;
|
@@ -35,27 +40,29 @@
|
|
35 |
color: @navigation_color_hover;
|
36 |
}
|
37 |
|
38 |
-
& when
|
39 |
-
|
40 |
-
|
|
|
|
|
41 |
}
|
42 |
-
}
|
43 |
|
44 |
-
|
45 |
-
|
46 |
-
|
|
|
47 |
}
|
48 |
-
}
|
49 |
|
50 |
-
|
51 |
-
|
52 |
-
|
|
|
53 |
}
|
54 |
-
}
|
55 |
|
56 |
-
|
57 |
-
|
58 |
-
|
|
|
59 |
}
|
60 |
}
|
61 |
}
|
14 |
@breakpoint_tablet_landscape: default;
|
15 |
@breakpoint_tablet_portrait: default;
|
16 |
@breakpoint_mobile: default;
|
17 |
+
@navigation_arrows: default;
|
18 |
@navigation_desktop: default;
|
19 |
@navigation_tablet_landscape: default;
|
20 |
@navigation_tablet_portrait: default;
|
25 |
|
26 |
.sow-carousel-title {
|
27 |
|
28 |
+
.sow-carousel-navigation-hidden {
|
29 |
+
display: none !important;
|
30 |
+
}
|
31 |
+
|
32 |
a.sow-carousel-next,
|
33 |
a.sow-carousel-previous {
|
34 |
background: @navigation_background;
|
40 |
color: @navigation_color_hover;
|
41 |
}
|
42 |
|
43 |
+
& when ( isnumber( @navigation_arrows ) ) {
|
44 |
+
& when not ( isnumber( @navigation_desktop ) ) {
|
45 |
+
@media (min-width: @breakpoint_tablet_landscape) {
|
46 |
+
display: none;
|
47 |
+
}
|
48 |
}
|
|
|
49 |
|
50 |
+
& when not ( isnumber( @navigation_tablet_landscape ) ) {
|
51 |
+
@media (min-width: @breakpoint_tablet_portrait) and (max-width: @breakpoint_tablet_landscape) {
|
52 |
+
display: none;
|
53 |
+
}
|
54 |
}
|
|
|
55 |
|
56 |
+
& when not ( isnumber( @navigation_tablet_portrait ) ) {
|
57 |
+
@media (min-width: @breakpoint_mobile) and (max-width: @breakpoint_tablet_portrait) {
|
58 |
+
display: none;
|
59 |
+
}
|
60 |
}
|
|
|
61 |
|
62 |
+
& when not ( isnumber( @navigation_mobile ) ) {
|
63 |
+
@media (max-width: @breakpoint_mobile) {
|
64 |
+
display: none;
|
65 |
+
}
|
66 |
}
|
67 |
}
|
68 |
}
|
widgets/post-carousel/styles/default.less
DELETED
@@ -1,120 +0,0 @@
|
|
1 |
-
@thumbnail_width: default;
|
2 |
-
@thumbnail_height: default;
|
3 |
-
|
4 |
-
@thumbnail_hover_width: default;
|
5 |
-
@thumbnail_hover_height: default;
|
6 |
-
|
7 |
-
@thumbnail_overlay_hover_opacity: 0.5;
|
8 |
-
@thumbnail_overlay_hover_color: #3279BB;
|
9 |
-
@navigation_color: #fff;
|
10 |
-
@navigation_color_hover: default;
|
11 |
-
@navigation_background: #333;
|
12 |
-
@navigation_hover_background: #444;
|
13 |
-
|
14 |
-
@breakpoint_tablet_landscape: default;
|
15 |
-
@breakpoint_tablet_portrait: default;
|
16 |
-
@breakpoint_mobile: default;
|
17 |
-
@navigation_desktop: default;
|
18 |
-
@navigation_tablet_landscape: default;
|
19 |
-
@navigation_tablet_portrait: default;
|
20 |
-
@navigation_mobile: default;
|
21 |
-
@item_title_tag: default;
|
22 |
-
@item_title_font_size: 15px;
|
23 |
-
@item_title_color: #474747;
|
24 |
-
|
25 |
-
.sow-carousel-title {
|
26 |
-
|
27 |
-
a.sow-carousel-next,
|
28 |
-
a.sow-carousel-previous {
|
29 |
-
background: @navigation_background;
|
30 |
-
color: @navigation_color;
|
31 |
-
|
32 |
-
&:focus,
|
33 |
-
&:hover {
|
34 |
-
background: @navigation_hover_background;
|
35 |
-
color: @navigation_color_hover;
|
36 |
-
}
|
37 |
-
|
38 |
-
& when not ( isnumber( @navigation_desktop ) ) {
|
39 |
-
@media (min-width: @breakpoint_tablet_landscape) {
|
40 |
-
display: none;
|
41 |
-
}
|
42 |
-
}
|
43 |
-
|
44 |
-
& when not ( isnumber( @navigation_tablet_landscape ) ) {
|
45 |
-
@media (min-width: @breakpoint_tablet_portrait) and (max-width: @breakpoint_tablet_landscape) {
|
46 |
-
display: none;
|
47 |
-
}
|
48 |
-
}
|
49 |
-
|
50 |
-
& when not ( isnumber( @navigation_tablet_portrait ) ) {
|
51 |
-
@media (min-width: @breakpoint_mobile) and (max-width: @breakpoint_tablet_portrait) {
|
52 |
-
display: none;
|
53 |
-
}
|
54 |
-
}
|
55 |
-
|
56 |
-
& when not ( isnumber( @navigation_mobile ) ) {
|
57 |
-
@media (max-width: @breakpoint_mobile) {
|
58 |
-
display: none;
|
59 |
-
}
|
60 |
-
}
|
61 |
-
}
|
62 |
-
|
63 |
-
}
|
64 |
-
|
65 |
-
.sow-carousel-wrapper {
|
66 |
-
|
67 |
-
.sow-carousel-items {
|
68 |
-
.sow-carousel-item {
|
69 |
-
width: @thumbnail_width;
|
70 |
-
|
71 |
-
.sow-carousel-thumbnail a {
|
72 |
-
background-repeat: no-repeat;
|
73 |
-
background-size: @thumbnail_width @thumbnail_height;
|
74 |
-
|
75 |
-
&, span.overlay {
|
76 |
-
width: @thumbnail_width;
|
77 |
-
height: @thumbnail_height;
|
78 |
-
}
|
79 |
-
|
80 |
-
span.overlay {
|
81 |
-
background: @thumbnail_overlay_hover_color;
|
82 |
-
}
|
83 |
-
}
|
84 |
-
|
85 |
-
@{item_title_tag}.sow-carousel-item-title {
|
86 |
-
color: @item_title_color;
|
87 |
-
font-size: @item_title_font_size;
|
88 |
-
font-weight: 500;
|
89 |
-
margin: 10px 0 0 0;
|
90 |
-
text-align: center;
|
91 |
-
|
92 |
-
a {
|
93 |
-
text-decoration: none;
|
94 |
-
color: inherit;
|
95 |
-
}
|
96 |
-
}
|
97 |
-
|
98 |
-
&:focus,
|
99 |
-
&:hover {
|
100 |
-
.sow-carousel-thumbnail a {
|
101 |
-
background-size: @thumbnail_hover_width @thumbnail_hover_height;
|
102 |
-
|
103 |
-
span.overlay {
|
104 |
-
opacity: @thumbnail_overlay_hover_opacity;
|
105 |
-
}
|
106 |
-
}
|
107 |
-
}
|
108 |
-
|
109 |
-
.sow-carousel-default-thumbnail {
|
110 |
-
width: @thumbnail_width;
|
111 |
-
height: @thumbnail_height;
|
112 |
-
}
|
113 |
-
}
|
114 |
-
|
115 |
-
.sow-carousel-loading {
|
116 |
-
width: @thumbnail_width;
|
117 |
-
height: @thumbnail_height;
|
118 |
-
}
|
119 |
-
}
|
120 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|