summaryrefslogtreecommitdiff
path: root/StoneIsland/platforms/ios/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/platforms/ios/www/js')
-rwxr-xr-xStoneIsland/platforms/ios/www/js/index.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/account/OrdersView.js4
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/auth/LoginView.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/auth/SignupView.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/HubView.js10
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js4
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/cart/CartShipping.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/cart/CartView.js6
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/ClosedStoreView.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/CollectionView.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/ProductView.js12
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/Selector.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/view/Serializable.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/view/View.js6
-rwxr-xr-xStoneIsland/platforms/ios/www/js/sdk/product.js10
18 files changed, 42 insertions, 32 deletions
diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js
index 0b3531dd..468c0d7e 100755
--- a/StoneIsland/platforms/ios/www/js/index.js
+++ b/StoneIsland/platforms/ios/www/js/index.js
@@ -3,7 +3,7 @@ var app = (function(){
app.init = function(){
- sdk.init({ env: "production" })
+ sdk.init({ env: "test" })
app.bind()
app.build()
diff --git a/StoneIsland/platforms/ios/www/js/lib/account/OrdersView.js b/StoneIsland/platforms/ios/www/js/lib/account/OrdersView.js
index e51676e0..a1b83767 100755
--- a/StoneIsland/platforms/ios/www/js/lib/account/OrdersView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/account/OrdersView.js
@@ -8,8 +8,8 @@ var OrdersView = ScrollableView.extend({
item_template: $("#orders .item_template").html(),
events: {
- "touchstart .back": "back",
- "touchstart .item": "load_single",
+ "click .back": "back",
+ "click .item": "load_single",
},
initialize: function(){
diff --git a/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js
index f96d1e44..1f7438cc 100755
--- a/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js
@@ -5,7 +5,7 @@ var LoginView = FormView.extend({
action: sdk.account.login,
events: {
- "touchstart .newuser": "new_user",
+ "click .newuser": "new_user",
"submit form": "save",
},
diff --git a/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js
index 19c07c32..afbb8877 100755
--- a/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js
@@ -20,7 +20,7 @@ var SignupView = FormView.extend({
*/
events: {
- "touchstart .privacy-msg": "privacy_link",
+ "click .privacy-msg": "privacy_link",
"submit form": "save",
},
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
index 2802ab9e..254df6d1 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
@@ -5,7 +5,7 @@ var ArchiveView = ScrollableView.extend({
row_template: $("#archive .scroll .template").html(),
events: {
- "touchstart .item": "pick",
+ "click .item": "pick",
"mousedown .row": "mousedown",
"touchstart .row": "touchstart",
"mousemove .row": "mousemove",
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
index b2fb16db..49c05ff6 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
@@ -4,11 +4,11 @@ var HubView = ScrollableView.extend({
template: $("#hub .template").html(),
events: {
- "touchstart .share": "content-share",
- "touchstart .store": "store_link",
- "touchstart .gallery-left": "gallery_left",
- "touchstart .gallery-right": "gallery_right",
- "touchstart .play": "play_video",
+ "click .share": "content-share",
+ "click .store": "store_link",
+ "click .gallery-left": "gallery_left",
+ "click .gallery-right": "gallery_right",
+ "click .play": "play_video",
},
initialize: function(){
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js
index ee7193a6..a10c8351 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js
@@ -6,7 +6,7 @@ var StoryView = ScrollableView.extend({
template: $("#story .template").html(),
events: {
- "touchstart .links li": "pick",
+ "click .links li": "pick",
},
initialize: function(){
diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js
index 7dd4db7c..f3c54d55 100755
--- a/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js
@@ -13,8 +13,8 @@ var CartPayment = FormView.extend({
events: {
"change [name=SameAsShipping]": "toggle_shipping",
- "touchstart .address_dropdown": "toggle_address",
- "touchstart .cc_dropdown": "toggle_cc",
+ "click .address_dropdown": "toggle_address",
+ "click .cc_dropdown": "toggle_cc",
},
initialize: function(opt){
diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartShipping.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartShipping.js
index 33b082c0..f17d42d2 100755
--- a/StoneIsland/platforms/ios/www/js/lib/cart/CartShipping.js
+++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartShipping.js
@@ -10,7 +10,7 @@ var CartShipping = FormView.extend({
template: $("#cart_shipping .template").html(),
events: {
- "touchstart .dropdown-wrapper": "toggle_dropdown",
+ "click .dropdown-wrapper": "toggle_dropdown",
},
initialize: function(opt){
diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
index 51b9cb80..21fc27dc 100755
--- a/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartSummary.js
@@ -5,7 +5,7 @@ var CartSummary = ScrollableView.extend({
template: $("#cart_summary .template").html(),
events: {
- "touchstart .remove": "remove_item",
+ "click .remove": "remove_item",
},
data: null,
diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartView.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartView.js
index 0e04c025..1b08e418 100755
--- a/StoneIsland/platforms/ios/www/js/lib/cart/CartView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartView.js
@@ -3,9 +3,9 @@ var CartView = View.extend({
el: "#cart",
events: {
- "touchstart .summary_step": "show_summary",
- "touchstart .shipping_step": "show_shipping",
- "touchstart .payment_step": "show_payment",
+ "click .summary_step": "show_summary",
+ "click .shipping_step": "show_shipping",
+ "click .payment_step": "show_payment",
},
initialize: function(){
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ClosedStoreView.js b/StoneIsland/platforms/ios/www/js/lib/products/ClosedStoreView.js
index c42e1828..5f8c1e84 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/ClosedStoreView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/ClosedStoreView.js
@@ -5,7 +5,7 @@ var ClosedStoreView = View.extend({
storeIsClosed: false,
events: {
- "touchstart .website_link": "website_link",
+ "click .website_link": "website_link",
},
delay: 8000,
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
index 7a020798..798920d1 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
@@ -49,7 +49,7 @@ var CollectionView = ScrollableView.extend({
return
}
this.$loader.show()
- sdk.product.collection({
+ sdk.product.all({
gallery_id: app.gallery_id,
success: this.populate.bind(this)
})
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
index 9d518b11..6893f88c 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
@@ -4,12 +4,12 @@ var ProductView = ScrollableView.extend({
el: "#product",
events: {
- "touchstart .fit": "scroll_to_bottom",
- "touchstart .size": "select_size",
- "touchstart .color": "select_color",
- "touchstart .share": "share",
- "touchstart .gallery-left": "gallery_left",
- "touchstart .gallery-right": "gallery_right",
+ "click .fit": "scroll_to_bottom",
+ "click .size": "select_size",
+ "click .color": "select_color",
+ "click .share": "share",
+ "click .gallery-left": "gallery_left",
+ "click .gallery-right": "gallery_right",
},
initialize: function(){
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
index 1b91cf80..69bb1186 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
@@ -4,7 +4,7 @@ var Selector = View.extend({
template: $("#selector .template").html(),
events: {
- "touchstart .close": "hide",
+ "click .close": "hide",
"click .options div": "pick",
},
diff --git a/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js b/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js
index 921dc275..98aa8ce3 100755
--- a/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js
+++ b/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js
@@ -4,7 +4,7 @@ var SerializableView = View.extend({
"change select": "update_select",
"change [type=date]": "update_date",
"focus input": "focus_input",
- "touchstart .date-wrapper": "focus_date",
+ "click .date-wrapper": "focus_date",
"submit form": "save",
},
diff --git a/StoneIsland/platforms/ios/www/js/lib/view/View.js b/StoneIsland/platforms/ios/www/js/lib/view/View.js
index 70d2c7eb..fe145221 100755
--- a/StoneIsland/platforms/ios/www/js/lib/view/View.js
+++ b/StoneIsland/platforms/ios/www/js/lib/view/View.js
@@ -64,9 +64,9 @@ var View = (function($, _){
if (eventName === 'mouseenter' || eventName === 'mouseleave') {
continue
}
- if (eventName === 'click') {
- eventName = 'touchstart'
- }
+ if (is_android && eventName === 'click') {
+ eventName = 'touchstart'
+ }
}
if (selector === '') {
this.$el.on(eventName, method);
diff --git a/StoneIsland/platforms/ios/www/js/sdk/product.js b/StoneIsland/platforms/ios/www/js/sdk/product.js
index 55f1940a..7c12e7d7 100755
--- a/StoneIsland/platforms/ios/www/js/sdk/product.js
+++ b/StoneIsland/platforms/ios/www/js/sdk/product.js
@@ -3,6 +3,16 @@ sdk.product = (function(){
var default_gallery = 31617
+ product.all = function(opt){
+ return $.ajax({
+ method: "GET",
+ url: sdk.path("Search.API/1.2", "search.json"),
+ data: { format: "full", productsPerPage: 100 },
+ success: opt.success,
+ error: opt.error,
+ })
+ }
+
product.collection = function(opt){
return $.ajax({
method: "GET",