From ead9d27ebc580ce428c991cbbd3ad505865ffd63 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 9 Nov 2015 17:46:54 -0500 Subject: case sensitive --- StoneIsland/www/index.html | 138 ++++++++++++------------- StoneIsland/www/js/lib/account/PaymentView.js | 23 +---- StoneIsland/www/js/lib/account/SignupView.js | 2 +- StoneIsland/www/js/lib/cart/CartPayment.js | 1 + StoneIsland/www/js/lib/nav/AddressView.js | 22 ++++ StoneIsland/www/js/lib/nav/CreditCardView.js | 22 ++++ StoneIsland/www/js/vendor/view/serializable.js | 13 +++ proxy/index.js | 6 +- 8 files changed, 127 insertions(+), 100 deletions(-) create mode 100644 StoneIsland/www/js/lib/nav/AddressView.js create mode 100644 StoneIsland/www/js/lib/nav/CreditCardView.js create mode 100644 StoneIsland/www/js/vendor/view/serializable.js diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index d55f6ef6..f56367ae 100644 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -365,80 +365,68 @@ @@ -466,6 +454,8 @@ + + diff --git a/StoneIsland/www/js/lib/account/PaymentView.js b/StoneIsland/www/js/lib/account/PaymentView.js index e43dfc1c..95b63879 100644 --- a/StoneIsland/www/js/lib/account/PaymentView.js +++ b/StoneIsland/www/js/lib/account/PaymentView.js @@ -7,6 +7,7 @@ var PaymentView = View.extend({ initialize: function(){ this.address = new AddressView ({ parent: this }) + this.cc = new CreditCardView ({ parent: this }) }, show: function(){ @@ -14,25 +15,3 @@ var PaymentView = View.extend({ }, }) - -var AddressView = View.extend({ - - template: $("#address_template").html(), - - events: { - }, - - initialize: function(opt){ - this.parent = opt.parent - }, - - build: function(){ - }, - - deserialize: function(){ - }, - - serialize: function(){ - }, - -}) \ No newline at end of file diff --git a/StoneIsland/www/js/lib/account/SignupView.js b/StoneIsland/www/js/lib/account/SignupView.js index 14fb27a6..0f527d4f 100644 --- a/StoneIsland/www/js/lib/account/SignupView.js +++ b/StoneIsland/www/js/lib/account/SignupView.js @@ -1,4 +1,4 @@ -var SignupView = View.extend({ +var SignupView = SerializableView.extend({ el: "#signup", diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js index a797765d..69cbf81b 100644 --- a/StoneIsland/www/js/lib/cart/CartPayment.js +++ b/StoneIsland/www/js/lib/cart/CartPayment.js @@ -7,6 +7,7 @@ var CartPayment = View.extend({ initialize: function(){ this.address = new AddressView ({ parent: this }) + this.cc = new CreditCardView ({ parent: this }) }, show: function(){ diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js new file mode 100644 index 00000000..94d20631 --- /dev/null +++ b/StoneIsland/www/js/lib/nav/AddressView.js @@ -0,0 +1,22 @@ + +var AddressView = View.extend({ + + template: $("#address_template").html(), + + events: { + }, + + initialize: function(opt){ + this.parent = opt.parent + }, + + build: function(){ + }, + + deserialize: function(){ + }, + + serialize: function(){ + }, + +}) diff --git a/StoneIsland/www/js/lib/nav/CreditCardView.js b/StoneIsland/www/js/lib/nav/CreditCardView.js new file mode 100644 index 00000000..6668053d --- /dev/null +++ b/StoneIsland/www/js/lib/nav/CreditCardView.js @@ -0,0 +1,22 @@ + +var CreditCardView = View.extend({ + + template: $("#creditcard_template").html(), + + events: { + }, + + initialize: function(opt){ + this.parent = opt.parent + }, + + build: function(){ + }, + + deserialize: function(){ + }, + + serialize: function(){ + }, + +}) diff --git a/StoneIsland/www/js/vendor/view/serializable.js b/StoneIsland/www/js/vendor/view/serializable.js new file mode 100644 index 00000000..91d84997 --- /dev/null +++ b/StoneIsland/www/js/vendor/view/serializable.js @@ -0,0 +1,13 @@ +var SerializableView = View.extend({ + + serialize: function(){ + var fd = new FormData(), hasCSRF = false + + this.$("input[name], select[name], textarea[name]").each( function(){ + fd.append(this.name, this.value) + }) + + return fd + }, + +}) \ No newline at end of file diff --git a/proxy/index.js b/proxy/index.js index f9203fc7..09328ba5 100644 --- a/proxy/index.js +++ b/proxy/index.js @@ -94,15 +94,15 @@ var mimes = { } function stream (req, res) { - var url = req.url.toLowerCase().split('?')[0] - var ext_partz = url.split('.'), ext = ext_partz[ext_partz.length-1] + var url = req.url.split('?')[0] + var ext_partz = url.toLowerCase().split('.'), ext = ext_partz[ext_partz.length-1] var mime = mimes[ext] || 'application/octet-stream' if (! url || url == '/') { url = 'index.html' mime = 'text/html' } - if (url == '/cordova.js' || url == 'favicon.ico') { + if (url == '/cordova.js' || url == '/favicon.ico') { res.writeHead(200, 'OK', { 'Content-type': 'application/javascript' }) res.end('{}') return -- cgit v1.2.3-70-g09d2