AesopInteractive / lasso

includes/process/map.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 			}
 
 			// udpate start point
-            $point = json_decode( $start_point, true );
+			$point = json_decode( $start_point, true );
 			update_post_meta( $postid, 'ase_map_component_start_point', $point );
 
 			// update zoom

public/includes/components.php

Indentation +11 added lines, -11 removed lines

@@ -236,16 +236,16 @@ 
 if ( !function_exists('lasso_wp_image') ):
 
 	function lasso_wp_image(){
-        $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
-        $use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
-        if ($use_wp_block_image == 'on') {
-        	return '<figure class="wp-block-image size-large" data-component-type="wpimg-block"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
-        }
-        else if ($use_old_wpimg != 'on') {
-        	return '<figure data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
-        } else {
-            return '<figure data-component-type="wpimg" data-linkoption="img" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
-        }
+		$use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+		$use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
+		if ($use_wp_block_image == 'on') {
+			return '<figure class="wp-block-image size-large" data-component-type="wpimg-block"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
+		}
+		else if ($use_old_wpimg != 'on') {
+			return '<figure data-component-type="wpimg" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
+		} else {
+			return '<figure data-component-type="wpimg" data-linkoption="img" class="lasso--wpimg__wrap lasso-component"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
+		}
 	}
 
 endif;
@@ -287,7 +287,7 @@ 
 
 if ( !function_exists('lasso_wp_image_block') ):
 	function lasso_wp_image_block(){
-        return '<figure class="wp-block-image size-large" data-component-type="wpimg-block"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
+		return '<figure class="wp-block-image size-large" data-component-type="wpimg-block"><img  src="'.LASSO_URL.'/public/assets/img/empty-img.png"></figure><p><br></p>';
 	}
 
 endif;

includes/process/meta.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 			}
 		}
 
-        do_action( 'editus_after_meta_update', $post_id, $data );
+		do_action( 'editus_after_meta_update', $post_id, $data );
 
 
 		return true;

public/includes/helpers.php

Indentation +27 added lines, -27 removed lines

@@ -199,13 +199,13 @@ 
 	if ( empty( $postid ) )
 		$postid = get_the_ID();
 
-    if ('category' == $taxonomy)  {
-        $objects = get_the_category( $postid );
-    } else if ('tag' == $taxonomy)  {
-        $objects = get_the_tags( $postid );
-    } else {
-        $objects = get_the_terms( $postid, $taxonomy );
-    }
+	if ('category' == $taxonomy)  {
+		$objects = get_the_category( $postid );
+	} else if ('tag' == $taxonomy)  {
+		$objects = get_the_tags( $postid );
+	} else {
+		$objects = get_the_terms( $postid, $taxonomy );
+	}
 
 	if ( empty( $objects) )
 		return;
@@ -227,16 +227,16 @@ 
 */
 function lasso_get_objects( $taxonomy = 'category' ) {
 
-    if ('category' == $taxonomy)  {
-        $objects = get_categories(array('hide_empty' => 0));
-    } else if ('tag' == $taxonomy)  {
-        $objects = get_tags(array('hide_empty' => 0));
-    } else {
-        $objects = get_terms( array(
-            'taxonomy' => $taxonomy,
-            'hide_empty' => false,
-        ));
-    }
+	if ('category' == $taxonomy)  {
+		$objects = get_categories(array('hide_empty' => 0));
+	} else if ('tag' == $taxonomy)  {
+		$objects = get_tags(array('hide_empty' => 0));
+	} else {
+		$objects = get_terms( array(
+			'taxonomy' => $taxonomy,
+			'hide_empty' => false,
+		));
+	}
 	
 	if ( empty( $objects) )
 		return;
@@ -261,7 +261,7 @@ 
 		'public' => true,
 	), 'objects' );
 	$post_types = array_combine( array_keys( $post_types ), wp_list_pluck( $post_types, 'label' ) );
-    unset( $post_types[ 'attachment' ] );
+	unset( $post_types[ 'attachment' ] );
 
 	/**
 	 * Set which post types are allowed
@@ -288,7 +288,7 @@ 
 	$post_types = get_post_types( array(
 		'public' => true,
 	), 'names' );
-    unset( $post_types[ 'attachment' ] );
+	unset( $post_types[ 'attachment' ] );
 
 	/**
 	 * Set which post types are allowed
@@ -400,7 +400,7 @@ 
  */
 if ( !function_exists( 'lasso_user_can' ) ):
 	function lasso_user_can( $action = '', $postid = 0 ) {
-        $result = false;
+		$result = false;
 		if ( empty( $action ) )
 			$action = 'edit_posts';
 
@@ -415,17 +415,17 @@ 
 				$allowed_post_types = array_diff($allowed_post_types,array('page'));
 			}
 			
-            if (!empty($allowed_post_types) && !empty($postid)) {
+			if (!empty($allowed_post_types) && !empty($postid)) {
 				$type = get_post_type( $postid );
-                $allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
+				$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
 				
-                if ( in_array( $type, $allowed_post_types ) ) {
+				if ( in_array( $type, $allowed_post_types ) ) {
 				   $result =  true;
-			    }
-            } else {
-                //we are not checking against a post, return true
+				}
+			} else {
+				//we are not checking against a post, return true
 				$result =  true;
-        	}
+			}
 		} else {
 			$result = false;
 		}

