Skip to content

Commit

Permalink
Updated dependencies and fixed formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
colintucker committed Jun 15, 2017
1 parent 318131a commit 06e4917
Show file tree
Hide file tree
Showing 8 changed files with 268 additions and 203 deletions.
2 changes: 1 addition & 1 deletion client/dist/js/parsley.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions client/src/bundles/parsley.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require('parsleyjs/src/extra/validator/words');

// Load Custom Validators:

require('../parsley/validator/date');
require('../parsley/validator/domain');
require('../parsley/validator/notequalto');
require('parsley/validator/date');
require('parsley/validator/domain');
require('parsley/validator/notequalto');

// Initialise:

require('../parsley/init.js');
require('parsley/init.js');
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"require": {
"php": ">=5.6.0",
"guzzlehttp/guzzle": "^6.2",
"silverstripe/framework": "^4.0@dev"
"silverstripe/framework": "^4@dev"
},
"autoload": {
"psr-4": {
Expand All @@ -32,7 +32,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "0.1.x-dev"
"dev-master": "1.0.x-dev"
},
"installer-name": "silverware-validator"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "silverware-validator",
"version": "0.1.2",
"version": "1.0.0",
"description": "SilverWare Validator Module.",
"homepage": "https://github.com/praxisnetau/silverware-validator",
"keywords": [
Expand Down
6 changes: 6 additions & 0 deletions src/Backend.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ public function getHTMLClass()

/**
* Initialises the validator backend (with extension hooks).
*
* @return void
*/
public function doInit()
{
Expand Down Expand Up @@ -327,6 +329,8 @@ public function getRequiredCSS()

/**
* Loads the CSS and scripts required by the receiver.
*
* @return void
*/
public function loadRequirements()
{
Expand All @@ -345,6 +349,8 @@ public function loadRequirements()

/**
* Initialises the validator backend.
*
* @return void
*/
protected function init()
{
Expand Down
2 changes: 2 additions & 0 deletions src/Extensions/FormFieldExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class FormFieldExtension extends Extension
* Updates the HTML attributes of the extended field.
*
* @param array $attributes
*
* @return void
*/
public function updateAttributes(&$attributes)
{
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const style = (env, loaders) => {
return (env === 'production') ? ExtractTextPlugin.extract({
fallback: 'style-loader',
use: loaders
}) : ['style-loader'].concat(loaders);
}) : [{ loader: 'style-loader' }].concat(loaders);
};

// Configure Rules:
Expand Down
Loading

0 comments on commit 06e4917

Please sign in to comment.