From 389f6443e5cee43075406c5dfe1ab3c112cf7209 Mon Sep 17 00:00:00 2001 From: “Ryder <“r@okfoc.us”> Date: Mon, 11 Apr 2016 19:43:50 -0400 Subject: audio --- public/assets/js/lib/ProjectView.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'public/assets/js') diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index a0e0055..c269d38 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -17,6 +17,7 @@ var ProjectView = View.extend({ this.images = this.$images.toArray().map(function(img){ return $(img).data("uri") }) + if (is_mobile) { this.$iframes.remove() this.$videos.remove() @@ -76,6 +77,7 @@ var ProjectView = View.extend({ }, show: function(){ + var audio = this.$("audio") app.header.updatePageNumber( this.page_number ) app.header.updateSlideNumber( 0 ) app.header.updateSlideCount( this.slide_count ) @@ -86,7 +88,9 @@ var ProjectView = View.extend({ app.router.pushState("/") } else { + audio.get(0).play(); app.router.pushState("/project/" + this.project_id) + } this.$images.each(function(){ @@ -120,6 +124,7 @@ var ProjectView = View.extend({ }, hide: function(){ + addClassForPeriod( this.el, "hiding", app.navigation_delay, function(){ this.reset() }.bind(this) ) @@ -140,12 +145,14 @@ var ProjectView = View.extend({ if (is_mobile) return; e.stopPropagation() app.nav.previous() + audio.pause(); }, next: function(e){ if (is_mobile) return; e.stopPropagation() app.nav.next() + audio.pause(); }, }) -- cgit v1.2.3-70-g09d2 From bf3866dafd959c62af32a03981e93f589b5a672f Mon Sep 17 00:00:00 2001 From: “Ryder <“r@okfoc.us”> Date: Tue, 12 Apr 2016 18:38:04 -0400 Subject: no more audio --- db.json | 9 --------- public/assets/js/lib/ProjectView.js | 3 --- 2 files changed, 12 deletions(-) (limited to 'public/assets/js') diff --git a/db.json b/db.json index c842389..3681d5c 100644 --- a/db.json +++ b/db.json @@ -99,15 +99,6 @@ ], "press": [], "mobileTitle": "", - "mobileMedia": [ - { - "uri": "https://ltho.s3.amazonaws.com/portfolio/36074a60-002b-11e6-8919-558e5e9bf555.gif", - "caption": "background-size:contain; background-position:center;", - "type": "image" - } - ], - "press": [], - "mobileTitle": "", "mobileMedia": [], "linkText": "View in App Store", "whiteCursor": false, diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 30c70ac..66bb3b6 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -88,7 +88,6 @@ var ProjectView = View.extend({ app.router.pushState("/") } else { - audio.get(0).play(); app.router.pushState("/project/" + this.project_id) } @@ -145,14 +144,12 @@ var ProjectView = View.extend({ if (is_mobile) return; e.stopPropagation() app.nav.previous() - audio.pause(); }, next: function(e){ if (is_mobile) return; e.stopPropagation() app.nav.next() - audio.pause(); }, }) -- cgit v1.2.3-70-g09d2