Skip to content

Commit

Permalink
1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
webmandesign committed Apr 27, 2018
1 parent 29bd325 commit 8226fcd
Show file tree
Hide file tree
Showing 11 changed files with 670 additions and 36 deletions.
13 changes: 10 additions & 3 deletions assets/js/scripts-global.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 1.0.0
* @version 1.0.0
* @version 1.1.0
*
* Contents:
*
Expand Down Expand Up @@ -63,13 +63,20 @@

// Processing

e.preventDefault();

// Scroll the page to top.
$( 'html, body' )
.animate( {
scrollTop : 0
}, 600 );

// Reset focus on top of the page.
$( 'body' )
.attr( 'tabindex', 0 )
.focus();

// Do not alter URL in browser.
return false;

} );

}
Expand Down
23 changes: 23 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# Reykjavik Changelog

## 1.1.0

* **Add**: Elementor Pro Theme Builder compatibility!
* **Fix**: Compatibility with Beaver Builder 2.1+
* **Fix**: Beaver Themer post preview selector not working
* **Fix**: Back to top button accessibility
* **Fix**: Customizer logo partial refresh
* **Fix**: Preventing PHP error when WooCommerce shop page is not set

### Files changed:

changelog.md
functions.php
style.css
assets/js/scripts-global.js
includes/customize/class-customize.php
includes/plugins/beaver-builder/class-beaver-builder-assets.php
includes/plugins/beaver-themer/class-beaver-themer.php
includes/plugins/elementor/class-elementor.php
includes/plugins/elementor/elementor.php
includes/plugins/woocommerce/class-woocommerce-pages.php


## 1.0.8

* **Fix**: Jetpack Infinite Scroll compatibility
Expand Down
12 changes: 11 additions & 1 deletion functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 1.0.0
* @version 1.0.0
* @version 1.1.0
*
* Contents:
*
Expand Down Expand Up @@ -187,6 +187,16 @@
require REYKJAVIK_PATH_PLUGINS . 'breadcrumb-navxt/breadcrumb-navxt.php';
}

// Elementor

/**
* @subpackage Page Builder
* @subpackage Theme Builder
*/
if ( class_exists( '\Elementor\Plugin' ) ) {
require REYKJAVIK_PATH_PLUGINS . 'elementor/elementor.php';
}

// One Click Demo Import

if ( class_exists( 'OCDI_Plugin' ) && is_admin() ) {
Expand Down
6 changes: 3 additions & 3 deletions includes/customize/class-customize.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 1.0.0
* @version 1.0.7
* @version 1.1.0
*
* Contents:
*
Expand Down Expand Up @@ -102,7 +102,7 @@ public static function init() {
* Modify native WordPress options and setup partial refresh
*
* @since 1.0.0
* @version 1.0.0
* @version 1.1.0
*
* @param object $wp_customize WP customizer object.
*/
Expand All @@ -123,7 +123,7 @@ public static function setup( $wp_customize ) {
// Site title

$wp_customize->selective_refresh->add_partial( 'blogname', array(
'selector' => '.site-title-text',
'selector' => '.site-title',
'render_callback' => __CLASS__ . '::partial_blogname',
) );

Expand Down
2 changes: 1 addition & 1 deletion includes/frontend/class-post.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private function __construct() {

add_filter( 'wmhook_reykjavik_disable_header', __CLASS__ . '::is_page_template_blank' );
add_filter( 'wmhook_reykjavik_disable_footer', __CLASS__ . '::is_page_template_blank' );
add_filter( 'wmhook_reykjavik_title_primary_disable', __CLASS__ . '::is_page_template_blank' );
add_filter( 'wmhook_reykjavik_title_primary_disable', __CLASS__ . '::is_page_template_blank' );
add_filter( 'wmhook_reykjavik_breadcrumb_navxt_disabled', __CLASS__ . '::is_page_template_blank' );

add_filter( 'wmhook_reykjavik_title_primary_disable', __CLASS__ . '::page_builder_primary_title', 20 );
Expand Down
31 changes: 21 additions & 10 deletions includes/plugins/beaver-builder/class-beaver-builder-assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 1.0.0
* @version 1.0.0
* @version 1.1.0
*
* Contents:
*
Expand Down Expand Up @@ -90,24 +90,35 @@ public static function init() {
* Load plugin stylesheets after the theme stylesheet
*
* @since 1.0.0
* @version 1.0.0
* @version 1.1.0
*/
public static function late_load() {

// Processing
// Requirements check

if ( (bool) apply_filters( 'wmhook_reykjavik_beaver_builder_assets_late_load', false ) ) {
return;
}

// Layout stylesheets

remove_action( 'wp_enqueue_scripts', 'FLBuilder::enqueue_all_layouts_styles_scripts' );
// Helper variables

$priority = 120;
$callbacks = array(
'FLBuilder::enqueue_all_layouts_styles_scripts' => 10,
'FLBuilder::enqueue_ui_styles_scripts' => 11,
'FLBuilderUISettingsForms::enqueue_settings_config' => 11,
);

add_action( 'wp_enqueue_scripts', 'FLBuilder::enqueue_all_layouts_styles_scripts', 198 );
$order = 0;

// UI stylesheets

remove_action( 'wp_enqueue_scripts', 'FLBuilder::enqueue_ui_styles_scripts' );
remove_action( 'wp_enqueue_scripts', 'FLBuilder::enqueue_ui_styles_scripts', 11 );
// Processing

add_action( 'wp_enqueue_scripts', 'FLBuilder::enqueue_ui_styles_scripts', 198 );
foreach ( $callbacks as $callback => $default_priority ) {
remove_action( 'wp_enqueue_scripts', $callback, $default_priority );
add_action( 'wp_enqueue_scripts', $callback, $priority + $order++ );
}

} // /late_load

Expand Down
44 changes: 41 additions & 3 deletions includes/plugins/beaver-themer/class-beaver-themer.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 1.0.0
* @version 1.0.0
* @version 1.1.0
*
* Contents:
*
Expand All @@ -32,7 +32,7 @@ class Reykjavik_Beaver_Themer {
* Constructor
*
* @since 1.0.0
* @version 1.0.0
* @version 1.1.0
*/
private function __construct() {

Expand All @@ -48,8 +48,9 @@ private function __construct() {

// Actions

add_action( 'wp', __CLASS__ . '::sidebar_disable' );
add_action( 'init', __CLASS__ . '::late_load', 900 );

add_action( 'wp', __CLASS__ . '::sidebar_disable' );
add_action( 'wp', __CLASS__ . '::headers_footers', 999 );

// Filters
Expand Down Expand Up @@ -89,6 +90,43 @@ public static function init() {
* 10) Setup
*/

/**
* Load plugin assets a bit later (see Beaver Builder compatibility)
*
* @since 1.1.0
* @version 1.1.0
*/
public static function late_load() {

// Requirements check

if ( (bool) apply_filters( 'wmhook_reykjavik_beaver_builder_assets_late_load', false ) ) {
return;
}


// Helper variables

$priority = 120;
$callbacks = array(
'FLThemeBuilderLayoutFrontendEdit::enqueue_scripts' => 11,
);

// Has to be enqueued after `{%= prefix_class %}_Beaver_Builder_Assets::late_load()` UI assets.
$order = 3;


// Processing

foreach ( $callbacks as $callback => $default_priority ) {
remove_action( 'wp_enqueue_scripts', $callback, $default_priority );
add_action( 'wp_enqueue_scripts', $callback, $priority + $order++ );
}

} // /late_load



/**
* Custom header and footer renderer
*
Expand Down
Loading

0 comments on commit 8226fcd

Please sign in to comment.