← All changes
|
app/Modules/VariationGallery/VariationGalleryInit.php
+9
-42
3.4.0
→
3.1.2
View file →
| @@ -78,9 +78,9 @@ | ||
| 78 | 78 | * |
| 79 | 79 | * @return void |
| 80 | 80 | */ |
| 81 | 81 | public function frontend_assets() { |
| 82 | - wp_dequeue_script( 'wc-flexslider' ); | |
| 82 | + wp_dequeue_script( 'flexslider' ); | |
| 83 | 83 | // Enqueue assets. |
| 84 | 84 | $this->handle = Fns::enqueue_module_assets( |
| 85 | 85 | $this->handle, |
| 86 | 86 | 'variation-gallery', |
| @@ -98,43 +98,8 @@ | ||
| 98 | 98 | 'version' => RTSB_VERSION, |
| 99 | 99 | 'type' => 'js', |
| 100 | 100 | ] |
| 101 | 101 | ); |
| 102 | - // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 103 | - if ( in_array( 'sitepress-multilingual-cms/sitepress.php', get_option( 'active_plugins' ) ) ) { | |
| 104 | - $ajaxurl = admin_url( 'admin-ajax.php?lang=' . ICL_LANGUAGE_CODE ); | |
| 105 | - } else { | |
| 106 | - $ajaxurl = admin_url( 'admin-ajax.php' ); | |
| 107 | - } | |
| 108 | - // The fileupload control stores [ 'id' => attachment ID, 'source' => URL ], | |
| 109 | - // but it can come back from the options store as a JSON string, so decode it | |
| 110 | - // before reading the URL; a raw JSON string must never be used as the URL. | |
| 111 | - $preloader_image = GalleryFns::get_options( 'preloader_image' ); | |
| 112 | - if ( is_string( $preloader_image ) && '' !== trim( $preloader_image ) ) { | |
| 113 | - $decoded = json_decode( wp_unslash( $preloader_image ), true ); | |
| 114 | - if ( is_array( $decoded ) ) { | |
| 115 | - $preloader_image = $decoded; | |
| 116 | - } | |
| 117 | - } | |
| 118 | - $preloader_image_url = ''; | |
| 119 | - if ( is_array( $preloader_image ) && ! empty( $preloader_image['source'] ) ) { | |
| 120 | - $preloader_image_url = $preloader_image['source']; | |
| 121 | - } elseif ( is_string( $preloader_image ) && filter_var( $preloader_image, FILTER_VALIDATE_URL ) ) { | |
| 122 | - $preloader_image_url = $preloader_image; | |
| 123 | - } | |
| 124 | - wp_localize_script( | |
| 125 | - $this->handle, | |
| 126 | - 'rtsbVgParams', | |
| 127 | - [ | |
| 128 | - 'ajaxurl' => esc_url( $ajaxurl ), | |
| 129 | - 'admin_url' => esc_url( admin_url() ), | |
| 130 | - 'pro_version' => defined( 'RTSBPRO_VERSION' ) ? RTSBPRO_VERSION : false, | |
| 131 | - 'preloader' => GalleryFns::get_options( 'preloader' ) ? 'on' : '', | |
| 132 | - 'preloaderImage' => $preloader_image_url ? esc_url( $preloader_image_url ) : '', | |
| 133 | - 'changeEffect' => GalleryFns::get_options( 'gallery_change_effect', 'blur' ), | |
| 134 | - rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ), | |
| 135 | - ] | |
| 136 | - ); | |
| 137 | 102 | $this->frontend_dynamic_css(); |
| 138 | 103 | } |
| 139 | 104 | |
| 140 | 105 | /** |
| @@ -148,12 +113,17 @@ | ||
| 148 | 113 | $dynamic_css .= '--vg-main-slider-v-alignment:' . $alignment . ';'; |
| 149 | 114 | $dynamic_css .= '--vg-grid-column:' . absint( $col ) . ';'; |
| 150 | 115 | $dynamic_css .= '--vg-main-slider-border-color:' . ( ! empty( $options['main_image_border_color'] ) ? $options['main_image_border_color'] : 'transparent' ) . ';'; |
| 151 | 116 | $dynamic_css .= '--vg-thumb-border-color:' . ( ! empty( $options['thumbnail_item_border_color'] ) ? $options['thumbnail_item_border_color'] : '#eee' ) . ';'; |
| 152 | - $dynamic_css .= '--vg-thumb-active-border-color:' . ( ! empty( $options['thumbnail_active_border_color'] ) ? $options['thumbnail_active_border_color'] : '#444' ) . ';'; | |
| 153 | - $dynamic_css .= '--vg-thumb-item-inner-padding:' . ( isset( $options['thumbnail_item_inner_padding'] ) && '' !== $options['thumbnail_item_inner_padding'] ? absint( $options['thumbnail_item_inner_padding'] ) : '8' ) . 'px;'; | |
| 117 | + $dynamic_css .= '--vg-thumb-item-inner-padding:' . ( ! empty( $options['thumbnail_item_inner_padding'] ) ? $options['thumbnail_item_inner_padding'] : '8' ) . 'px;'; | |
| 154 | 118 | $dynamic_css .= '--vg-thumb-border-radius:' . ( ! empty( $options['thumbnail_item_border_radius'] ) ? absint( $options['thumbnail_item_border_radius'] ) : '3' ) . 'px;'; |
| 155 | - $dynamic_css .= '--vg-thumb-gap:' . ( isset( $options['thumbnails_gap'] ) && '' !== $options['thumbnails_gap'] ? absint( $options['thumbnails_gap'] ) : '10' ) . 'px;'; | |
| 119 | + $dynamic_css .= '--vg-thumb-gap:' . ( ! empty( $options['thumbnails_gap'] ) ? absint( $options['thumbnails_gap'] ) : '10' ) . 'px;'; | |
| 120 | + if ( ! empty( $options['main_image_section_width'] ) && absint( $options['image_section_height'] ) ) { | |
| 121 | + $dynamic_css .= '--vg-image-slider-height:' . absint( $options['image_section_height'] ) . 'px;'; | |
| 122 | + } | |
| 123 | + if ( ! empty( $options['thumb_image_section_width'] ) && absint( $options['thumb_image_section_width'] ) ) { | |
| 124 | + $dynamic_css .= '--vg-thumb-slider-width:' . absint( $options['thumb_image_section_width'] ) . 'px;'; | |
| 125 | + } | |
| 156 | 126 | $dynamic_css .= '}'; |
| 157 | 127 | if ( ! empty( $dynamic_css ) ) { |
| 158 | 128 | $dynamic_css = apply_filters( 'rtsb/variation/gallery/dynamic/css', $dynamic_css, $options ); |
| 159 | 129 | wp_add_inline_style( $this->handle, $dynamic_css ); |
| @@ -184,11 +154,8 @@ | ||
| 184 | 154 | 'rtsb-variation-gallery-admin', |
| 185 | 155 | 'rtsbVgParams', |
| 186 | 156 | [ |
| 187 | 157 | 'ajaxurl' => esc_url( $ajaxurl ), |
| 188 | - 'admin_url' => esc_url( admin_url() ), | |
| 189 | - 'pro_version' => defined( 'RTSBPRO_VERSION' ) ? RTSBPRO_VERSION : false, | |
| 190 | - 'nonce' => wp_create_nonce( 'rtsb_vg_nonce' ), | |
| 191 | 158 | 'media_title' => esc_html__( 'Choose an Image', 'shopbuilder' ), |
| 192 | 159 | 'button_title' => esc_html__( 'Use Image', 'shopbuilder' ), |
| 193 | 160 | 'add_media' => esc_html__( 'Add Media', 'shopbuilder' ), |
| 194 | 161 | 'add_video' => esc_html__( 'Add Video', 'shopbuilder' ), |