Skip to content

Commit

Permalink
UI_Chooseicons (#7)
Browse files Browse the repository at this point in the history
* add I_UI interface

* some tests

* test 2

* make some fixes

* upd

* add space

* UPD: style guid fixes

* UPD

* Add: travis things

* UPD: travis

* Add: ui-number

* ADD: ui-collection

* ADD: required

* REMOVE: travis

* Merge remote-tracking branch 'CherryFramework/master'

# Conflicts:
#
modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/min/ui-media.
min.js
#	modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/ui-media.js

* Travis

* Local travis

* Collection small fix

* ADD: page builder, taxonomy

* UPD: add to ignore

* UPD:Fix conflicts

* UPD

* ignore

* fix ignore

* ADD: page-builder, cherry-creator

* UPD: Travis fixes

* UPD

* UPD: fix taxonomies

* UPD: new utility

* UPD: style guide fixes

* ADD: new utilit

* UPD

* UPD: some fixes

* UPD: fix interface load

* UPD: travis

* UPD: travis

* ADD: ui-chooseicons

* UPD: cherry-ui-elements.php

* UPD: small fixes

* UPD: fix meta problem

* UPD: travis fixes

* UPD: travis fixe

* UPD: travis fixe

* UPD: travis fixes

* UPD: travis fixes

* UPD: travis fixes
  • Loading branch information
theguriev authored and MakhonkoDenis committed Apr 13, 2016
1 parent 015dbe3 commit f10e816
Show file tree
Hide file tree
Showing 24 changed files with 7,113 additions and 70 deletions.
1 change: 1 addition & 0 deletions .jscsrc
Expand Up @@ -29,5 +29,6 @@
"modules/cherry-ui-elements/inc/ui-elements/ui-collection/assets/js/ui-collection.js", "modules/cherry-ui-elements/inc/ui-elements/ui-collection/assets/js/ui-collection.js",
"modules/cherry-page-builder/assets/js/page-settings.min.js", "modules/cherry-page-builder/assets/js/page-settings.min.js",
"modules/cherry-ui-elements/inc/ui-elements/ui-collection/assets/js/min/jquery.collection.min.js", "modules/cherry-ui-elements/inc/ui-elements/ui-collection/assets/js/min/jquery.collection.min.js",
"modules/cherry-ui-elements/inc/ui-elements/ui-chooseicons/assets/js/ui-chooseicons.min.js"
] ]
} }
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -10,7 +10,6 @@ language: php


