Master Slider – Responsive Touch Slider - Version 1.4.2

Version Description

Download this release

Release Info

Developer averta
Plugin Icon 128x128 Master Slider – Responsive Touch Slider
Version 1.4.2
Comparing to
See all releases

Code changes from version 1.4.0 to 1.4.2

Files changed (4) hide show
  1. README.txt +8 -3
  2. includes/init/define.php +1 -1
  3. master-slider.php +1 -1
  4. public/includes/class-msp-frontend-assets.php +37 -19
README.txt CHANGED
@@ -6,7 +6,7 @@ License URI: http://www.gnu.org/licenses/gpl.html
6
  Tags: banner rotator, carousel, content slider, gallery, image slider, responsive slider, showcase, slideshow, swipe, touch slider, video gallery, SEO, vertical slide, HTML5 slider, hardware accelerate, css3, animation, mobile slider, iOS, android, video slider, youtube slider, horizontal slider, vertical slider, fullwidth slider, fullscreen slider, post slider, photo slider, online album, mobile slider, WordPress slider,wpml, ,ultisite, wistia, woocommerce, product slider, woocommerce slider, portfolio, gallery
7
  Requires at least: 3.8
8
  Tested up to: 4.1.0
9
- Stable tag: 1.4.0
10
 
11
  The Most advanced responsive HTML5 WordPress slider plugin with touch swipe navigation that works smoothly on devices too.
12
 
