From 01440016865b292fa1036990830d951c51eb89b7 Mon Sep 17 00:00:00 2001 From: Madeleine Shang Date: Mon, 27 Feb 2017 17:47:52 +0000 Subject: [PATCH 1/4] auto url and validation --- index.html | 21 ++++++++++++++++++--- js/proposalGenerator.js | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index a914219..ce9c831 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@ - + @@ -126,7 +126,8 @@ $('#btnPrepare').click(function() { var proposal = new ProposalGenerator(gov); - + console.log("prop.validate", proposal.validate); + //**** var validProposal = proposal.validate(); if (validProposal) { @@ -212,6 +213,19 @@ }); }); }); + $('#name').on('input', function() { + var proposalName = $('#name').val(); + var nameregex = /^[-_a-zA-Z0-9]{1,40}$/; + var isValid=nameregex.test(proposalName); + if (!isValid){ + $('#name').addClass("validationError"); + $('#btnPrepare').prop("disabled", true); + }else{ + $('#name').removeClass("validationError"); + $('#btnPrepare').prop("disabled", false); + $('#url').val("https://www.dashcentral.org/p/"+proposalName); + } + }); @@ -503,6 +517,7 @@

Wallet Commands

- + + diff --git a/js/proposalGenerator.js b/js/proposalGenerator.js index 25a9ecc..4f64b32 100755 --- a/js/proposalGenerator.js +++ b/js/proposalGenerator.js @@ -18,6 +18,7 @@ function ProposalGenerator(gov) { ProposalGenerator.prototype.validate = function() { try { + console.log('gov.serialize', this.gov.serialize) //**** var gov = this.gov.serialize(); } catch (e) { From aa77d10b706a619873cb5f8afadac3e9bb952591 Mon Sep 17 00:00:00 2001 From: Madeleine Shang Date: Mon, 27 Feb 2017 18:51:13 +0000 Subject: [PATCH 2/4] save and change script location --- index.html | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index ce9c831..ab9b406 100644 --- a/index.html +++ b/index.html @@ -213,19 +213,6 @@ }); }); }); - $('#name').on('input', function() { - var proposalName = $('#name').val(); - var nameregex = /^[-_a-zA-Z0-9]{1,40}$/; - var isValid=nameregex.test(proposalName); - if (!isValid){ - $('#name').addClass("validationError"); - $('#btnPrepare').prop("disabled", true); - }else{ - $('#name').removeClass("validationError"); - $('#btnPrepare').prop("disabled", false); - $('#url').val("https://www.dashcentral.org/p/"+proposalName); - } - }); @@ -517,6 +504,22 @@

Wallet Commands

+ From 221f9db7f291c97df009cb49fa4374747bef7e62 Mon Sep 17 00:00:00 2001 From: Madeleine Shang Date: Mon, 27 Feb 2017 19:40:12 +0000 Subject: [PATCH 3/4] clean up console.logs --- index.html | 2 -- js/proposalGenerator.js | 1 - 2 files changed, 3 deletions(-) diff --git a/index.html b/index.html index ab9b406..58f8f4e 100644 --- a/index.html +++ b/index.html @@ -126,8 +126,6 @@ $('#btnPrepare').click(function() { var proposal = new ProposalGenerator(gov); - console.log("prop.validate", proposal.validate); - //**** var validProposal = proposal.validate(); if (validProposal) { diff --git a/js/proposalGenerator.js b/js/proposalGenerator.js index 4f64b32..25a9ecc 100755 --- a/js/proposalGenerator.js +++ b/js/proposalGenerator.js @@ -18,7 +18,6 @@ function ProposalGenerator(gov) { ProposalGenerator.prototype.validate = function() { try { - console.log('gov.serialize', this.gov.serialize) //**** var gov = this.gov.serialize(); } catch (e) { From 43b354645a4614f988db2c310ea9c4c3566d7e2d Mon Sep 17 00:00:00 2001 From: Madeleine Shang Date: Mon, 27 Feb 2017 19:44:40 +0000 Subject: [PATCH 4/4] correct un-needed spacing change --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 58f8f4e..dfc1f1d 100644 --- a/index.html +++ b/index.html @@ -126,6 +126,7 @@ $('#btnPrepare').click(function() { var proposal = new ProposalGenerator(gov); + var validProposal = proposal.validate(); if (validProposal) {