Download:
child 16:46619ef56f14
parent 14:8f8eddb3b264
15:52b632342209
Anton Shestakov <av6@dwimlabs.net>, Sun, 20 Mar 2016 11:48:13 +0800
validation: move to the new namespace, and move from ui/ up

10 файлов изменено, 93 вставок(+), 108 удалений(-) [+]
coffee/register.coffee file | annotate | diff | comparison | revisions
coffee/ui/validation.coffee file | annotate | diff | comparison | revisions
coffee/validation.coffee file | annotate | diff | comparison | revisions
js/register.js file | annotate | diff | comparison | revisions
js/register.js.map file | annotate | diff | comparison | revisions
js/ui/validation.js file | annotate | diff | comparison | revisions
js/ui/validation.js.map file | annotate | diff | comparison | revisions
js/validation.js file | annotate | diff | comparison | revisions
js/validation.js.map file | annotate | diff | comparison | revisions
register.html file | annotate | diff | comparison | revisions
--- a/coffee/register.coffee Sun Mar 20 11:43:20 2016 +0800
+++ b/coffee/register.coffee Sun Mar 20 11:48:13 2016 +0800
@@ -98,11 +98,11 @@
$('#register').on 'click', ->
ok = true
- validation.unsetError($('#username, #password1, #password2'))
- ok &= validation.validateRequired($('#username'), true)
- ok &= validation.validatePasswords($('#password1'), $('#password2'))
- ok &= validation.validateRequired($('#password1'))
- ok &= validation.validateRequired($('#password2'))
+ Tram.validation.unsetError($('#username, #password1, #password2'))
+ ok &= Tram.validation.validateRequired($('#username'), true)
+ ok &= Tram.validation.validatePasswords($('#password1'), $('#password2'))
+ ok &= Tram.validation.validateRequired($('#password1'))
+ ok &= Tram.validation.validateRequired($('#password2'))
if ok
R.register $('#username').val().trim(), $('#password1').val()
@@ -136,7 +136,7 @@
R.on 'r/conflict', ->
- validation.setError $('#username'), 'A user with this username already exists.'
+ Tram.validation.setError $('#username'), 'A user with this username already exists.'
R.on 'r/failed', ->
--- a/coffee/ui/validation.coffee Sun Mar 20 11:43:20 2016 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-class Validation
- setError: ($field, message) ->
- $el = $('<div class="uk-text-danger"></div>').text(message)
- $field.addClass('uk-form-danger')
- $field.after($el)
-
- unsetError: ($field) ->
- $field.removeClass('uk-form-danger').siblings('.uk-text-danger').remove()
-
- validateRequired: (field, trim) ->
- $field = $(field)
- val = $field.val()
- val = val.trim() if trim
- if val is ''
- @setError $field, 'This field is required.'
- return false
- else
- return true
-
- validatePasswords: (field1, field2) ->
- $field1 = $(field1)
- $field2 = $(field2)
- if $field1.val() isnt $field2.val()
- @setError $field2, 'Passwords must match.'
- return false
- else
- return true
-
-
-window.validation = new Validation()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coffee/validation.coffee Sun Mar 20 11:48:13 2016 +0800
@@ -0,0 +1,27 @@
+Tram.validation =
+ setError: ($field, message) ->
+ $el = $('<div class="uk-text-danger"></div>').text(message)
+ $field.addClass('uk-form-danger')
+ $field.after($el)
+
+ unsetError: ($field) ->
+ $field.removeClass('uk-form-danger').siblings('.uk-text-danger').remove()
+
+ validateRequired: (field, trim) ->
+ $field = $(field)
+ val = $field.val()
+ val = val.trim() if trim
+ if val is ''
+ @setError $field, 'This field is required.'
+ return false
+ else
+ return true
+
+ validatePasswords: (field1, field2) ->
+ $field1 = $(field1)
+ $field2 = $(field2)
+ if $field1.val() isnt $field2.val()
+ @setError $field2, 'Passwords must match.'
+ return false
+ else
+ return true
--- a/js/register.js Sun Mar 20 11:43:20 2016 +0800
+++ b/js/register.js Sun Mar 20 11:48:13 2016 +0800
@@ -93,11 +93,11 @@
$('#register').on('click', function() {
var ok;
ok = true;
- validation.unsetError($('#username, #password1, #password2'));
- ok &= validation.validateRequired($('#username'), true);
- ok &= validation.validatePasswords($('#password1'), $('#password2'));
- ok &= validation.validateRequired($('#password1'));
- ok &= validation.validateRequired($('#password2'));
+ Tram.validation.unsetError($('#username, #password1, #password2'));
+ ok &= Tram.validation.validateRequired($('#username'), true);
+ ok &= Tram.validation.validatePasswords($('#password1'), $('#password2'));
+ ok &= Tram.validation.validateRequired($('#password1'));
+ ok &= Tram.validation.validateRequired($('#password2'));
if (ok) {
return R.register($('#username').val().trim(), $('#password1').val());
}
@@ -137,7 +137,7 @@
});
R.on('r/conflict', function() {
- return validation.setError($('#username'), 'A user with this username already exists.');
+ return Tram.validation.setError($('#username'), 'A user with this username already exists.');
});
R.on('r/failed', function() {
--- a/js/register.js.map Sun Mar 20 11:43:20 2016 +0800
+++ b/js/register.js.map Sun Mar 20 11:48:13 2016 +0800
@@ -6,5 +6,5 @@
"coffee/register.coffee"
],
"names": [],
- "mappings": "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"
+ "mappings": "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"
}
\ No newline at end of file
--- a/js/ui/validation.js Sun Mar 20 11:43:20 2016 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Generated by CoffeeScript 1.10.0
-(function() {
- var Validation;
-
- Validation = (function() {
- function Validation() {}
-
- Validation.prototype.setError = function($field, message) {
- var $el;
- $el = $('<div class="uk-text-danger"></div>').text(message);
- $field.addClass('uk-form-danger');
- return $field.after($el);
- };
-
- Validation.prototype.unsetError = function($field) {
- return $field.removeClass('uk-form-danger').siblings('.uk-text-danger').remove();
- };
-
- Validation.prototype.validateRequired = function(field, trim) {
- var $field, val;
- $field = $(field);
- val = $field.val();
- if (trim) {
- val = val.trim();
- }
- if (val === '') {
- this.setError($field, 'This field is required.');
- return false;
- } else {
- return true;
- }
- };
-
- Validation.prototype.validatePasswords = function(field1, field2) {
- var $field1, $field2;
- $field1 = $(field1);
- $field2 = $(field2);
- if ($field1.val() !== $field2.val()) {
- this.setError($field2, 'Passwords must match.');
- return false;
- } else {
- return true;
- }
- };
-
- return Validation;
-
- })();
-
- window.validation = new Validation();
-
-}).call(this);
-
-//# sourceMappingURL=validation.js.map
--- a/js/ui/validation.js.map Sun Mar 20 11:43:20 2016 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-{
- "version": 3,
- "file": "validation.js",
- "sourceRoot": "../..",
- "sources": [
- "coffee/ui/validation.coffee"
- ],
- "names": [],
- "mappings": ";AAAA;AAAA,MAAA;;EAAM;;;yBACJ,QAAA,GAAU,SAAC,MAAD,EAAS,OAAT;AACR,UAAA;MAAA,GAAA,GAAM,CAAA,CAAE,oCAAF,CAAuC,CAAC,IAAxC,CAA6C,OAA7C;MACN,MAAM,CAAC,QAAP,CAAgB,gBAAhB;aACA,MAAM,CAAC,KAAP,CAAa,GAAb;IAHQ;;yBAKV,UAAA,GAAY,SAAC,MAAD;aACV,MAAM,CAAC,WAAP,CAAmB,gBAAnB,CAAoC,CAAC,QAArC,CAA8C,iBAA9C,CAAgE,CAAC,MAAjE,CAAA;IADU;;yBAGZ,gBAAA,GAAkB,SAAC,KAAD,EAAQ,IAAR;AAChB,UAAA;MAAA,MAAA,GAAS,CAAA,CAAE,KAAF;MACT,GAAA,GAAM,MAAM,CAAC,GAAP,CAAA;MACN,IAAoB,IAApB;QAAA,GAAA,GAAM,GAAG,CAAC,IAAJ,CAAA,EAAN;;MACA,IAAG,GAAA,KAAO,EAAV;QACE,IAAC,CAAA,QAAD,CAAU,MAAV,EAAkB,yBAAlB;AACA,eAAO,MAFT;OAAA,MAAA;AAIE,eAAO,KAJT;;IAJgB;;yBAUlB,iBAAA,GAAmB,SAAC,MAAD,EAAS,MAAT;AACjB,UAAA;MAAA,OAAA,GAAU,CAAA,CAAE,MAAF;MACV,OAAA,GAAU,CAAA,CAAE,MAAF;MACV,IAAG,OAAO,CAAC,GAAR,CAAA,CAAA,KAAmB,OAAO,CAAC,GAAR,CAAA,CAAtB;QACE,IAAC,CAAA,QAAD,CAAU,OAAV,EAAmB,uBAAnB;AACA,eAAO,MAFT;OAAA,MAAA;AAIE,eAAO,KAJT;;IAHiB;;;;;;EAUrB,MAAM,CAAC,UAAP,GAAwB,IAAA,UAAA,CAAA;AA7BxB"
-}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/js/validation.js Sun Mar 20 11:48:13 2016 +0800
@@ -0,0 +1,42 @@
+// Generated by CoffeeScript 1.10.0
+(function() {
+ Tram.validation = {
+ setError: function($field, message) {
+ var $el;
+ $el = $('<div class="uk-text-danger"></div>').text(message);
+ $field.addClass('uk-form-danger');
+ return $field.after($el);
+ },
+ unsetError: function($field) {
+ return $field.removeClass('uk-form-danger').siblings('.uk-text-danger').remove();
+ },
+ validateRequired: function(field, trim) {
+ var $field, val;
+ $field = $(field);
+ val = $field.val();
+ if (trim) {
+ val = val.trim();
+ }
+ if (val === '') {
+ this.setError($field, 'This field is required.');
+ return false;
+ } else {
+ return true;
+ }
+ },
+ validatePasswords: function(field1, field2) {
+ var $field1, $field2;
+ $field1 = $(field1);
+ $field2 = $(field2);
+ if ($field1.val() !== $field2.val()) {
+ this.setError($field2, 'Passwords must match.');
+ return false;
+ } else {
+ return true;
+ }
+ }
+ };
+
+}).call(this);
+
+//# sourceMappingURL=validation.js.map
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/js/validation.js.map Sun Mar 20 11:48:13 2016 +0800
@@ -0,0 +1,10 @@
+{
+ "version": 3,
+ "file": "validation.js",
+ "sourceRoot": "..",
+ "sources": [
+ "coffee/validation.coffee"
+ ],
+ "names": [],
+ "mappings": ";AAAA;EAAA,IAAI,CAAC,UAAL,GACE;IAAA,QAAA,EAAU,SAAC,MAAD,EAAS,OAAT;AACR,UAAA;MAAA,GAAA,GAAM,CAAA,CAAE,oCAAF,CAAuC,CAAC,IAAxC,CAA6C,OAA7C;MACN,MAAM,CAAC,QAAP,CAAgB,gBAAhB;aACA,MAAM,CAAC,KAAP,CAAa,GAAb;IAHQ,CAAV;IAKA,UAAA,EAAY,SAAC,MAAD;aACV,MAAM,CAAC,WAAP,CAAmB,gBAAnB,CAAoC,CAAC,QAArC,CAA8C,iBAA9C,CAAgE,CAAC,MAAjE,CAAA;IADU,CALZ;IAQA,gBAAA,EAAkB,SAAC,KAAD,EAAQ,IAAR;AAChB,UAAA;MAAA,MAAA,GAAS,CAAA,CAAE,KAAF;MACT,GAAA,GAAM,MAAM,CAAC,GAAP,CAAA;MACN,IAAoB,IAApB;QAAA,GAAA,GAAM,GAAG,CAAC,IAAJ,CAAA,EAAN;;MACA,IAAG,GAAA,KAAO,EAAV;QACE,IAAC,CAAA,QAAD,CAAU,MAAV,EAAkB,yBAAlB;AACA,eAAO,MAFT;OAAA,MAAA;AAIE,eAAO,KAJT;;IAJgB,CARlB;IAkBA,iBAAA,EAAmB,SAAC,MAAD,EAAS,MAAT;AACjB,UAAA;MAAA,OAAA,GAAU,CAAA,CAAE,MAAF;MACV,OAAA,GAAU,CAAA,CAAE,MAAF;MACV,IAAG,OAAO,CAAC,GAAR,CAAA,CAAA,KAAmB,OAAO,CAAC,GAAR,CAAA,CAAtB;QACE,IAAC,CAAA,QAAD,CAAU,OAAV,EAAmB,uBAAnB;AACA,eAAO,MAFT;OAAA,MAAA;AAIE,eAAO,KAJT;;IAHiB,CAlBnB;;AADF"
+}
\ No newline at end of file
--- a/register.html Sun Mar 20 11:43:20 2016 +0800
+++ b/register.html Sun Mar 20 11:48:13 2016 +0800
@@ -85,8 +85,8 @@
<div class="uk-alert uk-alert-danger uk-hidden" data-msg="v/failed">Couldn't save the vCard.</div>
</div>
- <script src='/js/ui/validation.js'></script>
<script src='/js/tram.js'></script>
+ <script src='/js/validation.js'></script>
<script src='/js/register.js'></script>
</body>
</html>