summaryrefslogtreecommitdiff
path: root/StoneIsland
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-11-11 18:08:37 -0500
committerJules Laplace <jules@okfoc.us>2015-11-11 18:08:37 -0500
commite49d68aa34532bbdf9d8d942f9d7e2532454e55d (patch)
treef23ef3bf92d3d40e921e87b4fe91efccdce41308 /StoneIsland
parentca49959f326d3a03a47b2352c19d52ef91085158 (diff)
not happy with this cc api
Diffstat (limited to 'StoneIsland')
-rw-r--r--StoneIsland/platforms/ios/StoneIsland.xcodeproj/project.xcworkspace/xcuserdata/jules.xcuserdatad/UserInterfaceState.xcuserstatebin13428 -> 13429 bytes
-rw-r--r--StoneIsland/www/js/lib/_router.js2
-rw-r--r--StoneIsland/www/js/lib/products/ProductView.js7
-rw-r--r--StoneIsland/www/js/sdk/cart.js4
-rw-r--r--StoneIsland/www/js/sdk/payment.js4
-rw-r--r--StoneIsland/www/js/sdk/shipping.js2
6 files changed, 11 insertions, 8 deletions
diff --git a/StoneIsland/platforms/ios/StoneIsland.xcodeproj/project.xcworkspace/xcuserdata/jules.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/StoneIsland.xcodeproj/project.xcworkspace/xcuserdata/jules.xcuserdatad/UserInterfaceState.xcuserstate
index 3b7233e1..bcf4bbca 100644
--- a/StoneIsland/platforms/ios/StoneIsland.xcodeproj/project.xcworkspace/xcuserdata/jules.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/StoneIsland.xcodeproj/project.xcworkspace/xcuserdata/jules.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/StoneIsland/www/js/lib/_router.js b/StoneIsland/www/js/lib/_router.js
index bf4af40b..47f0ec26 100644
--- a/StoneIsland/www/js/lib/_router.js
+++ b/StoneIsland/www/js/lib/_router.js
@@ -53,7 +53,7 @@ var SiteRouter = Router.extend({
default_view: function(name){
var fn = function(){
console.log(name)
- if (name.match(".")) {
+ if (name.match(/\./)) {
var n = name.split(".")
console.log(name, n)
app.view = app[n[0]][n[1]]
diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index fd81f199..8e14c193 100644
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -21,7 +21,7 @@ var ProductView = ScrollableView.extend({
this.$color = this.$(".color")
this.$body = this.$(".body")
- app.footer.show("&lt; BACK TO SHOPPING", "ADD TO CART")
+ app.footer.show("ADD TO CART", "&lt; BACK TO SHOPPING")
},
show: function(){
@@ -135,11 +135,14 @@ var ProductView = ScrollableView.extend({
}.bind(this))
},
- ok: function(){
+ save: function(){
+ // add to cart
},
+
cancel: function(){
app.router.go('store')
},
+
share: function(){
},
diff --git a/StoneIsland/www/js/sdk/cart.js b/StoneIsland/www/js/sdk/cart.js
index b10503d8..6de10d18 100644
--- a/StoneIsland/www/js/sdk/cart.js
+++ b/StoneIsland/www/js/sdk/cart.js
@@ -126,7 +126,7 @@ sdk.cart = (function(){
},
data: opt.data,
success: function(data){
- console.log(data)
+ // console.log(data)
opt.success(data)
},
error: opt.error,
@@ -144,7 +144,7 @@ sdk.cart = (function(){
},
data: opt.data,
success: function(data){
- console.log(data)
+ // console.log(data)
opt.success(data)
},
error: opt.error,
diff --git a/StoneIsland/www/js/sdk/payment.js b/StoneIsland/www/js/sdk/payment.js
index 0076fbf8..e73bb5ff 100644
--- a/StoneIsland/www/js/sdk/payment.js
+++ b/StoneIsland/www/js/sdk/payment.js
@@ -11,7 +11,7 @@ sdk.payment = (function(){
},
data: opt.data,
success: function(data){
- console.log(data)
+ // console.log(data)
opt.success(data)
},
error: opt.error,
@@ -61,7 +61,7 @@ sdk.payment = (function(){
},
data: opt.data,
success: function(data){
- console.log(data)
+ // console.log(data)
opt.success(data)
},
error: opt.error,
diff --git a/StoneIsland/www/js/sdk/shipping.js b/StoneIsland/www/js/sdk/shipping.js
index 95f78d82..71e0267f 100644
--- a/StoneIsland/www/js/sdk/shipping.js
+++ b/StoneIsland/www/js/sdk/shipping.js
@@ -34,7 +34,7 @@ sdk.shipping = (function() {
"Type": opt.type,
},
success: function(data){
- console.log(data)
+ // console.log(data)
opt.success(data)
},
error: opt.error,