Merge pull request #12 from alex-storojenko/develop

ver 1.14.0

Author: alex-storozhenko

contracts/interface-think-walk-fields.php

@@ -11,7 +11,7 @@
 	class Think_Customizer {
 
 		/**
-		 * @var $instance
+		 * @var null|Think_Customizer $instance
 		 *
 		 * Container for only one exemplar of @static
 		 *
@@ -50,6 +50,7 @@ class Think_Customizer {
 		 *            ],
 		 *            [
 		 *                'id'       => 'custom_background',
+		 *                'label'    => 'Background COLOR',
 		 *                'type'     => 'color',
 		 *                'selector' => '.custom-background'
 		 *            ],
@@ -158,9 +159,7 @@ class Think_Customizer {
 		protected $structure = array();
 
 		/** Think_Customizer constructor */
-		protected function __construct( $structure ) {
-			$this->structure = $structure;
-
+		protected function __construct() {
 			add_action( 'customize_preview_init', function () {
 				$this->js_for_preview();
 			} );
@@ -170,6 +169,49 @@ protected function __construct( $structure ) {
 			} );
 		}
 
+		/**
+		 * Method returned only one exemplar of @static
+		 *
+		 * According with realization singleton
+		 *
+		 * @param array $structure @see Think_Customizer::$structure
+		 *
+		 * @return mixed
+		 */
+		public static function customize( array $structure ) {
+			if ( null === static::$instance ) {
+				static::$instance = new static();
+			}
+
+			static::$instance->merge_structures( $structure );
+
+			return static::$instance;
+		}
+
+		protected function merge_structures( array $structure ) {
+			$this->structure = array_merge( $this->structure, $structure );
+
+			return $this;
+		}
+
+		/**
+		 * Ban on cloning
+		 *
+		 * According with realization singleton
+		 */
+		private function __clone() {
+			//
+		}
+
+		/**
+		 * The ban on unserialization from outside the class
+		 *
+		 * According with realization singleton
+		 */
+		protected function __wakeup() {
+			//
+		}
+
 		/**
 		 * Return theme option, replace with default value if empty
 		 *
@@ -292,40 +334,5 @@ protected function get_control( $wp_customize, $setting_id, $class_args, $type =
 					break;
 			}
 		}
-
-		/**
-		 * Method returned only one exemplar of @static
-		 *
-		 * According with realization singleton
-		 *
-		 * @param array $structure
-		 *
-		 * @return mixed
-		 */
-		public static function instance( array $structure ) {
-			if ( null === static::$instance ) {
-				static::$instance = new static( $structure );
-			}
-
-			return static::$instance;
-		}
-
-		/**
-		 * Ban on cloning
-		 *
-		 * According with realization singleton
-		 */
-		private function __clone() {
-			//
-		}
-
-		/**
-		 * The ban on unserialization from outside the class
-		 *
-		 * According with realization singleton
-		 */
-		protected function __wakeup() {
-			//
-		}
 	}
 }

customizer/class-think-customizer.php

