From 2e615e8c464e0abfcc7e79375d546bd4703abb24 Mon Sep 17 00:00:00 2001
From: "luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f"
 <luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f>
Date: Sun, 27 Jun 2010 18:31:54 +0000
Subject: updated slideshow with better controls, option for non-playing
 permalinks

---
 media/js/slideshow.js      | 47 +++++++++++++++++++++++++++++-----------------
 media/js/slideshow.pack.js |  2 +-
 2 files changed, 31 insertions(+), 18 deletions(-)

(limited to 'media/js')

diff --git a/media/js/slideshow.js b/media/js/slideshow.js
index 05f00a7..227efdd 100644
--- a/media/js/slideshow.js
+++ b/media/js/slideshow.js
@@ -73,6 +73,23 @@ function remove_exif() {
 
 //
 $(document).ready(function(){ 
+    
+    
+    //Add navigation
+    $('#breadcrumbs').after('<div id="slideshow-controls"><ul><li><a id="prev" title="you can also use the arrow keys to navigate" href="#"> &larr; Older</a></li><li><a id="play" title="Pause Slideshow" href="#">▐▐</a></li><li><a id="next" title="you can also use the arrow keys to navigate" href="#">Newer &rarr;</a></li></ul></div>');
+    //activate pause button
+    $('#play').toggle(function() {
+        $('#slides').cycle('pause');
+        $(this).html('▶');
+        $(this).attr('title','Play slideshow');
+    }, function() {
+        $('#slides').cycle('resume', true);
+        $(this).html('▐▐');
+        $(this).attr('title','Pause slideshow');
+    });
+
+
+
     //set up click events for map button
     $('.map-link').click( function() {
         if ($("#exif-container").is(":visible")){
@@ -105,28 +122,36 @@ $(document).ready(function(){
     $('#slides').append('<div class="slidenav"><a id="prev">< Prev&nbsp;</a><a id="next">&nbsp;Next ></a></div>');
     $('.slidenav').css("display","none");
     
+    var is_permalink = false;
     //find out if we should display a specific slide
     var index = 0, hash = window.location.hash;
     if (hash) {
         index = /\d+/.exec(hash)[0];
         index = (parseInt(index) || 1) - 1; // slides are zero-based
+        //if this is a permalink, then don't autoplay:
+        is_permalink = true;
     }
     // initialize the cycle slideshow
     $('#slides .bigimg').wrapAll('<div class="bigimgs">').parents('#slides').append('<ul class="menu" id="feature_gallery_pager">').cycle({ 
         fx: 'fade',
         startingSlide: index,
-        prev: '#prev',
-        next: '#next',
+        prev: $(this).find('#prev'),
+        next: $(this).find('#next'),
         before:  onBefore,
         after: onAfter,
         slideExpr: '.bigimg', 
         pager:      '#feature_gallery_pager', 
         pagerAnchorBuilder: function(idx, slide) { 
             return '<li><a href="#"><img src="'+slide.id+'" class="thumb"><span></span></a></li>';  
-        },
-        pause: 1
+        }
     });
     
+    //if this is a permalink, then pause:
+    if(is_permalink == true) {
+        $('#slides').cycle('pause');
+        $('#play').html('▶');
+        $('#play').attr('title','Play slideshow');
+    }
     //callback to delete map and camera info windows if they exist
     function onBefore() { 
         $('#map-container').remove(); 
@@ -163,15 +188,6 @@ $(document).ready(function(){
         });
     });
     
-    /* hover buttons, currently not used
-    $("#slideshow").hover(function() {
-        $("ul#nav").fadeIn();
-    },
-        function() {
-        $("ul#nav").fadeOut();
-    });
-    */
-    
     //enable keyboard shortcuts:
     $(document.documentElement).keyup(function(event) {
         var direction = null;
@@ -187,10 +203,7 @@ $(document).ready(function(){
         }
     });
     
-    //enable slideshow instructions
-    $('#instructions').css("visibility","visible")
-
-    
+     
   
 });
 
diff --git a/media/js/slideshow.pack.js b/media/js/slideshow.pack.js
index 633ca76..9470eba 100644
--- a/media/js/slideshow.pack.js
+++ b/media/js/slideshow.pack.js
@@ -1 +1 @@
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('3 T(D){9 4;1c=B(D.L(\',\')[0]);1o=B(D.L(\',\')[1]);j=D.L(\',\')[2];9 G;7(G==1r){1m()}v{18()}3 18(){9 s=y r.u.1C(1c,1o);9 1f={1u:6,1B:s,1A:r.u.1t.1x};4=y r.u.1v(H.1s("4-W"),1f);9 1n=y r.u.19({R:s,4:4,j:j});G=1r}3 1m(){9 1n=y r.u.19({R:s,4:4,j:j});4.1y(s)}}3 11(e){$(e).h().h().h().m(\'<l b="4-5">\');$(\'#4-5\').m(\'<l b="4-W">\');$(\'#4-5\').g({15:3(8,16){i B($(e).h().h().g("1a"))-2}});T(e.j)}3 N(){$(\'#4-5\').C()}3 Y(e,b){$(e).J().S(2).m(\'<l b="c-5">\');$(e).J().S(2).1w(\'.1D\').1z().1E(\'#c-5\').g(\'X\',\'1F\');$(\'#c-5\').g({15:3(8,16){i B($(e).h().h().g("1a"))-14}})}3 K(){$("#c-5").C()}$(H).29(3(){$(\'.4-Z\').F(3(){7($("#c-5").x(":q")){K()}7($(\'#4-5\').x(":q")){N()}v{11(I)}i O});$(\'.c-Z\').F(3(){7($(\'#4-5\').x(":q")){N()}7($(\'#c-5\').x(":q")){K()}v{Y(I)}i O});$(\'#f\').m(\'<l A="13"><a b="n">< 2e&12;</a><a b="k">&12;28 ></a></l>\');$(\'.13\').g("X","21");9 8=0,t=1j.1i.t;7(t){8=/\\d+/.25(t)[0];8=(27(8)||1)-1}$(\'#f .V\').26(\'<l A="24">\').J(\'#f\').m(\'<23 A="22" b="M">\').2f({2d:\'2c\',2b:8,1G:1,n:\'#n\',k:\'#k\',2a:1l,20:1e,1Y:\'.V\',1M:\'#M\',1Z:3(1N,1p){i\'<1d><a 1O="#"><1L 1K="\'+1p.b+\'" A="1H"><1k></1k></a></1d>\'}});3 1l(){$(\'#4-5\').C();$(\'#c-5\').C()}3 1e(1I,k,o){1j.1i.t=\'z\'+(o.w+1);7(o.w%10==0){7(o.w!=0){$(\'#f\').1h(\'z-P\',[o.w+1])}v{$(\'#f\').1h(\'z-P\',[1])}}}3 1q(17){$(\'#f\').1J(\'z-P\',3(E,1g){17.1b(1g);i O})};$(3(){$(\'#M\').1P({1b:10,1Q:1q})});$(H.1W).1X(3(E){9 p=Q;7(E.U==1V){p=\'n\'}v 7(E.U==1U){p=\'k\'}7(p!=Q){$(\'#f\').1R(3(8){$(\'#n,#k\',I)[p]().F()})}});$(\'#1S\').g("1T","q")});',62,140,'|||function|map|container||if|index|var||id|exif||obj|slides|css|parent|return|title|next|div|append|prev|opts|direction|visible|google|centerCoord|hash|maps|else|currSlide|is|new|image|class|parseFloat|remove|latlontitle|event|click|mapitinit|document|this|parents|remove_exif|split|feature_gallery_pager|remove_map|false|loaded|null|position|eq|mapit|keyCode|bigimg|wrapper|display|get_exif|link||create_map|nbsp|slidenav||bottom|value|carousel|mapInit|Marker|height|scroll|lat|li|onAfter|mapOptions|num|trigger|location|window|span|onBefore|panto|marker|lon|slide|initCallbackFunction|true|getElementById|MapTypeId|zoom|Map|children|TERRAIN|panTo|clone|mapTypeId|center|LatLng|meta|appendTo|block|pause|thumb|curr|bind|src|img|pager|idx|href|jcarousel|initCallback|each|instructions|visibility|39|37|documentElement|keyup|slideExpr|pagerAnchorBuilder|after|none|menu|ul|bigimgs|exec|wrapAll|parseInt|Next|ready|before|startingSlide|fade|fx|Prev|cycle'.split('|'),0,{}))
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('3 15(B){1l=A(B.K(\',\')[0]);1r=A(B.K(\',\')[1]);l=B.K(\',\')[2];u=w g.k.1t(1l,1r);h O;7(O==C){U()}v{1i()}3 1i(){h 1e={1v:6,1u:u,1x:C,1L:C,1y:g.k.1J.1K,1F:{1A:g.k.1z.1B}};4=w g.k.1C(M.1D("4-13"),1e);h S=w g.k.T({18:u,4:4,l:l});O=C}3 U(){h S=w g.k.T({18:u,4:4,l:l});4.1E(u)}}3 X(8){$(8).f().f().f().s(\'<i b="4-5">\');$(\'#4-5\').s(\'<i b="4-13">\');$(\'#4-5\').o({Y:3(c,1q){j A($(8).f().f().Z())-2}});15(8.l)}3 P(){$(\'#4-5\').z()}3 11(8,b){$(8).G().16(2).s(\'<i b="9-5">\');$(8).G().16(2).1I(\'.1G\').1H().1s(\'#9-5\').o(\'17\',\'1w\');$(\'#9-5\').o({Y:3(c,1q){j A($(8).f().f().Z())-14}})}3 H(){$("#9-5").z()}$(M).2f(3(){$(\'.4-W\').J(3(){7($("#9-5").F(":p")){H()}7($(\'#4-5\').F(":p")){P()}v{X(I)}j N});$(\'.9-W\').J(3(){7($(\'#4-5\').F(":p")){P()}7($(\'#9-5\').F(":p")){H()}v{11(I)}j N});$(\'#e\').s(\'<i E="V"><a b="n">< 2j&12;</a><a b="m">&12;28 ></a></i>\');$(\'.V\').o("17","2a");h c=0,q=1b.1a.q;7(q){c=/\\d+/.2b(q)[0];c=(2c(c)||1)-1}$(\'#e .R\').29(\'<i E="26">\').G(\'#e\').s(\'<2d E="2e" b="Q">\').2k({1M:\'2l\',2i:c,n:\'#n\',m:\'#m\',2h:19,2g:1j,27:\'.R\',24:\'#Q\',1S:3(25,1m){j\'<1o><a 1T="#"><1U 1R="\'+1m.b+\'" E="1Q"><1k></1k></a></1o>\'},1N:1});3 19(){$(\'#4-5\').z();$(\'#9-5\').z()}3 1j(1O,m,r){7(r.y%10==0){7(r.y!=0){$(\'#e\').1c(\'x-L\',[r.y+1])}v{$(\'#e\').1c(\'x-L\',[1])}}1b.1a.q=\'x\'+(r.y+1)}3 1d(1h){$(\'#e\').1P(\'x-L\',3(D,1g){1h.1f(1g);j N})};$(3(){$(\'#Q\').1V({1f:10,1W:1d})});$(M.22).23(3(D){h t=1n;7(D.1p==21){t=\'n\'}v 7(D.1p==20){t=\'m\'}7(t!=1n){$(\'#e\').1X(3(c){$(\'#n,#m\',I)[t]().J()})}});$(\'#1Y\').o("1Z","p")});',62,146,'|||function|map|container||if|obj|exif||id|index||slides|parent|google|var|div|return|maps|title|next|prev|css|visible|hash|opts|append|direction|centerCoord|else|new|image|currSlide|remove|parseFloat|latlontitle|true|event|class|is|parents|remove_exif|this|click|split|loaded|document|false|mapitinit|remove_map|feature_gallery_pager|bigimg|marker|Marker|mapPanTo|slidenav|link|create_map|bottom|height||get_exif|nbsp|wrapper||mapit|eq|display|position|onBefore|location|window|trigger|initCallbackFunction|mapOptions|scroll|num|carousel|mapInit|onAfter|span|lat|slide|null|li|keyCode|value|lon|appendTo|LatLng|center|zoom|block|disableDefaultUI|mapTypeId|NavigationControlStyle|style|SMALL|Map|getElementById|panTo|navigationControlOptions|meta|clone|children|MapTypeId|TERRAIN|navigationControl|fx|pause|curr|bind|thumb|src|pagerAnchorBuilder|href|img|jcarousel|initCallback|each|instructions|visibility|39|37|documentElement|keyup|pager|idx|bigimgs|slideExpr|Next|wrapAll|none|exec|parseInt|ul|menu|ready|after|before|startingSlide|Prev|cycle|fade'.split('|'),0,{}))
\ No newline at end of file
-- 
cgit v1.2.3