Shortcodes by Angie Makes - Version 1.46

Version Description

Download this release

Release Info

Developer cbaldelomar
Plugin Icon wp plugin Shortcodes by Angie Makes
Version 1.46
Comparing to
See all releases

Code changes from version 1.45 to 1.46

Files changed (16) hide show
  1. README.md +6 -0
  2. includes/css/style.css +7 -0
  3. includes/functions.php +163 -0
  4. includes/js/fullwidth.js +1 -1
  5. includes/shortcode-functions.php +1 -1
  6. includes/templates/content-aside.php +1 -1
  7. includes/templates/content-audio.php +2 -2
  8. includes/templates/content-chat.php +1 -1
  9. includes/templates/content-excerpt.php +1 -1
  10. includes/templates/content-gallery.php +1 -1
  11. includes/templates/content-link.php +1 -1
  12. includes/templates/content-quote.php +1 -1
  13. includes/templates/content-video.php +2 -2
  14. includes/templates/content.php +1 -1
  15. readme.txt +6 -0
  16. wc-shortcodes.php +2 -2
README.md CHANGED
@@ -66,6 +66,12 @@ Use the shortcode manager in the TinyMCE text editor
66
 
67
  ## Changelog ##
68
 
 
 
 
 
 
 
69
  ### Version 1.45
70
 
71
  * Added theme support for social icons and share buttons
66
 
67
  ## Changelog ##
68
 
69
+ ### Version 1.46
70
+
71
+ * hide fullwidth items until they have broken free from their container.
72
+ * Fixed problem with plugins appending text to content in wc_post shortcode display
73
+ * Update the wc_heading shortcode
74
+
75
  ### Version 1.45
76
 
77
  * Added theme support for social icons and share buttons
includes/css/style.css CHANGED
@@ -1417,3 +1417,10 @@ pre.pre-wrap {
1417
  .wc-shortcodes-image-wrapper.aligncenter {
1418
  margin-bottom: 20px;
1419
  }
 
 
 
 
 
 
 
1417
  .wc-shortcodes-image-wrapper.aligncenter {
1418
  margin-bottom: 20px;
1419
  }
1420
+ /**
1421
+ * [wc_fullwidth]
1422
+ * ----------------------------------------------------------------------------
1423
+ */
1424
+ .wc-shortcodes-full-width {
1425
+ visibility: hidden;
1426
+ }
includes/functions.php CHANGED
@@ -222,3 +222,166 @@ function wc_shortcodes_body_class( $classes ) {
222
  return $classes;
223
  }
224
  add_filter( 'body_class', 'wc_shortcodes_body_class' );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
222
  return $classes;
223
  }
224
  add_filter( 'body_class', 'wc_shortcodes_body_class' );
