summaryrefslogtreecommitdiff
path: root/StoneIsland/platforms/ios/www/js/lib
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-01-28 18:40:45 +0100
committerJules Laplace <jules@okfoc.us>2016-01-28 18:40:45 +0100
commit0b40e1e779719b68e29193d10cb13a18deb46a1e (patch)
tree54dafbad1d5582c68ae65357973ec1351ed20d03 /StoneIsland/platforms/ios/www/js/lib
parente86301effc76072d3dc14b1427d403d1e6c1e5da (diff)
fix video bug and show/hide filter
Diffstat (limited to 'StoneIsland/platforms/ios/www/js/lib')
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/HubView.js1
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/CollectionView.js17
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/Selector.js21
3 files changed, 27 insertions, 12 deletions
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
index 9433b686..e73e49a7 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
@@ -93,6 +93,7 @@ var HubView = ScrollableView.extend({
var play = document.createElement("div")
play.className = "play"
$(".gallery-" + row.id).append(play)
+ $(".gallery-" + row.id).addClass("gallery-video-post")
}
$t.find(".gallery-left").remove()
$t.find(".gallery-right").remove()
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
index a3b32988..033992a6 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
@@ -33,7 +33,12 @@ var CollectionView = ScrollableView.extend({
if (sdk.env !== "test" && app.closed.storeIsClosed) {
return app.closed.show()
}
- app.footer.show("FILTER")
+ if (this.data && this.data.SearchResponseFull.Results.Items.length == 1) {
+ app.footer.hide()
+ }
+ else {
+ app.footer.show("FILTER")
+ }
document.body.className = "collection"
if (this.loaded) {
console.log("collection this loaded")
@@ -83,8 +88,16 @@ var CollectionView = ScrollableView.extend({
this.$loader.hide()
this.$content.empty()
// DefaultCode10
-// data.SearchResponseFull.Results.Items.length = 1
+ data.SearchResponseFull.Results.Items.length = 1
this.$content.toggleClass("single", (data.SearchResponseFull.Results.Items.length == 1))
+
+ if (data.SearchResponseFull.Results.Items.length == 1) {
+ app.footer.hide()
+ }
+ else {
+ app.footer.show("FILTER")
+ }
+
data.SearchResponseFull.Results.Items.forEach(this.append.bind(this))
this.deferScrollToTop()
}
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
index 4e0a5f04..6db33b68 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
@@ -27,22 +27,23 @@ var Selector = View.extend({
this.$el.show()
app.curtain.show("white")
this.visible = true
+ $("#selector").removeClass("selector-outer-wrap")
if ( origin == "wide") {
$("#selector").addClass("selector-full")
}
else {
$("#selector").removeClass("selector-full")
}
- var originXY = $("." + origin).offset()
- var originWidth = $("." + origin).width()
- var selectorHeight = $('#selector').height()
- var originHeight = $("." + origin).height()
- console.log(originXY.left)
- console.log(originXY.top)
- console.log(selectorHeight)
- console.log(origin)
-
- $("#selector").css({"top":(originXY.top - selectorHeight - originHeight + 20),"left":originXY.left})
+ var originXY = $("." + origin).offset()
+ var originWidth = $("." + origin).width()
+ var selectorHeight = $('#selector').height()
+ var originHeight = $("." + origin).height()
+ console.log(selectorHeight)
+ if ((selectorHeight > 250) && (!$("#selector").hasClass("selector-full"))) {
+ $("#selector").addClass("selector-outer-wrap")
+ }
+ var selectorHeight = $('#selector').height()
+ $("#selector").css({"top":(originXY.top - selectorHeight - originHeight + 20),"left":originXY.left})
originXY = null;
originWidth = null;
originHeight = null;