← All changes | modules/wpbakery/elements/progress-bar.php +11 -43 trunk → 1.2.5 View file →

		@@ -29,35 +29,9 @@
29	29	'css_animation' => ''
30	30	), $atts ) );
31	31	$output = '';
32	32
33		- // Assets.
34		- wp_enqueue_style(
35		- 'borderless-wpbakery-style',
36		- BORDERLESS__STYLES . 'wpbakery.min.css',
37		- false,
38		- BORDERLESS__VERSION
39		- );
40		- wp_enqueue_script(
41		- 'borderless-wpbakery-appear-script',
42		- BORDERLESS__LIB . 'appear.js', array('jquery'),
43		- '1.0.0',
44		- true
45		- );
46		- wp_enqueue_script(
47		- 'borderless-wpbakery-progressbar-script',
48		- BORDERLESS__LIB . 'progressbar.js', array('jquery'),
49		- '1.1.0',
50		- true
51		- );
52		- wp_enqueue_script(
53		- 'borderless-wpbakery-script',
54		- BORDERLESS__SCRIPTS . 'borderless-wpbakery.min.js', array('jquery'),
55		- BORDERLESS__VERSION,
56		- true
57		- );
58	33
59		-
60	34	// Retrieve data from the database.
61	35	$options = get_option( 'borderless' );
62	36
63	37
		@@ -69,14 +43,13 @@
69	43
70	44
71	45	// Default Extra Class, CSS and CSS animation
72	46	$css = isset( $atts['css'] ) ? $atts['css'] : '';
73		- $el_id = isset( $atts['el_id'] ) ? $atts['el_id'] : '';
74		- $el_id = ! empty( $el_id ) ? 'id="' . esc_attr( $el_id ) . '"' : '';
	47	+ $el_id = isset( $atts['el_id'] ) ? 'id="' . esc_attr( $el_id ) . '"' : '';
75	48	$el_class = isset( $atts['el_class'] ) ? $atts['el_class'] : '';
76	49	if ( '' !== $css_animation ) {
77	50	wp_enqueue_script( 'waypoints' );
78		- $css_animation_style = ' wpb_animate_when_almost_visible wpb_' . esc_attr( $css_animation );
	51	+ $css_animation_style = ' wpb_animate_when_almost_visible wpb_' . $css_animation;
79	52	}
80	53	$class_to_filter = vc_shortcode_custom_css_class( $css, ' ' ) . $this->getExtraClass( $el_class ) . $this->getCSSAnimation( $css_animation );
81	54	$css_class = apply_filters( VC_SHORTCODE_CUSTOM_CSS_FILTER_TAG, $class_to_filter, $this->settings['base'], $atts );
82	55
		@@ -81,32 +54,28 @@
81	54	$css_class = apply_filters( VC_SHORTCODE_CUSTOM_CSS_FILTER_TAG, $class_to_filter, $this->settings['base'], $atts );
82	55
83	56
84	57	// Start Custom Colors
85		- $title_color_style = $title_color ? 'color:' . esc_attr( $title_color ) . ';' : 'color:' . esc_attr( $borderless_primary_color ) . ';';
	58	+ $title_color = $title_color ? 'style=color:'.$title_color.'' : 'style=color:'.$borderless_primary_color.'';
86	59
87		- $icon_color_style = $icon_color ? 'color:' . esc_attr( $icon_color ) . ';' : 'color:' . esc_attr( $borderless_primary_color ) . ';';
	60	+ $icon_color = $icon_color ? 'style=color:'.$icon_color.'' : 'style=color:'.$borderless_primary_color.'';
88	61
89		- $bar_color = $bar_color ? esc_attr( $bar_color ) : esc_attr( $borderless_primary_color );
	62	+ $bar_color = $bar_color ? $bar_color : $borderless_primary_color;
90	63
91		- $track_color = $track_color ? esc_attr( $track_color ) : '#f9f9f9';
	64	+ $track_color = $track_color ? $track_color : '#f9f9f9';
92	65	// End Custom Colors
93	66
94		- $height_style = $height ? 'height:' . esc_attr( $height ) . ';' : '';
	67	+ $height = $height ? 'style="height:'.$height.';"' : '';
95	68
96		- if ( $checkicon == "custom_icon" ) {
97		- $icon = '<i class="borderless-wpbakery-progress-bar-icon ' . esc_attr( $icon ) . '" style="' . esc_attr( $icon_color_style ) . '"></i>';
98		- } else {
99		- $icon = "";
100		- }
	69	+ if ($checkicon=="custom_icon") { $icon = '<i class="borderless-wpbakery-progress-bar-icon '.$icon.'" '.$icon_color.'></i>'; } else { $icon = ""; }
101	70
102	71	// Start Output
103	72
104		- $output .= '<div ' . $el_id . ' class="borderless-wpbakery-progress-bar ' . esc_attr( $css_class ) . '">';
	73	+ $output .= '<div '.$el_id.' class="borderless-wpbakery-progress-bar '.$css_class.'">';
105	74	$output .= $icon;
106	75	$output .= '<div class="borderless-wpbakery-progress-bar-inner">';
107		- $output .= '<span style="' . esc_attr( $title_color_style ) . '" class="progress-bar-title">' . esc_html( $title ) . '</span>';
108		- $output .= '<div class="borderless-wpbakery-progress-bar-params ' . esc_attr( $corner ) . '" style="' . esc_attr( $height_style ) . '" percentage="' . esc_attr( $percentage ) . '" bar_color="' . esc_attr( $bar_color ) . '" track_color="' . esc_attr( $track_color ) . '" percentage_color="' . esc_attr( $percentage_color ) . '"></div>';
	76	+ $output .= '<span '.$title_color.' class="progress-bar-title">'.$title.'</span>';
	77	+ $output .= '<div class="borderless-wpbakery-progress-bar-params '.$corner.'" '.$height.' percentage="'.$percentage.'" bar_color="'.$bar_color.'" track_color="'.$track_color.'" percentage_color="'.$percentage_color.'"></div>';
109	78	$output .= '</div></div>';
110	79
111	80	return $output;
112	81
		@@ -112,9 +81,8 @@
112	81
113	82	// End Output
114	83	}
115	84	}
116		-
117	85
118	86	return array(
119	87	'name' => __( 'Progress Bar', 'borderless' ),
120	88	'base' => 'borderless_wpbakery_progress_bar',