Skip to content

Commit df959eb

Browse files
author
Abraham Przewodnik
committed
Remove deferred.pipe
Remove the debugging-statement and revert dist/doc Remove deferred.pipe
1 parent 0a8ac0a commit df959eb

File tree

12 files changed

+108
-83
lines changed

12 files changed

+108
-83
lines changed

‎dist/parsley.js‎

Lines changed: 17 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/parsley.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/parsley.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/parsley.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎doc/annotated-source/base.html‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,20 @@ <h1>base.js</h1>
121121
Base.prototype = {
122122
<span class="hljs-attr">asyncSupport</span>: <span class="hljs-literal">true</span>, <span class="hljs-comment">// Deprecated</span>
123123

124-
<span class="hljs-attr">_pipeAccordingToValidationResult</span>: <span class="hljs-function"><span class="hljs-keyword">function</span> (<span class="hljs-params"></span>) </span>{
125-
<span class="hljs-keyword">var</span> pipe = <span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> {
126-
<span class="hljs-keyword">var</span> r = $.Deferred();
127-
<span class="hljs-keyword">if</span> (<span class="hljs-literal">true</span> !== <span class="hljs-keyword">this</span>.validationResult)
128-
r.reject();
129-
<span class="hljs-keyword">return</span> r.resolve().promise();
130-
};
131-
<span class="hljs-keyword">return</span> [pipe, pipe];
124+
<span class="hljs-attr">_pipeAccordingToValidationResult</span>: <span class="hljs-function"><span class="hljs-keyword">function</span> (<span class="hljs-params">deferred</span>) </span>{
125+
<span class="hljs-keyword">return</span> $.Deferred(<span class="hljs-function">(<span class="hljs-params">newDefer</span>) =&gt;</span> {
126+
<span class="hljs-keyword">const</span> handle = <span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> {
127+
<span class="hljs-keyword">var</span> r = <span class="hljs-literal">true</span> === <span class="hljs-keyword">this</span>.validationResult ?
128+
$.Deferred().resolve():
129+
$.Deferred().reject();
130+
r.promise()
131+
.progress(newDefer.notify)
132+
.done(newDefer.resolve)
133+
.fail(newDefer.reject)
134+
}
135+
deferred.done(handle)
136+
deferred.fail(handle)
137+
})
132138
},
133139

134140
<span class="hljs-attr">actualizeOptions</span>: <span class="hljs-function"><span class="hljs-keyword">function</span> (<span class="hljs-params"></span>) </span>{

‎doc/annotated-source/field.html‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,13 @@ <h1 id="public-api">Public API</h1>
261261

262262
<div class="content"><div class='highlight'><pre> <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'validate'</span>);
263263

264-
<span class="hljs-keyword">return</span> <span class="hljs-keyword">this</span>.whenValid({force, <span class="hljs-attr">value</span>: <span class="hljs-keyword">this</span>.value, <span class="hljs-attr">_refreshed</span>: <span class="hljs-literal">true</span>})
265-
.always(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._reflowUI(); })
266-
.done(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'success'</span>); })
267-
.fail(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'error'</span>); })
268-
.always(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'validated'</span>); })
269-
.pipe(...this._pipeAccordingToValidationResult());
264+
<span class="hljs-keyword">return</span> <span class="hljs-keyword">this</span>._pipeAccordingToValidationResult(
265+
<span class="hljs-keyword">this</span>.whenValid({force, <span class="hljs-attr">value</span>: <span class="hljs-keyword">this</span>.value, <span class="hljs-attr">_refreshed</span>: <span class="hljs-literal">true</span>})
266+
.always(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._reflowUI(); })
267+
.done(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'success'</span>); })
268+
.fail(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'error'</span>); })
269+
.always(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'validated'</span>); })
270+
);
270271
},
271272

272273
<span class="hljs-attr">hasConstraints</span>: <span class="hljs-function"><span class="hljs-keyword">function</span> (<span class="hljs-params"></span>) </span>{
@@ -429,6 +430,8 @@ <h1 id="public-api">Public API</h1>
429430
<div class="content"><div class='highlight'><pre> <span class="hljs-keyword">if</span> (<span class="hljs-string">'undefined'</span> === <span class="hljs-keyword">typeof</span> value || <span class="hljs-literal">null</span> === value)
430431
value = <span class="hljs-keyword">this</span>.getValue();
431432

433+
<span class="hljs-built_in">console</span>.log(<span class="hljs-string">'validate'</span> + value)
434+
432435
<span class="hljs-keyword">if</span> (!<span class="hljs-keyword">this</span>.needsValidation(value) &amp;&amp; <span class="hljs-literal">true</span> !== force)
433436
<span class="hljs-keyword">return</span> $.when();
434437

‎doc/annotated-source/form.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -329,15 +329,16 @@ <h1>form.js</h1>
329329
<span class="hljs-keyword">return</span> $.map(<span class="hljs-keyword">this</span>.fields, field =&gt; field.whenValidate({force, group}));
330330
});
331331

332-
<span class="hljs-keyword">return</span> Utils.all(promises)
333-
.done( <span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'success'</span>); })
334-
.fail( <span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> {
335-
<span class="hljs-keyword">this</span>.validationResult = <span class="hljs-literal">false</span>;
336-
<span class="hljs-keyword">this</span>.focus();
337-
<span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'error'</span>);
338-
})
339-
.always(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'validated'</span>); })
340-
.pipe(...this._pipeAccordingToValidationResult());
332+
<span class="hljs-keyword">return</span> <span class="hljs-keyword">this</span>._pipeAccordingToValidationResult(
333+
Utils.all(promises)
334+
.done( <span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'success'</span>); })
335+
.fail( <span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> {
336+
<span class="hljs-keyword">this</span>.validationResult = <span class="hljs-literal">false</span>;
337+
<span class="hljs-keyword">this</span>.focus();
338+
<span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'error'</span>);
339+
})
340+
.always(<span class="hljs-function"><span class="hljs-params">()</span> =&gt;</span> { <span class="hljs-keyword">this</span>._trigger(<span class="hljs-string">'validated'</span>); })
341+
);
341342
},</pre></div></div>
342343

343344
</li>

‎doc/annotated-source/remote.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ <h1>remote.js</h1>
274274
<div class="pilwrap ">
275275
<a class="pilcrow" href="#section-8">&#182;</a>
276276
</div>
277-
<p>Initialise querry cache</p>
277+
<p>Initialise query cache</p>
278278

279279
</div>
280280

‎doc/assets/spec-build.js‎

Lines changed: 21 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/parsley/base.js‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,20 @@ var Base = function () {
88
Base.prototype = {
99
asyncSupport: true, // Deprecated
1010

11-
_pipeAccordingToValidationResult: function () {
12-
var pipe = () => {
13-
var r = $.Deferred();
14-
if (true !== this.validationResult)
15-
r.reject();
16-
return r.resolve().promise();
17-
};
18-
return [pipe, pipe];
11+
_pipeAccordingToValidationResult: function (deferred) {
12+
return $.Deferred((newDefer) => {
13+
const handle = () => {
14+
var r = true === this.validationResult ?
15+
$.Deferred().resolve():
16+
$.Deferred().reject();
17+
r.promise()
18+
.progress(newDefer.notify)
19+
.done(newDefer.resolve)
20+
.fail(newDefer.reject)
21+
}
22+
deferred.done(handle)
23+
deferred.fail(handle)
24+
})
1925
},
2026

2127
actualizeOptions: function () {

0 commit comments

Comments
 (0)