# Declare versions of PHP to use. Use one decimal max. # Declare versions of PHP to use. Use one decimal max.
php: php:
# - "7.0"
- "5.6" - "5.6"
- "5.5" - "5.5"
- "5.4" - "5.4"
Expand Down
1 change: 1 addition & 0 deletions modules/cherry-creator/cherry-creator.php
@@ -1,5 +1,6 @@
<?php <?php
/** /**
* Creator
* *
* Module Name: Creator * Module Name: Creator
* Description: Creator * Description: Creator
Expand Down
26 changes: 13 additions & 13 deletions modules/cherry-customizer/cherry-customizer.php
Expand Up @@ -531,7 +531,7 @@ public function get_value( $id, $default = null ) {
* Retrieve a default option value. * Retrieve a default option value.
* *
* @since 1.0.0 * @since 1.0.0
* @param string $id Settings ID. * @param [string] $id Settings ID.
* @return mixed * @return mixed
*/ */
public function get_default( $id ) { public function get_default( $id ) {
Expand All @@ -542,7 +542,7 @@ public function get_default( $id ) {
* Whitelist for setting type. * Whitelist for setting type.
* *
* @since 1.0.0 * @since 1.0.0
* @param string $type Settings type. * @param [string] $type Settings type.
* @return bool * @return bool
*/ */
public function sanitize_type( $type ) { public function sanitize_type( $type ) {
Expand All @@ -565,7 +565,7 @@ public function sanitize_type( $type ) {
* @author Cherry Team <cherryframework@gmail.com> * @author Cherry Team <cherryframework@gmail.com>
* @see wp_filter_post_kses() https://developer.wordpress.org/reference/functions/wp_filter_post_kses/ * @see wp_filter_post_kses() https://developer.wordpress.org/reference/functions/wp_filter_post_kses/
* @since 1.0.0 * @since 1.0.0
* @param string $html HTML to sanitize. * @param [string] $html HTML to sanitize.
* @return string Sanitized HTML. * @return string Sanitized HTML.
*/ */
public function sanitize_text( $html ) { public function sanitize_text( $html ) {
Expand All @@ -586,7 +586,7 @@ public function sanitize_text( $html ) {
* @see sanitize_email() https://developer.wordpress.org/reference/functions/sanitize_key/ * @see sanitize_email() https://developer.wordpress.org/reference/functions/sanitize_key/
* @link sanitize_email() https://codex.wordpress.org/Function_Reference/sanitize_email * @link sanitize_email() https://codex.wordpress.org/Function_Reference/sanitize_email
* @since 1.0.0 * @since 1.0.0
* @param string $email Email address to sanitize. * @param [string] $email Email address to sanitize.
* @param WP_Customize_Setting $setting Setting instance. * @param WP_Customize_Setting $setting Setting instance.
* @return string The sanitized email if not null; otherwise, the setting default. * @return string The sanitized email if not null; otherwise, the setting default.
*/ */
Expand All @@ -602,7 +602,7 @@ public function sanitize_email( $email, $setting ) {
* Textarea sanitization callback. * Textarea sanitization callback.
* *
* @since 1.0.0 * @since 1.0.0
* @param string $html HTML to sanitize. * @param [string] $html HTML to sanitize.
* @return string Sanitized HTML. * @return string Sanitized HTML.
*/ */
public function sanitize_textarea( $html ) { public function sanitize_textarea( $html ) {
Expand All @@ -623,7 +623,7 @@ public function sanitize_textarea( $html ) {
* @see sanitize_key() https://developer.wordpress.org/reference/functions/sanitize_key/ * @see sanitize_key() https://developer.wordpress.org/reference/functions/sanitize_key/
* @see $wp_customize->get_control() https://developer.wordpress.org/reference/classes/wp_customize_manager/get_control/ * @see $wp_customize->get_control() https://developer.wordpress.org/reference/classes/wp_customize_manager/get_control/
* @since 1.0.0 * @since 1.0.0
* @param string $input Slug to sanitize. * @param [string] $input Slug to sanitize.
* @param WP_Customize_Setting $setting Setting instance. * @param WP_Customize_Setting $setting Setting instance.
* @return string Sanitized slug if it is a valid choice; otherwise, the setting default. * @return string Sanitized slug if it is a valid choice; otherwise, the setting default.
*/ */
Expand Down Expand Up @@ -676,7 +676,7 @@ public function sanitize_checkbox( $checked ) {
* @see sanitize_hex_color() https://developer.wordpress.org/reference/functions/sanitize_hex_color/ * @see sanitize_hex_color() https://developer.wordpress.org/reference/functions/sanitize_hex_color/
* @link sanitize_hex_color_no_hash() https://developer.wordpress.org/reference/functions/sanitize_hex_color_no_hash/ * @link sanitize_hex_color_no_hash() https://developer.wordpress.org/reference/functions/sanitize_hex_color_no_hash/
* @since 1.0.0 * @since 1.0.0
* @param string $hex_color HEX color to sanitize. * @param [string] $hex_color HEX color to sanitize.
* @param WP_Customize_Setting $setting Setting instance. * @param WP_Customize_Setting $setting Setting instance.
* @return string The sanitized hex color if not null; otherwise, the setting default. * @return string The sanitized hex color if not null; otherwise, the setting default.
*/ */
Expand All @@ -701,7 +701,7 @@ public function sanitize_hex_color( $hex_color, $setting ) {
* @author Cherry Team <cherryframework@gmail.com> * @author Cherry Team <cherryframework@gmail.com>
* @see wp_check_filetype() https://developer.wordpress.org/reference/functions/wp_check_filetype/ * @see wp_check_filetype() https://developer.wordpress.org/reference/functions/wp_check_filetype/
* @since 1.0.0 * @since 1.0.0
* @param string $image Image filename. * @param [string] $image Image filename.
* @param WP_Customize_Setting $setting Setting instance. * @param WP_Customize_Setting $setting Setting instance.
* @return string The image filename if the extension is allowed; otherwise, the setting default. * @return string The image filename if the extension is allowed; otherwise, the setting default.
*/ */
Expand Down Expand Up @@ -736,7 +736,7 @@ public function sanitize_image( $image, $setting ) {
* @author Cherry Team <cherryframework@gmail.com> * @author Cherry Team <cherryframework@gmail.com>
* @see esc_url_raw() https://developer.wordpress.org/reference/functions/esc_url_raw/ * @see esc_url_raw() https://developer.wordpress.org/reference/functions/esc_url_raw/
* @since 1.0.0 * @since 1.0.0
* @param string $url URL to sanitize. * @param [string] $url URL to sanitize.
* @return string Sanitized URL. * @return string Sanitized URL.
*/ */
public function sanitize_url( $url ) { public function sanitize_url( $url ) {
Expand All @@ -747,7 +747,7 @@ public function sanitize_url( $url ) {
* File URL sanitization callback. * File URL sanitization callback.
* *
* @since 1.0.0 * @since 1.0.0
* @param string $url File URL to sanitize. * @param [string] $url File URL to sanitize.
* @return string Sanitized URL. * @return string Sanitized URL.
*/ */
public function sanitize_file( $url ) { public function sanitize_file( $url ) {
Expand Down Expand Up @@ -904,7 +904,7 @@ public function get_fonts_data() {
* Retrieve array with font-family (for select element). * Retrieve array with font-family (for select element).
* *
* @since 1.0.0 * @since 1.0.0
* @param string $type Font type. * @param [string] $type Font type.
* @return array * @return array
*/ */
public function get_fonts( $type = '' ) { public function get_fonts( $type = '' ) {
Expand All @@ -927,7 +927,7 @@ public function get_fonts( $type = '' ) {
* *
* @since 1.0.0 * @since 1.0.0
* @global object $wp_filesystem * @global object $wp_filesystem
* @param string $file File path. * @param [string] $file File path.
* @return array Fonts data. * @return array Fonts data.
*/ */
public function read_font_file( $file ) { public function read_font_file( $file ) {
Expand Down Expand Up @@ -1055,7 +1055,7 @@ public function clear_fonts() {
* Handler for custom `active_callback` feature. * Handler for custom `active_callback` feature.
* *
* @since 1.0.0 * @since 1.0.0
* @param string $callback Callback-function. * @param [string] $callback Callback-function.
* @return mixed * @return mixed
*/ */
public function active_callback( $callback ) { public function active_callback( $callback ) {
Expand Down
14 changes: 7 additions & 7 deletions modules/cherry-dynamic-css/cherry-dynamic-css.php
@@ -1,8 +1,8 @@
<?php <?php
/** /**
* * Dynamic CSS parser
* Module Name: Dynamic Css * Module Name: Dynamic CSS
* Description: Generate Css * Description: CSS parser which uses variables & functions for CSS code optimization
* Version: 1.0.0 * Version: 1.0.0
* Author: Cherry Team * Author: Cherry Team
* Author URI: http://www.cherryframework.com/ * Author URI: http://www.cherryframework.com/
Expand Down Expand Up @@ -198,7 +198,7 @@ public function get_standard_vars() {
* Get path inside of current module * Get path inside of current module
* *
* @since 1.0.0 * @since 1.0.0
* @param string $path file inside module directory to get path for. * @param [type] $path file inside module directory to get path for.
* @return string * @return string
*/ */
public function get_path( $path = null ) { public function get_path( $path = null ) {
Expand Down Expand Up @@ -256,7 +256,7 @@ public function get_css_functions() {
* Parse CSS string and replasce varaibles and functions * Parse CSS string and replasce varaibles and functions
* *
* @since 1.0.0 * @since 1.0.0
* @param string $css CSS to parse. * @param [type] $css CSS to parse.
* @return string * @return string
*/ */
public function parse( $css ) { public function parse( $css ) {
Expand Down Expand Up @@ -327,7 +327,7 @@ public function print_inline_css() {
* Callback function to replace CSS vars * Callback function to replace CSS vars
* *
* @since 1.0.0 * @since 1.0.0
* @param string $matches founded vars. * @param [string] $matches founded vars.
*/ */
function replace_vars( $matches ) { function replace_vars( $matches ) {


Expand Down Expand Up @@ -371,7 +371,7 @@ function replace_vars( $matches ) {
* Callback function to replace CSS functions * Callback function to replace CSS functions
* *
* @since 1.0.0 * @since 1.0.0
* @param string $matches founded dunction. * @param [string] $matches founded dunction.
*/ */
function replace_func( $matches ) { function replace_func( $matches ) {


Expand Down

0 comments on commit f10e816

Please sign in to comment.