includes/process/new_object.php

Indentation +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 
 		$object = is_null( $data[ 'object'] ) ? false : $data[ 'object' ];
         
-        $new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );        
-        $new_post_text  = !empty($new_post_text) ? $new_post_text : wp_strip_all_tags(apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso')));
+		$new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );        
+		$new_post_text  = !empty($new_post_text) ? $new_post_text : wp_strip_all_tags(apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso')));
 
 		// insert a new post
 		$args = array(

public/includes/wrap-shortcodes.php

Indentation +10 added lines, -10 removed lines

@@ -23,11 +23,11 @@ 
 function lasso_wrap_shortcodes( $content ) {
 	global $shortcode_tags;
 
-    $no_wrap_shortcode    = lasso_editor_get_option( 'no_wrap_shortcode', 'lasso_editor');
+	$no_wrap_shortcode    = lasso_editor_get_option( 'no_wrap_shortcode', 'lasso_editor');
 
-    if ($no_wrap_shortcode == 'on') {
-        return $content;
-    }
+	if ($no_wrap_shortcode == 'on') {
+		return $content;
+	}
 
 	if ( false === strpos( $content, '[' ) ) {
 		return $content;
@@ -78,7 +78,7 @@ 
 	if ( strpos( $m[2],'aesop_'  ) === 0 ) {
 		// check against the exceptions
 		if (strpos_arr($m[2],$exception_arr1)===false) {
-		    return $m[0];
+			return $m[0];
 		}
 	}
 	if (strpos_arr($m[2],$exception_arr2)!==false) {
@@ -90,9 +90,9 @@ 
 
 /* a helper function */
 function strpos_arr($haystack, $needle) {
-    if(!is_array($needle)) $needle = array($needle);
-    foreach($needle as $what) {
-        if(($pos = strpos($haystack, $what))!==false) return $pos;
-    }
-    return false;
+	if(!is_array($needle)) $needle = array($needle);
+	foreach($needle as $what) {
+		if(($pos = strpos($haystack, $what))!==false) return $pos;
+	}
+	return false;
 }
\ No newline at end of file

public/includes/editor-modules.php

Indentation +178 added lines, -178 removed lines

@@ -114,7 +114,7 @@ 
 				height: 42px;
 			}
 		<?php
-            } 
+			} 
 		} else { 
 		?> 
 
@@ -123,8 +123,8 @@ 
             }
             
         <?php
-        }
-        ?>
+		}
+		?>
         </style>
 		<div id="lasso--controls" class="lasso-post-status--<?php echo sanitize_html_class( $status );?> <?php echo sanitize_html_class( $custom_classes );?>" data-post-id="<?php echo get_the_ID();?>" >
 
@@ -240,7 +240,7 @@ 
 	
 	$sc_saving_class = ('on' == $shortcodify_disabled || $ase_status == 'ase-not-active')  ? 'shortcodify-disabled' : 'shortcodify-enabled';
 
-    $use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
+	$use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
 
 	?>
 	<div class="lasso--text-popup lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$ase_status.' '.sanitize_html_class( $custom_classes );?>"  style="display:none;">
