Skip to content

Commit

Permalink
Up version to 0.3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
nicomollet committed Sep 8, 2017
1 parent 94d8f20 commit a81d49e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 28 deletions.
11 changes: 7 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
### Unreleased
* **Tweak** - Version the main CSS and JS file
* **New** - Frontpage body class

### 0.3.8:

### 0.3.8: September 8th, 2017
* **New** - Full screen form feature
* **New** - i18n: RU, DE, ZH
* **Tweak** - i18n: FR
* **New** - Full screen form feature
* **Fix** - Hide navigation when Elementor editor is active
* **Fix** - Hustle popups visibility
* **Tweak** - Version the main CSS and JS file
* **New** - Datepicker update version to 1.6.4 and fix lang "zh"
* **Tweak** - Frontpage body class
* **New** - Gravity Forms width

### 0.3.7: August 22nd, 2017
* **New** - WooCommerce: class for cart widgets empty/notempty
Expand Down
48 changes: 24 additions & 24 deletions inc/front/scripts.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
*/
function stormbringer_js_theme() {

//wp_enqueue_script( 'stormbringer-common', get_template_directory_uri() . '/js/src/common.js', array( 'jquery' ), null, true );

$jsfile = 'js/scripts.js';
$version = null;

// Preprocessor
$preprocessor = get_theme_mod('bootstrap_preprocessor', true);

if ( $preprocessor === 'less' ) {
}

if ( $preprocessor === 'scss' || $preprocessor == 1) {
$grunt_assets = get_theme_mod('grunt_assets');
if ( current_user_can( 'administrator' ) || @$_GET['scsscompile'] == '1' ) {
}
else{
$jsfile = 'js/scripts.min.js';
$version = time();
//if(isset($grunt_assets[$jsfile])) {
// $jsfile = $grunt_assets[$jsfile];
//}
}
}
wp_enqueue_script( 'theme', get_stylesheet_directory_uri() . '/'.$jsfile, array( 'jquery' ), $version, true );
//wp_enqueue_script( 'stormbringer-common', get_template_directory_uri() . '/js/src/common.js', array( 'jquery' ), null, true );

$jsfile = 'js/scripts.js';
$version = null;

// Preprocessor
$preprocessor = get_theme_mod( 'bootstrap_preprocessor', true );

if ( $preprocessor === 'less' ) {
}

if ( $preprocessor === 'scss' || $preprocessor == 1 ) {
$grunt_assets = get_theme_mod( 'grunt_assets' );
if ( current_user_can( 'administrator' ) || @$_GET['scsscompile'] == '1' ) {
$version = time();
} else {
$jsfile = 'js/scripts.min.js';

if ( isset( $grunt_assets[ $jsfile ] ) ) {
$jsfile = $grunt_assets[ $jsfile ];
}
}
}
wp_enqueue_script( 'theme', get_stylesheet_directory_uri() . '/' . $jsfile, array( 'jquery' ), $version, true );

}
add_action( 'wp_enqueue_scripts', 'stormbringer_js_theme', 300 );
Expand Down

0 comments on commit a81d49e

Please sign in to comment.