[Picfinity-commit] SF.net SVN: picfinity: [6] .themes/ajax

[<esp...@us...>]

Revision: 6
          http://picfinity.svn.sourceforge.net/picfinity/?rev=6&view=rev
Author:   espadav8
Date:     2007-07-18 10:12:03 -0700 (Wed, 18 Jul 2007)

Log Message:
-----------
Remove unneeded functions from the javascript
Remove the init function and instead add the onclick into the xsl template
Remove all the code for creating the old 'stack' trail

Modified Paths:
--------------
    .themes/ajax/ajax.js
    .themes/ajax/ajax.xsl

Modified: .themes/ajax/ajax.js
===================================================================
--- .themes/ajax/ajax.js	2007-07-18 12:31:15 UTC (rev 5)
+++ .themes/ajax/ajax.js	2007-07-18 17:12:03 UTC (rev 6)
@@ -1,4 +1,3 @@
-addEvent(window, 'load', init, false);
 addEvent(window, 'load', importLayout, false);
 
 var xmlDoc;
@@ -21,24 +20,6 @@
 	xmlDoc.load("gallery.xml");
 }
 
-function getElementsByClassName(className, tag)
-{
-	var testClass = new RegExp("(^|\\s)" + className + "(\\s|$)");
-	var tag = tag || "*";
-	var elm = document;
-	var elements = (tag == "*" && elm.all)? elm.all : elm.getElementsByTagName(tag);
-	var returnElements = [];
-	var current;
-	var length = elements.length;
-	for(var i=0; i<length; i++){
-		current = elements[i];
-		if(testClass.test(current.className)){
-			returnElements.push(current);
-		}
-	}
-	return returnElements;
-}
-
 function addEvent(elm, evType, fn, useCapture)
 {
 	if (elm.addEventListener) {
@@ -77,13 +58,6 @@
     return result;
 }
 
-function getSiblingNodes(element)
-{
-	var parentNode = getLayoutNode(element).parentNode;
-	
-	return parentNode.childNodes;
-}
-
 function getNodePath(element, nodePath)
 {
 	nodePath = (nodePath == undefined) ? '' : nodePath;
@@ -120,22 +94,6 @@
 	return null;
 }
 
-function init()
-{
-	var folders = getElementsByClassName("folder", "div");
-	
-	for (var i = 0; i < folders.length; i++)
-	{
-		if (folders[i].getAttribute("class").toString().match("empty"))
-		{
-		}
-		else
-		{
-			folders[i].setAttribute("onclick", "openFolder(this)");
-		}
-	}
-}
-
 function openFolder(element)
 {
 	var nodePath = getNodePath(getLayoutNode(element), '');
@@ -148,9 +106,6 @@
 	var backButton = document.createElement("div")
 	backButton.setAttribute("id", "backbutton");
 	
-	var stackDiv = document.createElement("div");
-	stackDiv.setAttribute("class", "stack");
-	
 	var selectedDiv = document.createElement("div");
 	selectedDiv.setAttribute("id", "selectedalbum");
 	
@@ -162,15 +117,8 @@
 		if (mainFolders[i].nodeName == "folder")
 		{
 			// if it's not the folder we're acting on
-			if(mainFolders[i].getAttribute("id") != element.id)
+			if(mainFolders[i].getAttribute("id") == element.getAttribute("id"))
 			{
-				// var stackFolder = createStackFolderContainer(mainFolders[i]);
-				// stackDiv.appendChild(stackFolder);
-			}
-			
-			// it is the folder we're acting on
-			else
-			{
 				breadcrumbDiv = createBreadcrumbTrail(mainFolders[i]);
 				
 				var selectedAlbumFolders = getChildNodesByTagName(mainFolders[i], "folder");
@@ -198,28 +146,7 @@
 	}
 	
 	newAlbumsDiv.appendChild(selectedDiv);
-	newAlbumsDiv.appendChild(stackDiv);
 	
-	// if we're not in the root node then create another stack with the main folders
-	if (nodePath != "./")
-	{
-		var rootStackDiv = document.createElement("div");
-		rootStackDiv.setAttribute("class", "stack");
-	
-		var rootNodeFolders = xmlDoc.documentElement.childNodes;
-		
-		for (var i = 0; i < rootNodeFolders.length; i++)
-		{
-			if (rootNodeFolders[i].nodeName == "folder")
-			{
-				var stackFolder = createStackFolderContainer(rootNodeFolders[i]);
-				rootStackDiv.appendChild(stackFolder);
-			}
-		}
-		
-		// newAlbumsDiv.appendChild(rootStackDiv);
-	}
-	
 	document.getElementById("albums").parentNode.replaceChild(newAlbumsDiv, document.getElementById("albums"));
 }
 
@@ -250,61 +177,6 @@
 	}
 }
 