@@ -298,7 +298,7 @@ 
 function lasso_editor_text_toolbar() {
 
 	ob_start();
-    $text_select_popup = lasso_editor_get_option('text_select_popup', 'lasso_editor', false);
+	$text_select_popup = lasso_editor_get_option('text_select_popup', 'lasso_editor', false);
 
 	
 	$is_mobile = wp_is_mobile();
@@ -317,7 +317,7 @@ 
 	$toolbar_class  = $toolbar_headings ? 'toolbar-extended' : false;
 	
 	// mobile styles
-    $mobile_class = $is_mobile ? 'lasso-mobile' : false;
+	$mobile_class = $is_mobile ? 'lasso-mobile' : false;
 	$mobile_style =$is_mobile ? 'style="bottom:0px;"' : null;
 	
 	//show color
@@ -332,7 +332,7 @@ 
 	
 	$sc_saving_class = ('on' == $shortcodify_disabled || $ase_status == 'ase-not-active')  ? 'shortcodify-disabled' : 'shortcodify-enabled';
 
-    $use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
+	$use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
 
 	?>
 	<div class="lasso--toolbar_wrap lasso-editor-controls--wrap <?php echo $toolbar_class.' '.$mobile_class.' '.$ase_status.' '.sanitize_html_class( $custom_classes );?>" <?php echo $mobile_style ?>>
@@ -556,7 +556,7 @@ 
 	
 	//editor options
 	$allow_change_date = lasso_editor_get_option('allow_change_date', 'lasso_editor');
-    $allow_edit_excerpt = lasso_editor_get_option('allow_edit_excerpt', 'lasso_editor');
+	$allow_edit_excerpt = lasso_editor_get_option('allow_edit_excerpt', 'lasso_editor');
 	$no_url_setting = lasso_editor_get_option('no_url_setting', 'lasso_editor');
 	$support_custom_taxonomy   = lasso_editor_get_option( 'support_custom_taxonomy', 'lasso_editor' );
 	
@@ -577,7 +577,7 @@ 
 	// do we support pending status
 	$no_pending_status = lasso_editor_get_option('no_pending_status', 'lasso_editor');
     
-    $excerpt = $post->post_excerpt;
+	$excerpt = $post->post_excerpt;
 
 ?>
 	<div id="lasso--post-settings__modal" class="lasso--modal lassoShowAnimate <?php echo sanitize_html_class( $custom_classes );?>">
@@ -674,7 +674,7 @@ 
 						}?>
 						<?php 
 						if ($allow_change_date) { 
-						    $dateformat = get_option( 'date_format' ); 
+							$dateformat = get_option( 'date_format' ); 
 						?>
 						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
 							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
@@ -768,8 +768,8 @@ 
 								$types = lasso_post_types_names();
 								if ( !empty( $types ) ) {
 									foreach( $types as $name => $label ) 
-                                    {   	
-                                        $type = $name;									
+									{   	
+										$type = $name;									
 										//$type = preg_replace( '/s\b/','', $name );
 										if ($type == 'page' && !current_user_can('edit_pages')) {
 											continue;
@@ -791,7 +791,7 @@ 
 						if ( !empty( $types ) ) {
 							// get the first element
 							$keys = array_keys($types);
-						    $type =$keys[0];						
+							$type =$keys[0];						
 							//$type = preg_replace( '/s\b/','', $type );
 							printf( '<input type="hidden" name="object" value="%s">', lcfirst( esc_attr( $type ) ) );		
 						}
@@ -819,8 +819,8 @@ 
 	global $post;
 	
 	global $wp_post_types;
-    $labels = &$wp_post_types['post']->labels;
-    $labels->name = 'Articles';
+	$labels = &$wp_post_types['post']->labels;
+	$labels->name = 'Articles';
 
 	ob_start();
 
@@ -880,7 +880,7 @@ 
 	ob_start();
 
 
-    $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+	$use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
     
 	// let users add custom css classes
 	$custom_classes = apply_filters( 'lasso_wpimg_classes', '' );
@@ -982,9 +982,9 @@ 
 function lasso_editor_options_blob() {
 
 	$codes   = function_exists( 'aesop_shortcodes' ) ? aesop_shortcodes() : array();
-    $codes   = add_wpimg_options( $codes );
+	$codes   = add_wpimg_options( $codes );
 	$codes   = add_wpimg_block_options( $codes );
-    $codes   = apply_filters( 'lasso_custom_options', $codes );
+	$codes   = apply_filters( 'lasso_custom_options', $codes );
 	$galleries  = function_exists( 'lasso_editor_galleries_exist' ) && lasso_editor_galleries_exist() ? 'has-galleries' : 'creating-gallery';
 
 	$nonce = wp_create_nonce( 'lasso_gallery' );
@@ -1086,9 +1086,9 @@ 
 		$return .= '</form>';
 
 		// extra JS codes
-        if (isset($shortcode['codes'])) {
-		    $return .= $shortcode['codes'];
-        }
+		if (isset($shortcode['codes'])) {
+			$return .= $shortcode['codes'];
+		}
 		$blob[$slug] = $return;
 	}
 
@@ -1097,95 +1097,95 @@ 
 
 
 function add_wpimg_options( $shortcodes ) {
-    $custom = array(
-        'wpimg'    => array(
-            'name'     => __( 'Image', 'lasso' ),
-            'type'     => 'single',
-            'atts'     => array(
-                'img'    => array(
-                    'type'  => 'media_upload',
-                    'default'  => '',
-                    'desc'   => __( 'Image URL', 'lasso' ),
-                    'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
-                ),
-                'align'    => array(
-                    'type'  => 'select',
-                    'values'  => array(						
-                        array(
-                            'value' => 'center',
-                            'name' => __( 'Center', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'left',
-                            'name' => __( 'Left', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'right',
-                            'name' => __( 'Right', 'aesop-core' )
-                        ),
-                    ),
-                    'default'  => 'center',
-                    'desc'   => __( 'Alignment', 'lasso' ),
-                    'tip'=>''
-                ),			
+	$custom = array(
+		'wpimg'    => array(
+			'name'     => __( 'Image', 'lasso' ),
+			'type'     => 'single',
+			'atts'     => array(
+				'img'    => array(
+					'type'  => 'media_upload',
+					'default'  => '',
+					'desc'   => __( 'Image URL', 'lasso' ),
+					'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
+				),
+				'align'    => array(
+					'type'  => 'select',
+					'values'  => array(						
+						array(
+							'value' => 'center',
+							'name' => __( 'Center', 'aesop-core' )
+						),
+						array(
+							'value' => 'left',
+							'name' => __( 'Left', 'aesop-core' )
+						),
+						array(
+							'value' => 'right',
+							'name' => __( 'Right', 'aesop-core' )
+						),
+					),
+					'default'  => 'center',
+					'desc'   => __( 'Alignment', 'lasso' ),
+					'tip'=>''
+				),			
                 
-                'imgwidth'    => array(
-                    'type'  => 'text_small',
-                    'default'  => '300px',
-                    'desc'   => __( 'Image Width', 'lasso' ),
-                    'tip'  => __( 'Width of the image. You can enter the size in pixels or percentage such as <code>40%</code> or <code>500px</code>.', 'aesop-core' )
-                ),
-                'imgheight'    => array(
-                    'type'  => 'text_small',
-                    'default'  => '',
-                    'desc'   => __( 'Image Height', 'lasso' ),
-                    'tip'  => __( 'Used only for the Panorama mode. Can be set using pixel values such as <code>500px</code>. If unspecified, the original height would be used. ', 'aesop-core' )
-                ),	
-                'linkoption'    => array(
-                    'type'  => 'select',
-                    'values'  => array(						
-                        array(
-                            'value' => 'none',
-                            'name' => __( 'None', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'img',
-                            'name' => __( 'Image', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'url',
-                            'name' => __( 'URL', 'aesop-core' )
-                        ),
-                    ),
-                    'default'  => 'none',
-                    'desc'   => __( 'Link', 'lasso' ),
-                    'tip'  => __( 'Click leads to:', 'lasso' )
-                ),				
+				'imgwidth'    => array(
+					'type'  => 'text_small',
+					'default'  => '300px',
+					'desc'   => __( 'Image Width', 'lasso' ),
+					'tip'  => __( 'Width of the image. You can enter the size in pixels or percentage such as <code>40%</code> or <code>500px</code>.', 'aesop-core' )
+				),
+				'imgheight'    => array(
+					'type'  => 'text_small',
+					'default'  => '',
+					'desc'   => __( 'Image Height', 'lasso' ),
+					'tip'  => __( 'Used only for the Panorama mode. Can be set using pixel values such as <code>500px</code>. If unspecified, the original height would be used. ', 'aesop-core' )
+				),	
+				'linkoption'    => array(
+					'type'  => 'select',
+					'values'  => array(						
+						array(
+							'value' => 'none',
+							'name' => __( 'None', 'aesop-core' )
+						),
+						array(
+							'value' => 'img',
+							'name' => __( 'Image', 'aesop-core' )
+						),
+						array(
+							'value' => 'url',
+							'name' => __( 'URL', 'aesop-core' )
+						),
+					),
+					'default'  => 'none',
+					'desc'   => __( 'Link', 'lasso' ),
+					'tip'  => __( 'Click leads to:', 'lasso' )
+				),				
                 
-                'link'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'URL Link', 'lasso' ),
-                    'tip'  => __( 'URL link', 'lasso' )
-                ),
-                'alt'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Image ALT', 'lasso' ),
-                    'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
-                ),
+				'link'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'URL Link', 'lasso' ),
+					'tip'  => __( 'URL link', 'lasso' )
+				),
+				'alt'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Image ALT', 'lasso' ),
+					'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
+				),
                 
-                'caption'    => array(
-                    'type'  => 'text_area',
-                    'default'  => '',
-                    'desc'   => __( 'Caption', 'lasso' ),
-                    'tip'  => __( 'Optional caption for the image.', 'lasso' )
-                ),
+				'caption'    => array(
+					'type'  => 'text_area',
+					'default'  => '',
+					'desc'   => __( 'Caption', 'lasso' ),
+					'tip'  => __( 'Optional caption for the image.', 'lasso' )
+				),
                 
 
-            ),
-            'desc'     => __( 'An image.', 'aesop-core' ),
-            'codes'    => '<script>	            
+			),
+			'desc'     => __( 'An image.', 'aesop-core' ),
+			'codes'    => '<script>	            
 						jQuery(document).ready(function($){
                             function linkSetting(l){								
 							    if ( l=="url") {
@@ -1205,75 +1205,75 @@ 
 							})
 						});
 			           </script>'
-        )
-    );
+		)
+	);
 
-    return array_merge( $shortcodes, $custom );
+	return array_merge( $shortcodes, $custom );
 }
 
 function add_wpimg_block_options( $shortcodes ) {
-    $custom = array(
-        'wpimg-block'    => array(
-            'name'     => __( 'Image', 'lasso' ),
-            'type'     => 'single',
-            'atts'     => array(
-                'img'    => array(
-                    'type'  => 'media_upload',
-                    'default'  => '',
-                    'desc'   => __( 'Image URL', 'lasso' ),
-                    'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
-                ),
-                'align'    => array(
-                    'type'  => 'select',
-                    'values'  => array(						
-                        array(
-                            'value' => 'center',
-                            'name' => __( 'Center', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'left',
-                            'name' => __( 'Left', 'aesop-core' )
-                        ),
-                        array(
-                            'value' => 'right',
-                            'name' => __( 'Right', 'aesop-core' )
-                        ),
-                    ),
-                    'default'  => 'center',
-                    'desc'   => __( 'Alignment', 'lasso' ),
-                    'tip'=>''
-                ),		
-                'alt'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Image ALT', 'lasso' ),
-                    'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
-                ),
-                'caption'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Caption', 'lasso' ),
-                    'tip'  => __( 'Optional caption for the image.', 'lasso' )
-                ),
-                'link'    => array(
-                    'type'  => 'text',
-                    'default'  => '',
-                    'desc'   => __( 'Link URL', 'lasso' ),
-                    'tip'  => __( 'Optional URL to link.', 'lasso' )
-                ),
+	$custom = array(
+		'wpimg-block'    => array(
+			'name'     => __( 'Image', 'lasso' ),
+			'type'     => 'single',
+			'atts'     => array(
+				'img'    => array(
+					'type'  => 'media_upload',
+					'default'  => '',
+					'desc'   => __( 'Image URL', 'lasso' ),
+					'tip'  => __( 'URL for the image. Click <em>Select Media</em> to open the WordPress Media Library.', 'aesop-core' )
+				),
+				'align'    => array(
+					'type'  => 'select',
+					'values'  => array(						
+						array(
+							'value' => 'center',
+							'name' => __( 'Center', 'aesop-core' )
+						),
+						array(
+							'value' => 'left',
+							'name' => __( 'Left', 'aesop-core' )
+						),
+						array(
+							'value' => 'right',
+							'name' => __( 'Right', 'aesop-core' )
+						),
+					),
+					'default'  => 'center',
+					'desc'   => __( 'Alignment', 'lasso' ),
+					'tip'=>''
+				),		
+				'alt'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Image ALT', 'lasso' ),
+					'tip'  => __( 'ALT tag used for the image. Primarily used for SEO purposes.', 'lasso' )
+				),
+				'caption'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Caption', 'lasso' ),
+					'tip'  => __( 'Optional caption for the image.', 'lasso' )
+				),
+				'link'    => array(
+					'type'  => 'text',
+					'default'  => '',
+					'desc'   => __( 'Link URL', 'lasso' ),
+					'tip'  => __( 'Optional URL to link.', 'lasso' )
+				),
                
 
-            ),
-            'desc'     => __( 'A WP Image Block.', 'aesop-core' ),
-            'codes'    => '<script>	            
+			),
+			'desc'     => __( 'A WP Image Block.', 'aesop-core' ),
+			'codes'    => '<script>	            
 						jQuery(document).ready(function($){
                             
 						});
 			           </script>'
-        )
-    );
+		)
+	);
 
-    return array_merge( $shortcodes, $custom );
+	return array_merge( $shortcodes, $custom );
 }
 
 /**
@@ -1318,23 +1318,23 @@ 
  * @return string
  */
 function lasso_editor_adjustBrightness($hex, $steps) { 
-    $steps = max(-255, min(255, $steps));
+	$steps = max(-255, min(255, $steps));
 
-    // Normalize into a six character long hex string
-    $hex = str_replace('#', '', $hex);
-    if (strlen($hex) == 3) {
-        $hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
-    }
+	// Normalize into a six character long hex string
+	$hex = str_replace('#', '', $hex);
+	if (strlen($hex) == 3) {
+		$hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
+	}
 
-    // Split into three parts: R, G and B
-    $color_parts = str_split($hex, 2);
-    $return = '#';
+	// Split into three parts: R, G and B
+	$color_parts = str_split($hex, 2);
+	$return = '#';
 
-    foreach ($color_parts as $color) {
-        $color   = hexdec($color); // Convert to decimal
-        $color   = max(0,min(255,$color + $steps)); // Adjust color
-        $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
-    }
+	foreach ($color_parts as $color) {
+		$color   = hexdec($color); // Convert to decimal
+		$color   = max(0,min(255,$color + $steps)); // Adjust color
+		$return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
+	}
 
-    return $return;
+	return $return;
 }