@@ -28,7 +28,7 @@ public function render() {
                 <div id="popup-<?= $this->id; ?>" class="wp-think-framework popup-overlay hidden">
                     <div class="wp-think-framework popup-preview-image">
                         <span class="wp-think-framework popup-preview-image-title">Image preview</span>
-                        <img class="wp-think-framework image" src="<?= $value ?: 'javascript:;' ?>"/>
+                        <img class="wp-think-framework image" src="<?= $value ?: '#' ?>"/>
                         <a class="close" href="javascript:;">&times;</a>
                     </div>
                 </div>

inputs/class-think-input-image.php

@@ -213,27 +213,6 @@ public function get_nonce_key() {
 			return $this->nonce_key;
 		}
 
-		/**
-		 * Get fields
-		 *
-		 * @param null $metabox_id
-		 *
-		 * @return bool|array
-		 */
-		public function get_fields( $metabox_id = null ) {
-			$fields = array();
-
-			if ( $metabox_id ) {
-				$fields = $this->walk_fields( $this->structure[ $metabox_id ]['fields'] );
-			} else {
-				foreach ( $this->structure as $section_id => $section ) {
-					$fields = array_merge( $fields, $this->walk_fields( $section['fields'] ) );
-				}
-			}
-
-			return $fields;
-		}
-
 		/**
 		 * Add metabox logic
 		 *
@@ -245,7 +224,9 @@ protected function add_metabox( $id, $title, $fields ) {
 			add_meta_box( $id, $title, function () use ( $fields ) {
 				if ( $fields ) {
 					foreach ( $fields as $field ) {
-						( Think_Input_Factory::make( $this, $field ) )->render();
+						$input = Think_Input_Factory::make( $this, $field );
+
+						$input->render();
 					}
 				}
 			}, $this->post_type, $this->place, $this->priority );

metabox/class-think-metaboxes.php

@@ -40,7 +40,7 @@ class Think_Options implements Think_Input_Initiator {
 		 *          'fields' //array of fields => [
 		 *              [
 		 *                  //id is Required. Attention! id must always be unique, otherwise the result will be unexpected.
-		 *                  'id'                => 'facebook'
+		 *                  'id'                => 'facebook',
 		 *                  'label'             => 'Facebook',
 		 *                  'type'              => 'text', //@see @input_types or wp-thinkframework/inputs classes
 		 *                  'options'           => [], //additional options e.g for select [$title => $value]
@@ -165,27 +165,6 @@ function () {
 			);
 		}
 
-		/**
-		 * Get fields
-		 *
-		 * @param null $section_id
-		 *
-		 * @return bool|array
-		 */
-		public function get_fields( $section_id = null ) {
-			$fields = array();
-
-			if ( $section_id ) {
-				$fields = $this->walk_fields( $this->structure[ $section_id ]['fields'] );
-			} else {
-				foreach ( $this->structure as $section_id => $section ) {
-					$fields = array_merge( $fields, $this->walk_fields( $section['fields'] ) );
-				}
-			}
-
-			return $fields;
-		}
-
 		/**
 		 * Return data from DB by input_id
 		 *
@@ -223,7 +202,9 @@ protected function add_settings() {
 
 				foreach ( $fields as $field ) {
 					add_settings_field( $field['id'], $field['label'], function ( $field ) {
-						return ( Think_Input_Factory::make( $this, $field ) )->render();
+						$input = Think_Input_Factory::make( $this, $field );
+
+						return $input->render();
 					}, $this->slug, $section_id, $field );
 
 					$this->register_setting( $section_id, $field );
@@ -273,7 +254,7 @@ public static function create( $structure, $title, $parent_slug = 'options-gener
 		 * @param $options_key
 		 * @param null $input_id
 		 *
-		 * @return $mixed
+		 * @return mixed
 		 */
 		public static function get_options( $options_key, $input_id = null ) {
 			if ( ! $input_id ) {

options/class-think-options.php

@@ -15,11 +15,9 @@ class Think_Options_Page_Template implements Think_Template {
 		 *
 		 * @throws Think_Exception_Bad_Args_For_Called_Func
 		 *
-		 * @return string|void
+		 * @return void
 		 */
 		public static function render( array $data ) {
-			ob_start();
-
 			if ( empty( $data['slug'] ) ) {
 				throw new Think_Exception_Bad_Args_For_Called_Func( 'Required argument "slug" don\'t exist or empty' );
 			}
@@ -30,7 +28,8 @@ public static function render( array $data ) {
             <div class="wrap custom_theme_options">
                 <h2><?= __( 'Edit Options', 'wp-think-framework' ) ?></h2>
 
-				<?php global $wp_settings_sections, $wp_settings_fields;
+	            <?php
+	            global $wp_settings_sections, $wp_settings_fields;
 
 				if ( ! isset( $wp_settings_sections[ $slug ] ) ) {
 					return;
@@ -43,7 +42,8 @@ public static function render( array $data ) {
 					foreach ( (array) $wp_settings_sections[ $slug ] as $id => $section ) {
 						?><a class="nav-tab <?= ( $count === 0 ) ? 'nav-tab-active' : '' ?>" href="javascript:;"
                              data-tab="<?= $id ?>"><?= $section['title'] ?></a>
-						<?php $count ++;
+						<?php
+						$count ++;
 					}
 					?>
                 </h2>
@@ -60,26 +60,24 @@ public static function render( array $data ) {
 							if ( ! isset( $wp_settings_fields ) || ! isset( $wp_settings_fields[ $slug ] ) || ! isset( $wp_settings_fields[ $slug ][ $section['id'] ] ) ) {
 								continue;
 							}
-
-							settings_fields( $options_key . '_' . $section['id'] ); ?>
-
+							?>
                             <section class="tab_content" id="<?= $id ?>">
                                 <table class="form-table">
-									<?php do_settings_fields( $slug, $section['id'] ); ?>
+	                                <?php
+	                                do_settings_fields( $slug, $section['id'] );
+	                                settings_fields( $options_key . '_' . $section['id'] );
+	                                ?>
                                 </table>
                             </section>
+							<?php
+						}
 
-						<?php }
 						submit_button();
 						?>
                     </form>
                 </div>
             </div>
 			<?php
-
-			$content = ob_get_contents();
-
-			return $content;
 		}
 	}
 }

options/templates/class-think-options-page-template.php

@@ -1,6 +1,5 @@
-=== wp-think-framework ===
-
-Contributors: Alex Storozhenko
+=== WP Think Framework ===
+Contributors: allrain
 Tags: wordpress-framework, theme-framework, options-framework
 
 Requires at least: 4.0
@@ -17,20 +16,22 @@ WordPress Think Framework gives you the ability to quickly and easily create inc
 
 1. Download framework from Github repo - https://github.com/alex-storojenko/wp-think-framework
 2. Extract and copy folder with files of framework to theme dir({wp-installation-folder}/wp-content/themes/{your-theme-directory})
-3. Include wp-think-framework.php to functions.php of your theme(require_once get_template_directory() . '/wp-think-framework/wp-think-framework.php')
-4. Create something amazing
+3. OR You can copy folder with framework somewhere.
+4. Include wp-think-framework.php to functions.php of your theme(require_once get_template_directory() . '/{wp-think-framework_root_dir}/wp-think-framework.php')
+5. (exclude this until wp-think-framework1.12.* version) Create instance of framework - Think_Framework::get_instance() in functions.php of your current theme;
+6. Create something amazing
 
 == Changelog ==
 
-= 1.0 - May 15 2017 =
+= 1.0 =
 * Initial release
 * Added server requirements and short description how to install
 
-= 1.0.1 - May 15 2017 =
+= 1.0.1 =
 * Fix critical bug Think_Metaboxes::create()
 * Fix small bug with enqueue assets for Think_Metaboxes
 
-= 1.11.9 - June 11 2017 =
+= 1.11.9 =
 * Global refactor according WordPress codestyle
 * Refactor include assets
 * Rework metabox registration
@@ -54,9 +55,14 @@ WordPress Think Framework gives you the ability to quickly and easily create inc
 * Refactor CSS
 * Fix bug preview image popup
 
-= 1.12.0 - June 12 2017 =
+= 1.12.0 =
 * Change mechanism of framework installation
 
-= 1.13.2 - June 13 2017 =
+= 1.13.2 =
 * Fix small bags
-* And Change Think_Customizer caller Think_Customizer::customizer($structure) to Think_Customizer::instance($structure)
+* And Change Think_Customizer caller Think_Customizer::customizer($structure) to Think_Customizer::instance($structure)
+
+= 1.14.0 =
+* Fix small bugs
+* Change Think_Customizer caller Think_Customizer::customize($structure)
+* Add possible multiple uses Think_Customizer::customize();