@@ -226,6 +226,11 @@ Bugs can be reported in our [support forums](http://wordpress.org/tags/master-sl
226
 
227
  == Changelog ==
228
 
 
 
 
 
 
229
  = Version 1.4.0 / (19.12.2014) =
230
  - A conflict with modal in WordPress 4.1 fixed
231
 
@@ -301,5 +306,5 @@ Bugs can be reported in our [support forums](http://wordpress.org/tags/master-sl
301
 
302
  == Upgrade Notice ==
303
 
304
- = 1.4.0 =
305
- - A conflict with modal in WordPress 4.1 fixed
6
  Tags: banner rotator, carousel, content slider, gallery, image slider, responsive slider, showcase, slideshow, swipe, touch slider, video gallery, SEO, vertical slide, HTML5 slider, hardware accelerate, css3, animation, mobile slider, iOS, android, video slider, youtube slider, horizontal slider, vertical slider, fullwidth slider, fullscreen slider, post slider, photo slider, online album, mobile slider, WordPress slider,wpml, ,ultisite, wistia, woocommerce, product slider, woocommerce slider, portfolio, gallery
7
  Requires at least: 3.8
8
  Tested up to: 4.1.0
9
+ Stable tag: 1.4.2
10
 
11
  The Most advanced responsive HTML5 WordPress slider plugin with touch swipe navigation that works smoothly on devices too.
12
 
226
 
227
  == Changelog ==
228
 
229
+ = Version 1.4.2 / (7.1.2015) =
230
+ - [Improvement]: Improvement in loading front end assets
231
+ - [New]: New developer API added
232
+ - [Fix]: Minor bugs fixed
233
+
234
  = Version 1.4.0 / (19.12.2014) =
235
  - A conflict with modal in WordPress 4.1 fixed
236
 
306
 
307
  == Upgrade Notice ==
308
 
309
+ = 1.4.2 =
310
+ - Improvement in loading front end assets and new API added
includes/init/define.php CHANGED
@@ -5,7 +5,7 @@ if ( ! defined('ABSPATH') ) {
5
  die();
6
  }
7
 
8
- define( 'MSWP_AVERTA_VERSION' , '1.4.0' );
9
 
10
  define( 'MSWP_SLUG' , 'master-slider' );
11
  define( 'MSWP_TEXT_DOMAIN' , 'masterslider' );
5
  die();
6
  }
7
 
8
+ define( 'MSWP_AVERTA_VERSION' , '1.4.2' );
9
 
10
  define( 'MSWP_SLUG' , 'master-slider' );
11
  define( 'MSWP_TEXT_DOMAIN' , 'masterslider' );
master-slider.php CHANGED
@@ -11,7 +11,7 @@
11
  * Plugin Name: Master Slider
12
  * Plugin URI: https://wordpress.org/plugins/master-slider/
13
  * Description: Master Slider is the most advanced responsive HTML5 WordPress slider plugin with touch swipe navigation that works smoothly on devices too.
14
- * Version: 1.4.0
15
  * Author: averta
16
  * Author URI: http://averta.net
17
  * Text Domain: master-slider
11
  * Plugin Name: Master Slider
12
  * Plugin URI: https://wordpress.org/plugins/master-slider/
13
  * Description: Master Slider is the most advanced responsive HTML5 WordPress slider plugin with touch swipe navigation that works smoothly on devices too.
14
+ * Version: 1.4.2
15
  * Author: averta
16
  * Author URI: http://averta.net
17
  * Text Domain: master-slider
public/includes/class-msp-frontend-assets.php CHANGED
@@ -32,6 +32,7 @@ class MSP_Frontend_Assets {
32
 
33
  add_action( 'wp_enqueue_scripts', array( $this, 'load_assets' ), 15 );
34
  add_action( 'wp_head' , array( $this, 'inline_css_fallback' ) );
 
35
  }
36
 
37
  /**
@@ -82,24 +83,11 @@ class MSP_Frontend_Assets {
82
 
83
  // Load Css files
84
  if ( $enqueue_styles ) {
85
- foreach ( $enqueue_styles as $handle => $args )
86
  wp_enqueue_style( $handle, $args['src'], $args['deps'], $args['version'] );
 
87
  }
88
 
89
-
90
- // load custom.css if the directory is writable. else use inline css fallback
91
- $inline_css = msp_get_option( 'custom_inline_style', '' );
92
- if( empty( $inline_css ) ) {
93
-
94
- $custom_css_ver = msp_get_option( 'masterslider_custom_css_ver', '1.0' );
95
-
96
- $uploads = wp_upload_dir();
97
- $css_file = $uploads['baseurl'] . '/' . MSWP_SLUG . '/custom.css';
98
- $css_file = apply_filters( 'masterslider_custom_css_url', $css_file );
99
-
100
- wp_enqueue_style ( $this->prefix . 'custom' , $css_file , array( $this->prefix . 'main' ), $custom_css_ver );
101
- }
102
-
103
  }
104
 
105
 
@@ -111,7 +99,7 @@ class MSP_Frontend_Assets {
111
  */
112
  public function get_styles() {
113
 
114
- return apply_filters( 'masterslider_enqueue_styles', array(
115
 
116
  $this->prefix . 'main' => array(
117
  'src' => $this->assets_dir . '/css/masterslider.main.css' ,
@@ -119,7 +107,25 @@ class MSP_Frontend_Assets {
119
  'version' => $this->version
120
  )
121
 
122
- ) );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
123
  }
124
 
125
 
@@ -129,15 +135,27 @@ class MSP_Frontend_Assets {
129
  function inline_css_fallback(){
130
 
131
  $inline_css = msp_get_option( 'custom_inline_style', '' );
 
132
 
133
  // if custom.css is not writable, print css styles in page header
134
  if( ! empty( $inline_css ) ) {
135
- if( current_user_can( 'manage_options' ) )
136
  printf( "<!-- Note for admin: The custom.css file in [%s] is not writeable, so masterslider uses inline css callback instead. -->\n", MSWP_AVERTA_URL . '/assets/custom.css' );
 
137
  printf( "<style>%s</style>\n", $inline_css );
138
  }
139
 
140
- printf( "<script>var ms_grabbing_curosr = '%s', ms_grab_curosr = '%s';</script>\n", MSWP_AVERTA_URL . '/public/assets/css/common/grabbing.cur', MSWP_AVERTA_URL . '/public/assets/css/common/grab.cur' );
 
 
 
 
 
 
 
 
 
 
141
  }
142
 
143
  }
32
 
33
  add_action( 'wp_enqueue_scripts', array( $this, 'load_assets' ), 15 );
34
  add_action( 'wp_head' , array( $this, 'inline_css_fallback' ) );
35
+ add_action( 'wp_head' , array( $this, 'meta_generator' ) );
36
  }
37
 
38
  /**
83
 
84
  // Load Css files
85
  if ( $enqueue_styles ) {
86
+ foreach ( $enqueue_styles as $handle => $args ){
87
  wp_enqueue_style( $handle, $args['src'], $args['deps'], $args['version'] );
88
+ }
89
  }
90
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
91
  }
92
 
93
 
99
  */
100
  public function get_styles() {
101
 
102
+ $enqueue_styles = array(
103
 
104
  $this->prefix . 'main' => array(
105
  'src' => $this->assets_dir . '/css/masterslider.main.css' ,
107
  'version' => $this->version
108
  )
109
 
110
+ );
111
+
112
+ // load custom.css if the directory is writable. else use inline css fallback
113
+ $inline_css = msp_get_option( 'custom_inline_style', '' );
114
+
115
+ if( empty( $inline_css ) ) {
116
+ $custom_css_ver = msp_get_option( 'masterslider_custom_css_ver', '1.0' );
117
+
118
+ $uploads = wp_upload_dir();
119
+ $css_file = $uploads['baseurl'] . '/' . MSWP_SLUG . '/custom.css';
120
+ $css_file = apply_filters( 'masterslider_custom_css_url', $css_file );
121
+
122
+ // enqueue custom css file in $enqueue_styles list
123
+ $enqueue_styles[ $this->prefix . 'custom' ] = array(
124
+ 'src' => $css_file ,
125
+ 'deps' => array( $this->prefix . 'main' ),
126
+ 'version' => $custom_css_ver
127
+ );
128
+ }
129
  }
130
 
131
 
135
  function inline_css_fallback(){
136
 
137
  $inline_css = msp_get_option( 'custom_inline_style', '' );
138
+ $inline_css = apply_filters( 'masterslider_custom_inline_style', $inline_css );
139
 
140
  // if custom.css is not writable, print css styles in page header
141
  if( ! empty( $inline_css ) ) {
142
+ if( current_user_can( 'manage_options' ) ){
143
  printf( "<!-- Note for admin: The custom.css file in [%s] is not writeable, so masterslider uses inline css callback instead. -->\n", MSWP_AVERTA_URL . '/assets/custom.css' );
144
+ }
145
  printf( "<style>%s</style>\n", $inline_css );
146
  }
147
 
148
+ printf( "<script>var ms_grabbing_curosr='%s',ms_grab_curosr='%s';function msCli(f){f=f||'pause';var m=masterslider_instances;for(var i in m){m[i].api[f]();}}</script>\n",
149
+ MSWP_AVERTA_URL . '/public/assets/css/common/grabbing.cur',
150
+ MSWP_AVERTA_URL . '/public/assets/css/common/grab.cur' );
151
+ }
152
+
153
+
154
+ /**
155
+ * Print meta generator tag
156
+ */
157
+ function meta_generator(){
158
+ echo sprintf( '<meta name="generator" content="MasterSlider %s - Responsive Touch Image Slider | http://avt.li/MsF" />', MSWP_AVERTA_VERSION )."\n";
159
  }
160
 
161
  }