vue-formular
Advanced tools
Comparing version 0.0.18 to 0.0.19
String.prototype.ucfirst = require('./lib/helpers/ucfirst'); | ||
var merge = require('deepmerge'); | ||
var merge = require('merge'); | ||
@@ -57,4 +57,4 @@ exports.install = function(Vue, globalOptions) { | ||
var defaultOptions = require('./lib/options/options')(); | ||
var options = merge(defaultOptions, globalOptions); | ||
this.options = merge(options, this.options); | ||
var options = merge.recursive(defaultOptions, globalOptions); | ||
this.options = merge.recursive(options, this.options); | ||
@@ -61,0 +61,0 @@ |
@@ -48,3 +48,3 @@ var render_template = require('../../helpers/render-template'); | ||
var options = merge(this.options, { | ||
var options = merge.recursive(this.options, { | ||
startDate:this.range?this.value.start:this.value, | ||
@@ -51,0 +51,0 @@ endDate:this.range?this.value.end:null, |
@@ -44,3 +44,3 @@ var render_template = require('../../helpers/render-template'); | ||
if (typeof this.select2=='object') | ||
options = merge(this.select2, options); | ||
options = merge.recursive(this.select2, options); | ||
@@ -47,0 +47,0 @@ $(this.$el).find("select") |
@@ -12,3 +12,3 @@ var validator = require('../../validation/rules/*.js',{mode:'hash'}) | ||
validator = merge(validator, this.$parent.options.customRules); | ||
validator = merge.recursive(validator, this.$parent.options.customRules); | ||
@@ -15,0 +15,0 @@ for (var rule in this.rules) { |
@@ -10,8 +10,7 @@ var isEqual = require('../../helpers/is-equal'); | ||
this.$watch('dirty', function(value, oldVal) { | ||
this.$watch('dirty', function(isDirty) { | ||
if (value) { | ||
if (isDirty) { | ||
this.$parent.dirtyFields.push(this); | ||
} else { | ||
this.$parent.dirtyFields.$remove(this); | ||
@@ -18,0 +17,0 @@ } |
@@ -11,5 +11,5 @@ var merge = require('merge'); | ||
data = merge(data,this.options.additionalPayload); | ||
data = merge.recursive(data,this.options.additionalPayload); | ||
return data; | ||
} |
{ | ||
"name": "vue-formular", | ||
"description": "a comprehensive vue.js form component", | ||
"version": "0.0.18", | ||
"version": "0.0.19", | ||
"keywords": [ | ||
@@ -21,3 +21,2 @@ "vue", | ||
"clone": "^1.0.2", | ||
"deepmerge": "^0.2.10", | ||
"merge": "^1.2.0", | ||
@@ -24,0 +23,0 @@ "moment": "^2.10.6", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
41198
5
- Removeddeepmerge@^0.2.10
- Removeddeepmerge@0.2.10(transitive)