summaryrefslogtreecommitdiff
path: root/StoneIsland/platforms/ios/www
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/platforms/ios/www')
-rw-r--r--StoneIsland/platforms/ios/www/cordova.js4
-rw-r--r--StoneIsland/platforms/ios/www/cordova_plugins.js114
-rwxr-xr-xStoneIsland/platforms/ios/www/css/products.css7
-rw-r--r--StoneIsland/platforms/ios/www/img/angle-down.pngbin0 -> 5562 bytes
-rwxr-xr-xStoneIsland/platforms/ios/www/index.html1
-rwxr-xr-xStoneIsland/platforms/ios/www/js/index.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js8
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/CollectionView.js9
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/Selector.js2
-rw-r--r--StoneIsland/platforms/ios/www/js/lib/products/filters/DepartmentFilter.js31
10 files changed, 109 insertions, 69 deletions
diff --git a/StoneIsland/platforms/ios/www/cordova.js b/StoneIsland/platforms/ios/www/cordova.js
index 9dce1f9f..29be9099 100644
--- a/StoneIsland/platforms/ios/www/cordova.js
+++ b/StoneIsland/platforms/ios/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: ios
-// f28234fbc27c578b9a335f1dabfa2d1b96bfc03d
+// a3732cb71d9b1dd590338e8cf44196f366d46da3
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '4.3.0';
+var PLATFORM_VERSION_BUILD_LABEL = '4.3.1';
// file: src/scripts/require.js
/*jshint -W079 */
diff --git a/StoneIsland/platforms/ios/www/cordova_plugins.js b/StoneIsland/platforms/ios/www/cordova_plugins.js
index b4bf1fc8..82c45dce 100644
--- a/StoneIsland/platforms/ios/www/cordova_plugins.js
+++ b/StoneIsland/platforms/ios/www/cordova_plugins.js
@@ -9,31 +9,6 @@ module.exports = [
]
},
{
- "id": "cordova-plugin-inappbrowser.inappbrowser",
- "file": "plugins/cordova-plugin-inappbrowser/www/inappbrowser.js",
- "pluginId": "cordova-plugin-inappbrowser",
- "clobbers": [
- "cordova.InAppBrowser.open",
- "window.open"
- ]
- },
- {
- "id": "cordova-plugin-x-socialsharing.SocialSharing",
- "file": "plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js",
- "pluginId": "cordova-plugin-x-socialsharing",
- "clobbers": [
- "window.plugins.socialsharing"
- ]
- },
- {
- "id": "cordova-plugin-customurlscheme.LaunchMyApp",
- "file": "plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js",
- "pluginId": "cordova-plugin-customurlscheme",
- "clobbers": [
- "window.plugins.launchmyapp"
- ]
- },
- {
"id": "cordova-plugin-console.console",
"file": "plugins/cordova-plugin-console/www/console-via-logger.js",
"pluginId": "cordova-plugin-console",
@@ -50,28 +25,19 @@ module.exports = [
]
},
{
- "id": "cordova-plugin-device.device",
- "file": "plugins/cordova-plugin-device/www/device.js",
- "pluginId": "cordova-plugin-device",
- "clobbers": [
- "device"
- ]
- },
- {
- "id": "cordova-plugin-network-information.network",
- "file": "plugins/cordova-plugin-network-information/www/network.js",
- "pluginId": "cordova-plugin-network-information",
+ "id": "cordova-plugin-customurlscheme.LaunchMyApp",
+ "file": "plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js",
+ "pluginId": "cordova-plugin-customurlscheme",
"clobbers": [
- "navigator.connection",
- "navigator.network.connection"
+ "window.plugins.launchmyapp"
]
},
{
- "id": "cordova-plugin-network-information.Connection",
- "file": "plugins/cordova-plugin-network-information/www/Connection.js",
- "pluginId": "cordova-plugin-network-information",
+ "id": "cordova-plugin-device.device",
+ "file": "plugins/cordova-plugin-device/www/device.js",
+ "pluginId": "cordova-plugin-device",
"clobbers": [
- "Connection"
+ "device"
]
},
{
@@ -83,14 +49,6 @@ module.exports = [
]
},
{
- "id": "cordova-plugin-splashscreen.SplashScreen",
- "file": "plugins/cordova-plugin-splashscreen/www/splashscreen.js",
- "pluginId": "cordova-plugin-splashscreen",
- "clobbers": [
- "navigator.splashscreen"
- ]
- },
- {
"id": "cordova-plugin-geolocation.Coordinates",
"file": "plugins/cordova-plugin-geolocation/www/Coordinates.js",
"pluginId": "cordova-plugin-geolocation",
@@ -123,6 +81,48 @@ module.exports = [
]
},
{
+ "id": "cordova-plugin-inappbrowser.inappbrowser",
+ "file": "plugins/cordova-plugin-inappbrowser/www/inappbrowser.js",
+ "pluginId": "cordova-plugin-inappbrowser",
+ "clobbers": [
+ "cordova.InAppBrowser.open",
+ "window.open"
+ ]
+ },
+ {
+ "id": "cordova-plugin-network-information.network",
+ "file": "plugins/cordova-plugin-network-information/www/network.js",
+ "pluginId": "cordova-plugin-network-information",
+ "clobbers": [
+ "navigator.connection",
+ "navigator.network.connection"
+ ]
+ },
+ {
+ "id": "cordova-plugin-network-information.Connection",
+ "file": "plugins/cordova-plugin-network-information/www/Connection.js",
+ "pluginId": "cordova-plugin-network-information",
+ "clobbers": [
+ "Connection"
+ ]
+ },
+ {
+ "id": "cordova-plugin-splashscreen.SplashScreen",
+ "file": "plugins/cordova-plugin-splashscreen/www/splashscreen.js",
+ "pluginId": "cordova-plugin-splashscreen",
+ "clobbers": [
+ "navigator.splashscreen"
+ ]
+ },
+ {
+ "id": "cordova-plugin-x-socialsharing.SocialSharing",
+ "file": "plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js",
+ "pluginId": "cordova-plugin-x-socialsharing",
+ "clobbers": [
+ "window.plugins.socialsharing"
+ ]
+ },
+ {
"id": "ionic-plugin-keyboard.keyboard",
"file": "plugins/ionic-plugin-keyboard/www/ios/keyboard.js",
"pluginId": "ionic-plugin-keyboard",
@@ -136,17 +136,17 @@ module.exports.metadata =
// TOP OF METADATA
{
"com.parse.cordova.core.pushplugin": "0.1.0",
- "cordova-plugin-inappbrowser": "1.5.0",
- "cordova-plugin-x-socialsharing": "5.1.3",
- "cordova-plugin-customurlscheme": "4.2.0",
- "cordova-plugin-whitelist": "1.3.0",
+ "cordova-plugin-compat": "1.1.0",
"cordova-plugin-console": "1.0.4",
+ "cordova-plugin-customurlscheme": "4.2.0",
"cordova-plugin-device": "1.1.3",
- "cordova-plugin-network-information": "1.3.0",
"cordova-plugin-dialogs": "1.3.0",
- "cordova-plugin-splashscreen": "4.0.0",
- "cordova-plugin-compat": "1.1.0",
"cordova-plugin-geolocation": "2.4.0",
+ "cordova-plugin-inappbrowser": "1.5.0",
+ "cordova-plugin-network-information": "1.3.0",
+ "cordova-plugin-splashscreen": "4.0.0",
+ "cordova-plugin-whitelist": "1.3.0",
+ "cordova-plugin-x-socialsharing": "5.1.3",
"ionic-plugin-keyboard": "2.2.1"
};
// BOTTOM OF METADATA
diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css
index e067e05a..bdfed42a 100755
--- a/StoneIsland/platforms/ios/www/css/products.css
+++ b/StoneIsland/platforms/ios/www/css/products.css
@@ -24,7 +24,6 @@
height: 126vw;
}
-
.product #product { display: block }
#product {
display: none;
@@ -224,7 +223,11 @@ padding-bottom:45px;
}
#collection h1 {
-background:white
+ background-color: white;
+ background-image: url(../img/angle-down.png);
+ background-size: contain;
+ background-position: top right;
+ background-repeat: no-repeat;
}
#selector {
diff --git a/StoneIsland/platforms/ios/www/img/angle-down.png b/StoneIsland/platforms/ios/www/img/angle-down.png
new file mode 100644
index 00000000..e0b3b00f
--- /dev/null
+++ b/StoneIsland/platforms/ios/www/img/angle-down.png
Binary files differ
diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html
index 768e3140..52ff747a 100755
--- a/StoneIsland/platforms/ios/www/index.html
+++ b/StoneIsland/platforms/ios/www/index.html
@@ -1136,6 +1136,7 @@
<script src="js/lib/products/CollectionView.js"></script>
<script src="js/lib/products/filters/CategoryFilter.js"></script>
+<script src="js/lib/products/filters/DepartmentFilter.js"></script>
<script src="js/lib/products/ClosedStoreView.js"></script>
<script src="js/lib/products/ProductView.js"></script>
<script src="js/lib/products/GalleryView.js"></script>
diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js
index 6bea75d0..76a8af05 100755
--- a/StoneIsland/platforms/ios/www/js/index.js
+++ b/StoneIsland/platforms/ios/www/js/index.js
@@ -8,7 +8,7 @@ var app = (function(){
app.bind()
app.build()
-
+
app.iscroll_options = {
mouseWheel: true,
scrollbars: true,
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
index b7c80520..5ee7f641 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
@@ -31,7 +31,7 @@ var BlogView = View.extend({
this.loaded = true
this.data = data = typeof data == "string" ? JSON.parse(data) : data
- switch (data.store[0].StoreStatus) {
+ switch (data.store[0].DepartmentStoreStatus) {
case "open":
app.closed.storeIsClosed = false
break
@@ -46,9 +46,9 @@ var BlogView = View.extend({
app.closed.populate(data.store[0].ClosedStoreImages)
}
else {
- app.gallery_id = data.store[0].CollectionId
- app.department_id = data.store[0].DepartmentId
- app.collection.setCollectionName( data.store[0].collection )
+ app.departments = data.store[0].Departments
+ app.department_id = data.store[0].Departments[0].uri
+ app.collection.setCollectionName( data.store[0].Departments[0].text )
app.collection.loaded = false
app.collection.fetch()
}
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
index b9a7755f..671d36b3 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
@@ -14,6 +14,7 @@ var CollectionView = ScrollableView.extend({
"mousedown .item": "touchstart",
"mousemove .item": "touchmove",
"mouseup .item": "touchend",
+ "touchstart h1": "showDepartmentSelector",
},
initialize: function(){
@@ -21,7 +22,7 @@ var CollectionView = ScrollableView.extend({
this.$content = this.$(".content")
this.$loader = this.$(".loader")
this.scroller = new IScroll('#collection', app.iscroll_options)
- this.filterView = new CategoryFilter ({ parent: this })
+ this.filterView = new DepartmentFilter ({ parent: this })
},
show: function(){
@@ -85,7 +86,7 @@ var CollectionView = ScrollableView.extend({
}
console.log(">>>>>>>> YES ")
if (! this.loaded) {
- console.log("populate 3")
+ console.log("populate 3", data.SearchResponseFull.Results.Items.length)
this.loaded = true
this.$loader.hide()
this.$content.empty()
@@ -140,6 +141,10 @@ var CollectionView = ScrollableView.extend({
this.$title.html(this.collectionName)
},
+ showDepartmentSelector: function(){
+ this.filterView.filter()
+ },
+
firstTouch: { x: 0, y: 0, id: "" },
lastTouch: { x: 0, y: 0, id: "" },
touchstart: function(e){
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
index 6db33b68..89130021 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
@@ -5,7 +5,7 @@ var Selector = View.extend({
events: {
"click .close": "hide",
- "click .options div": "pick",
+ "touchstart .options div": "pick",
},
initialize: function(){
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/filters/DepartmentFilter.js b/StoneIsland/platforms/ios/www/js/lib/products/filters/DepartmentFilter.js
new file mode 100644
index 00000000..cc0d925e
--- /dev/null
+++ b/StoneIsland/platforms/ios/www/js/lib/products/filters/DepartmentFilter.js
@@ -0,0 +1,31 @@
+var DepartmentFilter = View.extend({
+
+ initialize: function(opt){
+ this.parent = opt.parent
+ },
+
+ filter: function(){
+ var deps = app.departments.map(function(dep){
+ console.log(dep)
+ return {
+ id: dep.uri,
+ label: dep.text,
+ }
+ })
+ app.selector.select("wide", deps, this.pick.bind(this))
+ },
+
+ last_choice: null,
+
+ pick: function(choice){
+ this.parent.$content.empty()
+ this.last_choice = choice
+ app.department_id = choice.id
+ app.collection.loaded = false
+ app.collection.fetch()
+ app.footer.hide()
+ app.collection.setCollectionName(choice.label)
+ this.parent.deferScrollToTop()
+ },
+
+})
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-20 22:33:58 +0000