-function createStackFolderContainer(folderNode)
-{
-	var stackFolder = document.createElement("div");
-	stackFolder.setAttribute("id", folderNode.getAttribute("id"));
-	
-	// var imageSpan = document.createElement("span")
-	// imageSpan.setAttribute("class", "image");
-	
-	// var folderImage = document.createElement("img");
-	// folderImage.setAttribute("src", checkFolderContents(folderNode, getNodePath(folderNode, '')));
-	// imageSpan.appendChild(folderImage);
-	
-	var textSpan = document.createElement("span");
-	textSpan.setAttribute("class", "name");
-	textSpan.appendChild(document.createTextNode(folderNode.getAttribute("name")));
-	
-	
-	// stackFolder.appendChild(imageSpan);
-	
-	// this has to be done here otherwise the nodes would be added in the wrong order
-	if (folderNode.hasChildNodes())
-	{
-		stackFolder.setAttribute("class", "folder");
-		stackFolder.setAttribute("onclick", "openFolder(this)");
-		
-		// create a span for the folder icon
-		var iconSpan = document.createElement("span");
-		iconSpan.setAttribute("class", "icon");
-		
-		// create the icon image
-		var iconImage = document.createElement("img");					
-		iconImage.setAttribute("src", ".themes/ajax/foldericon.png");
-		iconSpan.appendChild(iconImage);
-		stackFolder.appendChild(iconSpan);
-	}
-	else
-	{
-		stackFolder.setAttribute("class", "folder empty");
-		
-		// create a span for the folder icon
-		var iconSpan = document.createElement("span");
-		iconSpan.setAttribute("class", "icon");
-		
-		// create the icon image
-		var iconImage = document.createElement("img");					
-		iconImage.setAttribute("src", ".themes/ajax/emptyicon.png");
-		iconSpan.appendChild(iconImage);
-		stackFolder.appendChild(iconSpan);
-	}
-	
-	stackFolder.appendChild(textSpan);
-	
-	return stackFolder;
-}
-
 function createImageThumbnailContainer(imageNode, optClass)
 {
 	var nodePath = getNodePath(getLayoutNode(imageNode), '');
@@ -458,7 +330,6 @@
 	{
 		document.getElementById("albums").parentNode.insertBefore(breadcrumbTrailDiv, document.getElementById("albums"));
 	}
-	
 }
 
 function createBreadcrumbMenu(path, currentFolder)
@@ -600,24 +471,19 @@
 
 function showImage(element)
 {
-	var siblingNodes = getSiblingNodes(element);
+	var siblingNodes = getLayoutNode(element).parentNode.childNodes;
 	var nodePath = getNodePath(getLayoutNode(element), '');
 	
 	var selectedDiv = document.createElement("div");
 	selectedDiv.setAttribute("id", "selectedalbum");
 	
-	// var selectedImage = document.createElement("div");
-	// selectedImage.setAttribute("id", "selectimage");
-	// selectedDiv.appendChild(selectedImage);
-	
 	for (var i = 0; i < siblingNodes.length; i++)
 	{
 		if (siblingNodes[i].nodeName == "image")
 		{
-			if (siblingNodes[i].getAttribute("id") == element.id)
+			if (siblingNodes[i].getAttribute("id") == element.getAttribute("id"))
 			{
 				var expandedImage = createExpandedImage(siblingNodes[i]);
-				//selectedImage.appendChild(expandedImage);
 				
 				if (document.getElementById("expandedimage"))
 				{

Modified: .themes/ajax/ajax.xsl
===================================================================
--- .themes/ajax/ajax.xsl	2007-07-18 12:31:15 UTC (rev 5)
+++ .themes/ajax/ajax.xsl	2007-07-18 17:12:03 UTC (rev 6)
@@ -54,6 +54,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:attribute name="class">folder</xsl:attribute>
+					<xsl:attribute name="onclick">openFolder(this)</xsl:attribute>
 				</xsl:otherwise>
 			</xsl:choose>
 			<span class="image">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.