Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
* release/1.0.1:
  Changelog for 1.0.1
  README tweaking.
  Fixed an issue where the initial state wasn’t being output properly.
  • Loading branch information
joshangell committed Feb 14, 2019
2 parents 7e718fc + 0e97e02 commit 748a35f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).

## 1.0.1 - 2019-02-14
### Fixed
- Fixed an issue where the plugin wasn’t picking up valid CraftQL env vars

## 1.0.0 - 2019-02-14
### Added
- Initial release
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You can also install FFFields via the Plugin Store in your Craft control panel,

## FFFields Overview

FFFields gives you a complete toolkit to create fabulous front-end forms and dashboards. You can hook up your fields to Craft via the [CraftQL plugin](https://plugins.craftcms.com/craftql) or roll your own solution, you choose.
FFFields gives you a complete toolkit to create fabulous front-end forms and dashboards. You can hook up your fields to Craft via the [CraftQL plugin](https://plugins.craftcms.com/craftql) or roll your own solution.

This plugin makes use of [Vue.js](https://vuejs.org/) and [Tailwind CSS](https://tailwindcss.com), but you don’t need to know either to use it.

Expand Down
6 changes: 4 additions & 2 deletions src/services/Render.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ public function includeAssets($includeCss = true)
Craft::$app->view->registerAssetBundle("angellco\\fffields\\assetbundles\\FffieldsCssAsset");
}

$this->outputState();
return $this->outputState();
}

/**
* @return \Twig_Markup
* @return \Twig_Markup|void
*/
public function outputState()
{
Expand All @@ -60,6 +60,8 @@ public function outputState()

return TemplateHelper::raw($js);
}

return;
}

/**
Expand Down

0 comments on commit 748a35f

Please sign in to comment.