public/includes/assets.php

Indentation +88 added lines, -88 removed lines

@@ -15,29 +15,29 @@ 
 		add_action('wp_enqueue_scripts', array($this,'scripts'));
 	}
     
-    function is_multipage()
-    {
-        global $post;
-        $pos = strpos($post->post_content, "<!--nextpage-->");
-        if (!$pos) return -1;
+	function is_multipage()
+	{
+		global $post;
+		$pos = strpos($post->post_content, "<!--nextpage-->");
+		if (!$pos) return -1;
         
-        global $wp;
-        $url =  home_url( $wp->request );
-        $index = intval(basename($url)) == 0 ? 0 : intval(basename($url))-1;
-        return $index;        
-    }
+		global $wp;
+		$url =  home_url( $wp->request );
+		$index = intval(basename($url)) == 0 ? 0 : intval(basename($url))-1;
+		return $index;        
+	}
 
 	public function scripts(){
 
 	
 		global $post;
 		if ( lasso_user_can('edit_posts') 
-		     /* uncomment this line to disable Editus on Gutenberg posts*/
-             /* && !( function_exists( 'has_blocks' ) && has_blocks( $post->post_content)  && !is_home()) */              
-             ) {
+			 /* uncomment this line to disable Editus on Gutenberg posts*/
+			 /* && !( function_exists( 'has_blocks' ) && has_blocks( $post->post_content)  && !is_home()) */              
+			 ) {
 			
 			/**    Returns the time offset from UTC
-			*/
+			 */
 			function get_UTC_offset() {
 				$timezone_string = get_option( 'timezone_string' );
 				if (empty( $timezone_string ) ) {
@@ -52,7 +52,7 @@ 
 
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
 
-            //don't load autocomplete if it's a stockholm theme
+			//don't load autocomplete if it's a stockholm theme
 			$themename  	= wp_get_theme()->get('Name');
 			if ($themename !='Stockholm' ) {
 				wp_enqueue_script('jquery-ui-autocomplete');
@@ -90,13 +90,13 @@ 
 			$bold_tag = lasso_editor_get_option('bold_tag', 'lasso_editor','b');
 			$i_tag = lasso_editor_get_option('i_tag', 'lasso_editor','i');
             
-            $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
+			$use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
             
-            $use_wpimgblock = false;
+			$use_wpimgblock = false;
             
-            $text_select_popup = lasso_editor_get_option('text_select_popup', 'lasso_editor', false);
+			$text_select_popup = lasso_editor_get_option('text_select_popup', 'lasso_editor', false);
             
-            $link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor', 'off');
+			$link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor', 'off');
 
 			
 			//text alignement
@@ -111,7 +111,7 @@ 
 			// allow change date for post
 			$allow_change_date = lasso_editor_get_option('allow_change_date', 'lasso_editor');
             
-            // support custom taxonomy
+			// support custom taxonomy
 			$support_custom_taxonomy = lasso_editor_get_option('support_custom_taxonomy', 'lasso_editor');
 			
 			if ($show_color) {
@@ -137,7 +137,7 @@ 
 			$tz_offset = get_UTC_offset();
 			$post_date = get_the_time('U', $postid);
 			$time = (time()+$tz_offset);
-            $delta = $time - $post_date;
+			$delta = $time - $post_date;
             
 			$strings = array(
 				'save' 				=> __('Save','lasso'),
@@ -181,7 +181,7 @@ 
 				
 				'catsPlaceholder'     => __('add categories...'),
 				'tagsPlaceholder'     => __('add tags...'),
-                'taxoPlaceholder'     => __('add taxonomy terms...'),
+				'taxoPlaceholder'     => __('add taxonomy terms...'),
 				
 				
 			);
@@ -193,11 +193,11 @@ 
 			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
 			
 			
-            if ($allow_change_date) {
-			    $permalink = get_site_url().'/?p='.$postid;
-            } else {
-                $permalink = get_permalink($postid);
-            }
+			if ($allow_change_date) {
+				$permalink = get_site_url().'/?p='.$postid;
+			} else {
+				$permalink = get_permalink($postid);
+			}
 			
 			// rest api
 			$rest_nonce = '';
@@ -217,17 +217,17 @@ 
 				}
 			}
             
-            //excerpt
-            $post_excerpt = "";
-            $post_excerpt = wp_strip_all_tags($post->post_excerpt,true);
+			//excerpt
+			$post_excerpt = "";
+			$post_excerpt = wp_strip_all_tags($post->post_excerpt,true);
             
-            //find if this is multi page. -1 if not
-            $multipage = self::is_multipage();
-            $post_content = "";
-            //pass post_content if we need to process multipage. In future we may need to pass this for other purposes
-            //if ($multipage != -1) {
-               $post_content = $post->post_content;
-            //}
+			//find if this is multi page. -1 if not
+			$multipage = self::is_multipage();
+			$post_content = "";
+			//pass post_content if we need to process multipage. In future we may need to pass this for other purposes
+			//if ($multipage != -1) {
+			   $post_content = $post->post_content;
+			//}
 			
 			//get custom taxonomy
 			$custom_taxonomies         = array_diff(get_object_taxonomies( get_post_type( $postid ), 'names' ), ['category','post_tag','post_format']);
@@ -240,8 +240,8 @@ 
 				$existing_taxo_arr[$taxonomy] = lasso_get_objects( $taxonomy );
 			}
             
-            $new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );        
-            $new_post_text  = !empty($new_post_text) ? $new_post_text : wp_strip_all_tags(apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso')));
+			$new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );        
+			$new_post_text  = !empty($new_post_text) ? $new_post_text : wp_strip_all_tags(apply_filters( 'lasso_new_object_content', __( 'Once upon a time...','lasso')));
 
 
 			// localized objects
@@ -270,7 +270,7 @@ 
 				'nonce'				=> wp_create_nonce('lasso_editor'),
 				'handle'			=> lasso_editor_settings_toolbar(),
 				'toolbar'			=> lasso_editor_text_toolbar(),
-                'toolbarPopup'		=> $text_select_popup ? lasso_editor_selected_text_toolbar(): false,
+				'toolbarPopup'		=> $text_select_popup ? lasso_editor_selected_text_toolbar(): false,
 				'toolbarHeadings'   => $toolbar_headings,
 				'toolbarHeadingsH4'   => $toolbar_headings_h4,
 				'component_modal'	=> lasso_editor_component_modal(),
@@ -322,19 +322,19 @@ 
 				'customFields'      => $custom_fields,
 				'clickToInsert'     => ($insert_comp_ui =='click'),
 				'buttonOnEmptyP'     => ($insert_comp_ui =='mediumcom'),      // auto show a button to insert components on an empty paragraph      
-                'rtl'               => is_rtl(),				
+				'rtl'               => is_rtl(),				
 				'skipToEdit'        =>( $delta < 10 && $delta >=0 ), // if it's a new post, skip to edit mode
 				'linksEditable'    => $links_editable,
 				'supportPendingStatus' => !$no_pending_status,
 				'tableCode' => apply_filters( 'lasso_table_html_code','<table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table><p></p>'),
-                'hasGutenberg' => (function_exists( 'has_blocks' ) && has_blocks( $post->post_content)) || self::gutenberg_active(),//,
-                'multipages'=> $multipage,
-                'post_content'=>$post_content,
-                'post_excerpt'=>$post_excerpt,
-                'supCustTaxo' => $support_custom_taxonomy == 'on',
-                'oldWPimg'=> $use_old_wpimg =='on',
-                'useWPImgBlk'=> $use_wpimgblock,
-                'prefixHTTP'=> $link_prefix_http =='on'
+				'hasGutenberg' => (function_exists( 'has_blocks' ) && has_blocks( $post->post_content)) || self::gutenberg_active(),//,
+				'multipages'=> $multipage,
+				'post_content'=>$post_content,
+				'post_excerpt'=>$post_excerpt,
+				'supCustTaxo' => $support_custom_taxonomy == 'on',
+				'oldWPimg'=> $use_old_wpimg =='on',
+				'useWPImgBlk'=> $use_wpimgblock,
+				'prefixHTTP'=> $link_prefix_http =='on'
 			);
 
 
@@ -342,7 +342,7 @@ 
 			
 			
 			if (!$using_restapiv2) {
-               // enqueue REST API V1
+			   // enqueue REST API V1
 			   wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
 			   $settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
 			   wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
@@ -358,7 +358,7 @@ 
 			if ($show_color) {
 				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api','iris'), LASSO_VERSION, true);
 			} else {
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
+				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
 			}
 			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
 
@@ -367,44 +367,44 @@ 
 
 	}
     
-    function gutenberg_active() {
+	function gutenberg_active() {
         
-        // Gutenberg plugin is installed and activated.
-        $gutenberg = ! ( false === has_filter( 'replace_editor', 'gutenberg_init' ) );
-
-        // Block editor since 5.0.
-        $block_editor = version_compare( $GLOBALS['wp_version'], '5.0-beta', '>' );
-
-        if ( ! $gutenberg && ! $block_editor ) {
-            return false;
-        }
-
-        if ( self::is_classic_editor_plugin_active() ) {
-            $editor_option       = get_option( 'classic-editor-replace' );
-            $block_editor_active = array( 'no-replace', 'block' );
-
-            return in_array( $editor_option, $block_editor_active, true );
-        }
-
-        return true;
-    }
-
-    /**
-     * Check if Classic Editor plugin is active.
-     *
-     * @return bool
-     */
-    function is_classic_editor_plugin_active() {
-        if ( ! function_exists( 'is_plugin_active' ) ) {
-            include_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-
-        if ( is_plugin_active( 'classic-editor/classic-editor.php' ) ) {
-            return true;
-        }
-
-        return false;
-    }
+		// Gutenberg plugin is installed and activated.
+		$gutenberg = ! ( false === has_filter( 'replace_editor', 'gutenberg_init' ) );
+
+		// Block editor since 5.0.
+		$block_editor = version_compare( $GLOBALS['wp_version'], '5.0-beta', '>' );
+
+		if ( ! $gutenberg && ! $block_editor ) {
+			return false;
+		}
+
+		if ( self::is_classic_editor_plugin_active() ) {
+			$editor_option       = get_option( 'classic-editor-replace' );
+			$block_editor_active = array( 'no-replace', 'block' );
+
+			return in_array( $editor_option, $block_editor_active, true );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if Classic Editor plugin is active.
+	 *
+	 * @return bool
+	 */
+	function is_classic_editor_plugin_active() {
+		if ( ! function_exists( 'is_plugin_active' ) ) {
+			include_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+
+		if ( is_plugin_active( 'classic-editor/classic-editor.php' ) ) {
+			return true;
+		}
+
+		return false;
+	}
 
 }
 

lasso.php

Indentation +66 added lines, -66 removed lines

@@ -48,7 +48,7 @@ 
 add_filter('register_post_type_args', 'lasso_show_in_rest', 10, 2);
 function lasso_show_in_rest($args, $post_type){
  
-    $allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( ) );
+	$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( ) );
 	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
 	if (in_array( $post_type,$allowed_post_types)) {
 		$args['show_in_rest'] = true;
@@ -57,7 +57,7 @@ 
 		}
 	}
  
-    return $args;
+	return $args;
 }
 
 
@@ -106,25 +106,25 @@ 
 //table codes to be added
 class editus_table {
     
-    public function __construct(){
-        $add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
-        if ($add_table) {
-            add_action('wp_enqueue_scripts', array($this,'scripts'));
+	public function __construct(){
+		$add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
+		if ($add_table) {
+			add_action('wp_enqueue_scripts', array($this,'scripts'));
             
-        }
+		}
 	}
     
-    function scripts()
-    {
-        add_action('lasso_editor_controls_after_outside', array($this,'editus_table_edit_menu'));
-            add_filter('lasso_components',array($this,'editus_components_add_table'),10,1);
-            add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_table'), 10 );
-            wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
-            wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
-    }
+	function scripts()
+	{
+		add_action('lasso_editor_controls_after_outside', array($this,'editus_table_edit_menu'));
+			add_filter('lasso_components',array($this,'editus_components_add_table'),10,1);
+			add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_table'), 10 );
+			wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
+			wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
+	}
     
-    function editus_table_edit_menu()
-    { ?>
+	function editus_table_edit_menu()
+	{ ?>
 
         <ul class='editus-table-menu'>
           <li data-action="insertcol"><?php echo __('Insert Column','lasso')?></li>
@@ -134,31 +134,31 @@ 
           <li data-action="deltable"><?php echo __('Delete Table','lasso')?></li
         </ul>
     <?php
-    }
+	}
     
     
-    function editus_html_table()
-    {   
-        return '<figure class="wp-block-table"><table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table></figure><p><br></p>';
-    }
+	function editus_html_table()
+	{   
+		return '<figure class="wp-block-table"><table><tr><th>Cell 1</th><th>Cell 2</th></tr><tr><td>Cell 3</td><td>Cell 4</td></tr></table></figure><p><br></p>';
+	}
 
 
-    function editus_components_add_table( $array ){
-        $custom = array(
-               'htmltable' => array(
-                         'name'    => __('HTML Table','lasso'),
-                          'content' => self::editus_html_table(),
-                )
-        );
-        return array_merge( $array, $custom );
-    }
+	function editus_components_add_table( $array ){
+		$custom = array(
+			   'htmltable' => array(
+						 'name'    => __('HTML Table','lasso'),
+						  'content' => self::editus_html_table(),
+				)
+		);
+		return array_merge( $array, $custom );
+	}
 
 
-    function editus_toolbar_components_add_table( ) {
-          ?>
+	function editus_toolbar_components_add_table( ) {
+		  ?>
           <li data-type="htmltable" title="<?php esc_attr_e( 'HTML Table', 'lasso' );?>" class="quote lasso-toolbar--component__htmltable dashicons dashicons-grid-view"></li>
           <?php
-    }
+	}
 }
 
 
@@ -169,41 +169,41 @@ 
 //table codes to be added
 class editus_paragraph {
     
-    public function __construct(){
-        $add_paragraph = lasso_editor_get_option('add_paragraph', 'lasso_editor', false);
-        if ($add_paragraph) {
-            add_action('wp_enqueue_scripts', array($this,'scripts'));
+	public function __construct(){
+		$add_paragraph = lasso_editor_get_option('add_paragraph', 'lasso_editor', false);
+		if ($add_paragraph) {
+			add_action('wp_enqueue_scripts', array($this,'scripts'));
             
-        }
+		}
 	}
     
-    function scripts()
-    {
-            add_action('lasso_editor_controls_after_outside', array($this,'editus_paragraph_style'));
-            add_filter('lasso_components',array($this,'editus_components_add_paragraph'),10,1);
-            add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_paragraph'), 10 );
-            //wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
-            //wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
-    }
+	function scripts()
+	{
+			add_action('lasso_editor_controls_after_outside', array($this,'editus_paragraph_style'));
+			add_filter('lasso_components',array($this,'editus_components_add_paragraph'),10,1);
+			add_action( 'lasso_toolbar_components', array($this,'editus_toolbar_components_add_paragraph'), 10 );
+			//wp_enqueue_style( 'editus-table-style', LASSO_URL.  '/public/assets/css/editus-table-edit-public.css', LASSO_VERSION, true );
+			//wp_enqueue_script( 'editus_table',  LASSO_URL. '/public/assets/js/editus-table-edit-public.js', array( 'jquery' ), LASSO_VERSION, true );
+	}
    
-    function editus_components_add_paragraph( $array ){
-        $custom = array(
-               'htmlparagraph' => array(
-                         'name'    => __('HTML Paragraph','lasso'),
-                          'content' => self::editus_html_paragraph(),
-                )
-        );
-        return array_merge( $array, $custom );
-    }
+	function editus_components_add_paragraph( $array ){
+		$custom = array(
+			   'htmlparagraph' => array(
+						 'name'    => __('HTML Paragraph','lasso'),
+						  'content' => self::editus_html_paragraph(),
+				)
+		);
+		return array_merge( $array, $custom );
+	}
     
     
-    function editus_html_paragraph()
-    {   
-        return '<p contenteditable="true"><br></p>';
-    }
+	function editus_html_paragraph()
+	{   
+		return '<p contenteditable="true"><br></p>';
+	}
 
-    function editus_paragraph_style()
-    { ?>
+	function editus_paragraph_style()
+	{ ?>
         <style>
         #lasso-toolbar--components__list .lasso-toolbar--component__htmlparagraph:before
         { 
@@ -212,14 +212,14 @@ 
         }
         </style>
     <?php
-    }
+	}
     
 
-    function editus_toolbar_components_add_paragraph( ) {
-          ?>
+	function editus_toolbar_components_add_paragraph( ) {
+		  ?>
           <li data-type="htmlparagraph" title="<?php esc_attr_e( 'HTML Paragraph', 'lasso' );?>" class="quote lasso-toolbar--component__htmlparagraph dashicons dashicons-editor-paragraph"></li>
           <?php
-    }
+	}
 }
 
 new editus_paragraph();