225
+
226
+ function wc_shortcodes_add_filters_for_custom_content() {
227
+ add_filter( 'wc_shortcodes_the_content', array( $GLOBALS['wp_embed'], 'autoembed' ), 8 );
228
+ add_filter( 'wc_shortcodes_the_content', array( $GLOBALS['wp_embed'], 'run_shortcode' ), 8 );
229
+ add_filter( 'wc_shortcodes_the_content', 'wptexturize' );
230
+ add_filter( 'wc_shortcodes_the_content', 'convert_smilies' );
231
+ add_filter( 'wc_shortcodes_the_content', 'convert_chars' );
232
+ add_filter( 'wc_shortcodes_the_content', 'wpautop' );
233
+ add_filter( 'wc_shortcodes_the_content', 'shortcode_unautop' );
234
+ add_filter( 'wc_shortcodes_the_content', 'prepend_attachment' );
235
+ add_filter( 'wc_shortcodes_the_content', 'do_shortcode', 11 ); // AFTER wpautop()
236
+
237
+ add_filter( 'wc_shortcodes_get_the_excerpt', 'wc_shortcodes_wp_trim_excerpt' );
238
+
239
+ add_filter( 'wc_shortcodes_the_excerpt', 'wptexturize' );
240
+ add_filter( 'wc_shortcodes_the_excerpt', 'convert_smilies' );
241
+ add_filter( 'wc_shortcodes_the_excerpt', 'convert_chars' );
242
+ add_filter( 'wc_shortcodes_the_excerpt', 'wpautop' );
243
+ add_filter( 'wc_shortcodes_the_excerpt', 'shortcode_unautop');
244
+ }
245
+ add_action( 'init', 'wc_shortcodes_add_filters_for_custom_content' );
246
+
247
+ function wc_shortcodes_the_media_content( $more_link_text = null, $strip_teaser = false ) {
248
+ $content = get_the_content( $more_link_text, $strip_teaser );
249
+
250
+ $pieces = explode( "\n", $content );
251
+
252
+ $content = '';
253
+
254
+ foreach ( $pieces as $line ) {
255
+ if ( empty( $line ) ) {
256
+ continue;
257
+ }
258
+
259
+ if ( preg_match( '|^\s*(https?://[^\s"]+)\s*$|im', $line ) ) {
260
+ $content = $line;
261
+ break;
262
+ }
263
+ else if ( has_shortcode( $line, 'audio' ) ) {
264
+ $content = $line;
265
+ break;
266
+ }
267
+ else if ( has_shortcode( $line, 'video' ) ) {
268
+ $content = $line;
269
+ break;
270
+ }
271
+ }
272
+
273
+ /**
274
+ * Filter the post content.
275
+ *
276
+ * @since 0.71
277
+ *
278
+ * @param string $content Content of the current post.
279
+ */
280
+ $content = apply_filters( 'wc_shortcodes_the_content', $content );
281
+ $content = str_replace( ']]>', ']]>', $content );
282
+ echo $content;
283
+ }
284
+
285
+ function wc_shortcodes_the_content( $more_link_text = null, $strip_teaser = false ) {
286
+ $content = get_the_content( $more_link_text, $strip_teaser );
287
+
288
+ /**
289
+ * Filter the post content.
290
+ *
291
+ * @since 0.71
292
+ *
293
+ * @param string $content Content of the current post.
294
+ */
295
+ $content = apply_filters( 'wc_shortcodes_the_content', $content );
296
+ $content = str_replace( ']]>', ']]>', $content );
297
+ echo $content;
298
+ }
299
+
300
+ function wc_shortcodes_the_excerpt() {
301
+ $excerpt = wc_shortcodes_get_the_excerpt();
302
+
303
+ /**
304
+ * Filter the post content.
305
+ *
306
+ * @since 0.71
307
+ *
308
+ * @param string $content Content of the current post.
309
+ */
310
+ $excerpt = apply_filters( 'wc_shortcodes_the_excerpt', $excerpt );
311
+ echo $excerpt;
312
+ }
313
+
314
+ function wc_shortcodes_get_the_excerpt( $deprecated = '' ) {
315
+ if ( !empty( $deprecated ) )
316
+ _deprecated_argument( __FUNCTION__, '2.3' );
317
+
318
+ $post = get_post();
319
+
320
+ if ( post_password_required() ) {
321
+ return __( 'There is no excerpt because this is a protected post.' );
322
+ }
323
+
324
+ /**
325
+ * Filter the retrieved post excerpt.
326
+ *
327
+ * @since 1.2.0
328
+ *
329
+ * @param string $post_excerpt The post excerpt.
330
+ */
331
+ return apply_filters( 'wc_shortcodes_get_the_excerpt', $post->post_excerpt );
332
+ }
333
+
334
+ /**
335
+ * Generates an excerpt from the content, if needed.
336
+ *
337
+ * The excerpt word amount will be 55 words and if the amount is greater than
338
+ * that, then the string ' […]' will be appended to the excerpt. If the string
339
+ * is less than 55 words, then the content will be returned as is.
340
+ *
341
+ * The 55 word limit can be modified by plugins/themes using the excerpt_length filter
342
+ * The ' […]' string can be modified by plugins/themes using the excerpt_more filter
343
+ *
344
+ * @since 1.5.0
345
+ *
346
+ * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
347
+ * @return string The excerpt.
348
+ */
349
+ function wc_shortcodes_wp_trim_excerpt($text = '') {
350
+ $raw_excerpt = $text;
351
+ if ( '' == $text ) {
352
+ $text = get_the_content('');
353
+
354
+ $text = strip_shortcodes( $text );
355
+
356
+ /** This filter is documented in wp-includes/post-template.php */
357
+ $text = apply_filters( 'wc_shortcodes_the_content', $text );
358
+ $text = str_replace(']]>', ']]>', $text);
359
+
360
+ /**
361
+ * Filter the number of words in an excerpt.
362
+ *
363
+ * @since 2.7.0
364
+ *
365
+ * @param int $number The number of words. Default 55.
366
+ */
367
+ $excerpt_length = apply_filters( 'excerpt_length', 55 );
368
+ /**
369
+ * Filter the string in the "more" link displayed after a trimmed excerpt.
370
+ *
371
+ * @since 2.9.0
372
+ *
373
+ * @param string $more_string The string shown within the more link.
374
+ */
375
+ $excerpt_more = apply_filters( 'excerpt_more', ' ' . '[…]' );
376
+ $text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
377
+ }
378
+ /**
379
+ * Filter the trimmed excerpt string.
380
+ *
381
+ * @since 2.8.0
382
+ *
383
+ * @param string $text The trimmed text.
384
+ * @param string $raw_excerpt The text prior to trimming.
385
+ */
386
+ return apply_filters( 'wp_trim_excerpt', $text, $raw_excerpt );
387
+ }
includes/js/fullwidth.js CHANGED
@@ -39,7 +39,7 @@
39
  marginLeft = marginRight = Math.floor( ( siteWidth - contentWidth ) / 2 ) * -1;
