Merge branch 'dev' into live

[dylansserver.git] / includes / tabs.js

diff --git a/includes/tabs.js b/includes/tabs.js
index 9107b0c..346b76b 100644 (file)
--- a/includes/tabs.js
+++ b/includes/tabs.js
@@ -1,14 +1,28 @@
 $(document).ready(function() {
-
-       $(".tabs").hide();
-       $("ul.portfolio li").click(function() {
-               //$("ul.tabs li").removeClass("active");
-               $(this).addClass("active");
+       if(document.location.hash){
+               $(document.location.hash + '_').show();
+       }
+       $("ul#portfolio li a.tab").each(function(){
+               if (document.location.href.indexOf($(this).attr("href")) == 0) {
+                       $("#" + this.attr("href")).show("slide", 600);
+               }
+               $(this).attr("href", "#" + $(this).attr("href"));
+       });
+       var divs = document.getElementsByTagName('div');
+       var i = 0;
+       $("ul#portfolio li a.tab").click(function() {
+               i++;
                $(".exhibit").hide();
-
-               var activeTab = $(this).find("a").attr("href");
-               $(activeTab).fadeIn();
-               return false;
+               var activeTab = $(this).attr("href") + '_';
+               if (i==1)
+                       $(activeTab).show("slide", 600);
+               else
+                       $(activeTab).show("puff", 600);
+               $(activeTab).addClass("active_exhibit");
+       });
+       $('#showdivs').click(function() {
+               for(i=0;i<divs.length;i++){
+                       divs[i].className += (" shownDiv");
+               }
        });
-
 });