40
 
41
  // apply margin offset
42
- $this.css( {'margin-left': marginLeft+'px', 'margin-right': marginRight+'px'} );
43
  }
44
  });
45
  };
39
  marginLeft = marginRight = Math.floor( ( siteWidth - contentWidth ) / 2 ) * -1;
40
 
41
  // apply margin offset
42
+ $this.css( {'margin-left': marginLeft+'px', 'margin-right': marginRight+'px', 'visibility':'visible'} );
43
  }
44
  });
45
  };
includes/shortcode-functions.php CHANGED
@@ -832,7 +832,7 @@ if( !function_exists('wc_shortcodes_heading') ) {
832
  if ( $icon_left ) $output .= '<i class="wc-shortcodes-button-icon-left icon-'. $icon_left .'"></i>';
833
  $output .= $title;
834
  if ( $icon_right ) $output .= '<i class="wc-shortcodes-button-icon-right icon-'. $icon_right .'"></i>';
835
- $output .= '</'.$type.'></span>';
836
 
837
  if ( 'h1' == $type )
838
  $output = '<header class="entry-header">'. $output . '</header>';
832
  if ( $icon_left ) $output .= '<i class="wc-shortcodes-button-icon-left icon-'. $icon_left .'"></i>';
833
  $output .= $title;
834
  if ( $icon_right ) $output .= '<i class="wc-shortcodes-button-icon-right icon-'. $icon_right .'"></i>';
835
+ $output .= '</span></'.$type.'>';
836
 
837
  if ( 'h1' == $type )
838
  $output = '<header class="entry-header">'. $output . '</header>';
includes/templates/content-aside.php CHANGED
@@ -10,7 +10,7 @@
10
  <div class="wc-shortcodes-post-content">
11
  <?php if ( $atts['content'] ) : ?>
12
  <div class="wc-shortcodes-entry-summary">
13
- <?php the_content(); ?>
14
  </div><!-- .entry-summary -->
15
  <?php endif; ?>
16
 
10
  <div class="wc-shortcodes-post-content">
11
  <?php if ( $atts['content'] ) : ?>
12
  <div class="wc-shortcodes-entry-summary">
13
+ <?php wc_shortcodes_the_content(); ?>
14
  </div><!-- .entry-summary -->
15
  <?php endif; ?>
16
 
includes/templates/content-audio.php CHANGED
@@ -2,7 +2,7 @@
2
  <div id="post-<?php the_ID(); ?>" <?php post_class( $classes ); ?>>
3
  <div class="wc-shortcodes-post-border">
4
  <div class="wc-shortcodes-entry-audio">
5
- <?php the_content(); ?>
6
  </div><!-- .entry-summary -->
7
 
8
  <div class="wc-shortcodes-post-content">
@@ -16,7 +16,7 @@
16
 
17
  <?php if ( $atts['content'] ) : ?>
18
  <div class="wc-shortcodes-entry-summary">
19
- <?php the_excerpt(); ?>
20
  </div>
21
  <?php endif; ?>
22
 
2
  <div id="post-<?php the_ID(); ?>" <?php post_class( $classes ); ?>>
3
  <div class="wc-shortcodes-post-border">
4
  <div class="wc-shortcodes-entry-audio">
5
+ <?php wc_shortcodes_the_media_content(); ?>
6
  </div><!-- .entry-summary -->
7
 
8
  <div class="wc-shortcodes-post-content">
16
 
17
  <?php if ( $atts['content'] ) : ?>
18
  <div class="wc-shortcodes-entry-summary">
19
+ <?php wc_shortcodes_the_excerpt(); ?>
20
  </div>
21
  <?php endif; ?>
22
 
includes/templates/content-chat.php CHANGED
@@ -18,7 +18,7 @@
18
 
19
  <?php if ( $atts['content'] ) : ?>
20
  <div class="wc-shortcodes-entry-summary">
21
- <?php the_content(); ?>
22
  </div><!-- .entry-summary -->
23
  <?php endif; ?>
24
 
18
 
19
  <?php if ( $atts['content'] ) : ?>
20
  <div class="wc-shortcodes-entry-summary">
21
+ <?php wc_shortcodes_the_excerpt(); ?>
22
  </div><!-- .entry-summary -->
23
  <?php endif; ?>
24
 
includes/templates/content-excerpt.php CHANGED
@@ -18,7 +18,7 @@
18
 
19
  <?php if ( $atts['content'] ) : ?>
20
  <div class="wc-shortcodes-entry-summary">
21
- <?php the_excerpt(); ?>
22
  </div><!-- .entry-summary -->
23
  <?php endif; ?>
24
 
18
 
19
  <?php if ( $atts['content'] ) : ?>
20
  <div class="wc-shortcodes-entry-summary">
21
+ <?php wc_shortcodes_the_excerpt(); ?>
22
  </div><!-- .entry-summary -->
23
  <?php endif; ?>
24
 
includes/templates/content-gallery.php CHANGED
@@ -26,7 +26,7 @@
26
 
27
  <?php if ( $atts['content'] ) : ?>
28
  <div class="wc-shortcodes-entry-summary">
29
- <?php the_excerpt(); ?>
30
  </div><!-- .entry-summary -->
31
  <?php endif; ?>
32
 
26
 
27
  <?php if ( $atts['content'] ) : ?>
28
  <div class="wc-shortcodes-entry-summary">
29
+ <?php wc_shortcodes_the_excerpt(); ?>
30
  </div><!-- .entry-summary -->
31
  <?php endif; ?>
32
 
includes/templates/content-link.php CHANGED
@@ -23,7 +23,7 @@
23
 
24
  <?php if ( $atts['content'] ) : ?>
25
  <div class="wc-shortcodes-entry-summary">
26
- <?php the_content(); ?>
27
  </div><!-- .entry-summary -->
28
  <?php endif; ?>
29
 
23
 
24
  <?php if ( $atts['content'] ) : ?>
25
  <div class="wc-shortcodes-entry-summary">
26
+ <?php wc_shortcodes_the_content(); ?>
27
  </div><!-- .entry-summary -->
28
  <?php endif; ?>
29
 
includes/templates/content-quote.php CHANGED
@@ -3,7 +3,7 @@
3
  <div class="wc-shortcodes-post-border">
4
  <?php if ( $atts['content'] ) : ?>
5
  <div class="wc-shortcodes-entry-quote">
6
- <?php the_content(); ?>
7
  </div><!-- .entry-summary -->
8
  <?php endif; ?>
9
 
3
  <div class="wc-shortcodes-post-border">
4
  <?php if ( $atts['content'] ) : ?>
5
  <div class="wc-shortcodes-entry-quote">
6
+ <?php wc_shortcodes_the_content(); ?>
7
  </div><!-- .entry-summary -->
8
  <?php endif; ?>
9
 
includes/templates/content-video.php CHANGED
@@ -2,7 +2,7 @@
2
  <div id="post-<?php the_ID(); ?>" <?php post_class( $classes ); ?>>
3
  <div class="wc-shortcodes-post-border">
4
  <div class="wc-shortcodes-entry-video">
5
- <?php the_content(); ?>
6
  </div><!-- .entry-summary -->
7
 
8
  <div class="wc-shortcodes-post-content">
@@ -16,7 +16,7 @@
16
 
17
  <?php if ( $atts['content'] ) : ?>
18
  <div class="wc-shortcodes-entry-summary">
19
- <?php the_excerpt(); ?>
20
  </div>
21
  <?php endif; ?>
22
 
2
  <div id="post-<?php the_ID(); ?>" <?php post_class( $classes ); ?>>
3
  <div class="wc-shortcodes-post-border">
4
  <div class="wc-shortcodes-entry-video">
5
+ <?php wc_shortcodes_the_media_content(); ?>
6
  </div><!-- .entry-summary -->
7
 
8
  <div class="wc-shortcodes-post-content">
16
 
17
  <?php if ( $atts['content'] ) : ?>
18
  <div class="wc-shortcodes-entry-summary">
19
+ <?php wc_shortcodes_the_excerpt(); ?>
20
  </div>
21
  <?php endif; ?>
22
 
includes/templates/content.php CHANGED
@@ -18,7 +18,7 @@
18
 
19
  <?php if ( $atts['content'] ) : ?>
20
  <div class="wc-shortcodes-entry-summary">
21
- <?php the_excerpt(); ?>
22
  </div><!-- .entry-summary -->
23
  <?php endif; ?>
24
 
18
 
19
  <?php if ( $atts['content'] ) : ?>
20
  <div class="wc-shortcodes-entry-summary">
21
+ <?php wc_shortcodes_the_excerpt(); ?>
22
  </div><!-- .entry-summary -->
23
  <?php endif; ?>
24
 
readme.txt CHANGED
@@ -88,6 +88,12 @@ Use the shortcode manager in the TinyMCE text editor
88
 
89
  == Changelog ==
90
 
 
 
 
 
 
 
91
  ### Version 1.45
92
 
93
  * Added theme support for social icons and share buttons
88
 
89
  == Changelog ==
90
 
91
+ ### Version 1.46
92
+
93
+ * hide fullwidth items until they have broken free from their container.
94
+ * Fixed problem with plugins appending text to content in wc_post shortcode display
95
+ * Update the wc_heading shortcode
96
+
97
  ### Version 1.45
98
 
99
  * Added theme support for social icons and share buttons
wc-shortcodes.php CHANGED
@@ -5,11 +5,11 @@ Plugin URI: http://webplantmedia.com/starter-themes/wordpresscanvas/features/sho
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
- Version: 1.45
9
  License: GPLv2 or later
10
  */
11
 
12
- define( 'WC_SHORTCODES_VERSION', '1.45' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
+ Version: 1.46
9
  License: GPLv2 or later
10
  */
11
 
12
+ define( 'WC_SHORTCODES_VERSION', '1.46' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );