From 8670b248a95263d3f8834dd262813c4f70c2e315 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Tue, 27 Sep 2011 17:45:09 +0200
Subject: [PATCH] Refactorings.

---
 src/h5ai/footer.html                          |   2 +
 src/h5ai/header.php                           |   2 +
 src/h5ai/js/inc/extended.js                   |  23 +-
 src/h5ai/js/inc/h5ai.js                       | 135 ++-
 src/h5ai/js/inc/jquery.fracs.js               | 871 ------------------
 src/h5ai/js/inc/jquery.scrollpanel.js         | 263 +++---
 src/h5ai/js/inc/jquery.utils.js               |   5 +-
 src/h5ai/js/inc/path.js                       |  28 +-
 src/h5ai/js/inc/tree.js                       |  13 +-
 src/h5ai/js/lib/jquery.fracs-core.min.js      |   7 +
 .../js/{inc => lib}/jquery.mousewheel.min.js  |   0
 src/h5ai/js/main-js.js                        |  23 +-
 src/h5ai/js/main-php.js                       |  15 +-
 13 files changed, 264 insertions(+), 1123 deletions(-)
 delete mode 100644 src/h5ai/js/inc/jquery.fracs.js
 create mode 100644 src/h5ai/js/lib/jquery.fracs-core.min.js
 rename src/h5ai/js/{inc => lib}/jquery.mousewheel.min.js (100%)

diff --git a/src/h5ai/footer.html b/src/h5ai/footer.html
index 3eacc917..1d81b3f8 100644
--- a/src/h5ai/footer.html
+++ b/src/h5ai/footer.html
@@ -28,6 +28,8 @@
         </span>
     </footer>
     <script src="/h5ai/js/lib/jquery.min.js"></script>
+    <script src="/h5ai/js/lib/jquery.mousewheel.min.js"></script>
+    <script src="/h5ai/js/lib/jquery.fracs-core.min.js"></script>
     <script src="/h5ai/options.js"></script>
     <script src="/h5ai/js/main-js.js"></script>
 </body>
diff --git a/src/h5ai/header.php b/src/h5ai/header.php
index ff0f4050..79ec5817 100644
--- a/src/h5ai/header.php
+++ b/src/h5ai/header.php
@@ -61,6 +61,8 @@
         </span>
     </footer>
     <script src="/h5ai/js/lib/jquery.min.js"></script>
+    <script src="/h5ai/js/lib/jquery.mousewheel.min.js"></script>
+    <script src="/h5ai/js/lib/jquery.fracs-core.min.js"></script>
     <script src="/h5ai/options.js"></script>
     <script src="/h5ai/js/main-php.js"></script>
     <section id="table">
diff --git a/src/h5ai/js/inc/extended.js b/src/h5ai/js/inc/extended.js
index b4641193..e741865d 100644
--- a/src/h5ai/js/inc/extended.js
+++ b/src/h5ai/js/inc/extended.js
@@ -1,7 +1,6 @@
+/*global $, Objects */
 
-var Extended = function (pathCache, h5ai) {
-    "use strict";
-    /*global $*/
+Objects.Extended = function (pathCache, h5ai) {
 
     var settings = {
             customHeader: "h5ai.header.html",
@@ -16,21 +15,19 @@ var Extended = function (pathCache, h5ai) {
         },
         initBreadcrumb = function () {
 
-            var idx, part,
-                $ul = $("body > nav ul"),
+            var $ul = $("body > nav ul"),
                 pathname = "/",
                 path = pathCache.getPath(pathname),
                 pathnameParts = document.location.pathname.split("/");
 
             $ul.append(path.updateCrumbHtml());
 
-            for (idx in pathnameParts) {
-                part = pathnameParts[idx];
+            $.each(pathnameParts, function (idx, part) {
                 if (part !== "") {
                     pathname += part + "/";
                     $ul.append(pathCache.getPath(pathname).updateCrumbHtml());
                 }
-            }
+            });
         },
         initExtendedView = function () {
 
@@ -47,11 +44,11 @@ var Extended = function (pathCache, h5ai) {
 
             $ul = $("<ul/>");
             $li = $("<li class='header' />")
-                .appendTo($ul)
-                .append($("<a class='icon'></a>"))
-                .append($("<a class='label' href='" + $label.attr("href") + "'><span class='l10n-name'>" + $label.text() + "</span></a>"))
-                .append($("<a class='date' href='" + $date.attr("href") + "'><span class='l10n-lastModified'>" + $date.text() + "</span></a>"))
-                .append($("<a class='size' href='" + $size.attr("href") + "'><span class='l10n-size'>" + $size.text() + "</span></a>"));
+                    .appendTo($ul)
+                    .append($("<a class='icon'></a>"))
+                    .append($("<a class='label' href='" + $label.attr("href") + "'><span class='l10n-name'>" + $label.text() + "</span></a>"))
+                    .append($("<a class='date' href='" + $date.attr("href") + "'><span class='l10n-lastModified'>" + $date.text() + "</span></a>"))
+                    .append($("<a class='size' href='" + $size.attr("href") + "'><span class='l10n-size'>" + $size.text() + "</span></a>"));
 
             // header sort icons
             if (order.ascending) {
diff --git a/src/h5ai/js/inc/h5ai.js b/src/h5ai/js/inc/h5ai.js
index 79818ad4..56cfcfc6 100644
--- a/src/h5ai/js/inc/h5ai.js
+++ b/src/h5ai/js/inc/h5ai.js
@@ -1,7 +1,6 @@
+/*global window, $, Objects, localStorage */
 
-var H5ai = function (options, langs) {
-    "use strict";
-    /*global $, window, localStorage*/
+Objects.H5ai = function (options, langs) {
 
     var defaults = {
             store: {
@@ -29,7 +28,7 @@ var H5ai = function (options, langs) {
             ignore: ["h5ai", "h5ai.header.html", "h5ai.footer.html"],
             ignoreRE: ["/^\\./"],
             showThumbs: true,
-            
+
             zippedDownload: true
         },
         settings = $.extend({}, defaults, options),
@@ -41,11 +40,9 @@ var H5ai = function (options, langs) {
         },
         triggerPathClick = function (path, context) {
 
-            var i, l, a = settings.callbacks.pathClick;
-
-            for (i = 0, l = a.length; i < l; i++) {
-                a[i].call(window, path, context);
-            }
+            $.each(settings.callbacks.pathClick, function (idx, callback) {
+                callback.call(window, path, context);
+            });
         },
         getViewmode = function () {
 
@@ -144,14 +141,14 @@ var H5ai = function (options, langs) {
                     $(".status.default").show();
                     $(".status.dynamic").empty().hide();
                 }
-          );
+         );
         },
         shiftTree = function (forceVisible, dontAnimate) {
 
             var $tree = $("#tree"),
                 $extended = $("#extended");
 
-            if (settings.slideTree && $tree.outerWidth() < $extended.offset().left || forceVisible) {
+            if ((settings.slideTree && $tree.outerWidth() < $extended.offset().left) || forceVisible) {
                 if (dontAnimate) {
                     $tree.stop().css({ left: 0 });
                 } else {
@@ -170,7 +167,7 @@ var H5ai = function (options, langs) {
             $("#tree").hover(
                 function () { shiftTree(true); },
                 function () { shiftTree(); }
-         );
+            );
             $(window).resize(function () { shiftTree(); });
             shiftTree(false, true);
         },
@@ -185,7 +182,7 @@ var H5ai = function (options, langs) {
                     $a.hover(
                         function () { $("a[href='" + href + "']").addClass("hover"); },
                         function () { $("a[href='" + href + "']").removeClass("hover"); }
-                );
+                    );
                 });
             }
         },
@@ -211,9 +208,9 @@ var H5ai = function (options, langs) {
 
             selected = langs[lang];
             if (selected) {
-                for (key in selected) {
-                    $(".l10n-" + key).text(selected[key]);
-                }
+                $.each(selected, function (key, value) {
+                    $(".l10n-" + key).text(value);
+                });
                 $(".lang").text(lang);
                 $(".langOption").removeClass("current");
                 $(".langOption." + lang).addClass("current");
@@ -225,24 +222,22 @@ var H5ai = function (options, langs) {
                 sortedLangsKeys = [],
                 $ul;
 
-            for (lang in langs) {
+            $.each(langs, function (lang) {
                 sortedLangsKeys.push(lang);
-            }
+            });
             sortedLangsKeys.sort();
 
             $ul = $("<ul />");
-            for (idx in sortedLangsKeys) {
-                (function (lang) {
-                    $("<li class='langOption' />")
-                        .addClass(lang)
-                        .text(lang + " - " + langs[lang].lang)
-                        .appendTo($ul)
-                        .click(function () {
-                            localStorage.setItem(settings.store.lang, lang);
-                            localize(langs, lang, false);
-                        });
-                })(sortedLangsKeys[idx]);
-            }
+            $.each(sortedLangsKeys, function (idx, lang) {
+                $("<li class='langOption' />")
+                    .addClass(lang)
+                    .text(lang + " - " + langs[lang].lang)
+                    .appendTo($ul)
+                    .click(function () {
+                        localStorage.setItem(settings.store.lang, lang);
+                        localize(langs, lang, false);
+                    });
+            });
             $("#langSelector .langOptions").append($ul);
             $("#langSelector").hover(
                 function () {
@@ -252,46 +247,47 @@ var H5ai = function (options, langs) {
                 function () {
                     $(".langOptions").stop(true, true).fadeOut();
                 }
-        );
+            );
+        },
+        onIndicatorClick = function (event) {
+
+            var $indicator = $(this),
+                $entry = $indicator.closest(".entry");
+
+            if ($indicator.hasClass("unknown")) {
+                $.get("/h5ai/php/treecontent.php", { "href": $entry.find("> a").attr("href") }, function (html) {
+                    
+                    var $content = $(html);
+
+                    $indicator.removeClass("unknown");
+                    if ($content.find("> li").size() === 0) {
+                        $indicator.replaceWith($("<span class='blank' />"));
+                    } else {
+                        $indicator.addClass("open");
+                        $entry.find("> .content").replaceWith($content);
+                        $("#tree").get(0).updateScrollbar();
+                        initIndicators();
+                    }
+                });
+            } else if ($indicator.hasClass("open")) {
+                $indicator.removeClass("open");
+                $("#tree").get(0).updateScrollbar(true);
+                $entry.find("> .content").slideUp(function () {
+                    $("#tree").get(0).updateScrollbar();
+                });
+            } else {
+                $indicator.addClass("open");
+                $("#tree").get(0).updateScrollbar(true);
+                $entry.find("> .content").slideDown(function () {
+                    $("#tree").get(0).updateScrollbar();
+                });
+            }
         },
         initIndicators = function () {
 
-            $("#tree .entry.folder:not(.initiatedIndicator)").each(function () {
+            $("#tree .entry.folder .indicator:not(.initiated)").each(function () {
 
-                var $entry = $(this).addClass("initiatedIndicator"),
-                    $indicator = $entry.find("> .indicator");
-
-                $indicator.click(function (event) {
-
-                    var $content;
-
-                    if ($indicator.hasClass("unknown")) {
-                        $.get("/h5ai/php/treecontent.php", { "href": $entry.find("> a").attr("href") }, function (html) {
-                            $content = $(html);
-                            $indicator.removeClass("unknown");
-                            if ($content.find("> li").size() === 0) {
-                                $indicator.replaceWith($("<span class='blank' />"));
-                            } else {
-                                $indicator.addClass("open");
-                                $entry.find("> .content").replaceWith($content);
-                                $("#tree").get(0).updateScrollbar();
-                                initIndicators();
-                            }
-                        });
-                    } else if ($indicator.hasClass("open")) {
-                        $indicator.removeClass("open");
-                        $("#tree").get(0).updateScrollbar(true);
-                        $entry.find("> .content").slideUp(function () {
-                            $("#tree").get(0).updateScrollbar();
-                        });
-                    } else {
-                        $indicator.addClass("open");
-                        $("#tree").get(0).updateScrollbar(true);
-                        $entry.find("> .content").slideDown(function () {
-                            $("#tree").get(0).updateScrollbar();
-                        });
-                    }
-                });
+                $(this).addClass("initiated").click(onIndicatorClick);
             });
         },
         initZippedDownload = function () {
@@ -302,9 +298,9 @@ var H5ai = function (options, langs) {
                 selected = function (hrefs) {
 
                     var query, idx;
-                    for (idx in hrefs) {
-                        query = query ? query + ":" + hrefs[idx] : hrefs[idx];
-                    }
+                    $.each(hrefs, function (idx, href) {
+                        query = query ? query + ":" + href : href;
+                    });
                     query = "/h5ai/php/zipcontent.php?hrefs=" + query;
                     $("#download").show().find("a").attr("href", query);
                 },
@@ -388,6 +384,7 @@ var H5ai = function (options, langs) {
             linkHoverStates: linkHoverStates,
             pathClick: pathClick,
             triggerPathClick: triggerPathClick,
+            initIndicators: initIndicators,
             init: init
         };
 
diff --git a/src/h5ai/js/inc/jquery.fracs.js b/src/h5ai/js/inc/jquery.fracs.js
deleted file mode 100644
index b1780f9d..00000000
--- a/src/h5ai/js/inc/jquery.fracs.js
+++ /dev/null
@@ -1,871 +0,0 @@
-/*
- * jQuery.fracs 0.10
- * http://larsjung.de/fracs
- * 
- * provided under the terms of the MIT License
- */
-
-/*
- * ModPlug 0.4
- * http://larsjung.de/modplug
- *
- * provided under the terms of the MIT License
- */
-
-(function ($) {
-    "use strict";
-    /*globals jQuery */
-    /*jslint confusion: true */
-
-    var reference = "_mp_api";
-
-    $.ModPlug = $.ModPlug || {
-        plugin: function (namespace, options) {
-
-            if (!namespace || $[namespace] || $.fn[namespace]) {
-                // $.error("No namespace specified, or a plugin already exists on 'jQuery." + namespace + "'");
-                return !namespace ? 1 : ($[namespace] ? 2 : 3);
-            }
-
-            var defaults = {
-                    statics: {},
-                    methods: {},
-                    defaultStatic: undefined,
-                    defaultMethod: undefined
-                },
-                settings = $.extend({}, defaults, options),
-                staticPlug = function () {
-
-                    var args, defaultMethod;
-
-                    args = Array.prototype.slice.call(arguments);
-                    defaultMethod = settings.defaultStatic instanceof Function ? settings.defaultStatic.apply(this, args) : settings.defaultStatic;
-                    if (staticPlug[defaultMethod] instanceof Function) {
-                        return staticPlug[defaultMethod].apply(this, args);
-                    }
-                    $.error("Static method defaulted to '" + defaultMethod + "' does not exist on 'jQuery." + namespace + "'");
-                },
-                methods = {},
-                methodPlug = function (method) {
-
-                    var args, defaultMethod;
-
-                    if (methods[method] instanceof Function) {
-                        args = Array.prototype.slice.call(arguments, 1);
-                        return methods[method].apply(this, args);
-                    }
-
-                    args = Array.prototype.slice.call(arguments);
-                    defaultMethod = settings.defaultMethod instanceof Function ? settings.defaultMethod.apply(this, args) : settings.defaultMethod;
-                    if (methods[defaultMethod] instanceof Function) {
-                        return methods[defaultMethod].apply(this, args);
-                    }
-                    $.error("Method '" + method + "' defaulted to '" + defaultMethod + "' does not exist on 'jQuery." + namespace + "'");
-                },
-                api = {
-                    addStatics: function (newStatics) {
-
-                        $.extend(staticPlug, newStatics);
-                        staticPlug[reference] = api;
-                        return this;
-                    },
-                    addMethods: function (newMethods) {
-
-                        $.extend(methods, newMethods);
-                        return this;
-                    }
-                };
-
-            api.addStatics(settings.statics).addMethods(settings.methods);
-            $[namespace] = staticPlug;
-            $.fn[namespace] = methodPlug;
-            return 0;
-        },
-        module: function (namespace, options) {
-
-            if (!$[namespace] || !$[namespace][reference]) {
-                // $.error("No ModPlug plugin exists on 'jQuery." + namespace + "'");
-                return !$[namespace] ? 1 : 2;
-            }
-
-            var defaults = {
-                    statics: {},
-                    methods: {}
-                },
-                settings = $.extend({}, defaults, options);
-
-            $[namespace][reference].addStatics(settings.statics).addMethods(settings.methods);
-            return 0;
-        }
-    };
-
-}(jQuery));
-
-/*
- * jQuery.fracs - Core API
- */
-
-(function ($) {
-    "use strict";
-    /*globals jQuery, HTMLElement */
-    /*jslint browser: true, vars: true */
-
-    
-    var FracsData = function (htmlElementOrRect) {
-    
-        var target = htmlElementOrRect,
-            callbacks = [],
-            prevFracs;
-    
-        this.size = function () {
-    
-            return callbacks.length;
-        };
-    
-        this.bind = function (callback) {
-    
-            if (callback instanceof Function && $.inArray(callback, callbacks) === -1) {
-                callbacks.push(callback);
-            }
-        };
-    
-        this.unbind = function (callback) {
-    
-            if (callback instanceof Function) {
-                var idx = $.inArray(callback, callbacks);
-                if (idx >= 0) {
-                    callbacks.splice(idx, 1);
-                }
-            } else {
-                callbacks = [];
-            }
-        };
-    
-        this.check = function () {
-    
-            var rect = target instanceof HTMLElement ? $.fracs.rect(target) : target,
-                fracs = $.fracs.fracs(rect, $.fracs.viewport());
-    
-            if (!prevFracs || !prevFracs.equals(fracs)) {
-                $.each(callbacks, function (idx, callback) {
-                    callback.call(target, fracs, prevFracs);
-                });
-                prevFracs = fracs;
-            }
-        };
-    };
-
-    
-    var Rect = function (left, top, width, height) {
-    
-        var fracsData;
-    
-        this.left = Math.round(left);
-        this.top = Math.round(top);
-        this.width = Math.round(width);
-        this.height = Math.round(height);
-        this.right = this.left + this.width;
-        this.bottom = this.top + this.height;
-    
-        this.equals = function (that) {
-    
-            return this.left === that.left && this.top === that.top && this.width === that.width && this.height === that.height;
-        };
-    
-        this.area = function () {
-    
-            return this.width * this.height;
-        };
-    
-        this.intersection = function (rect) {
-    
-            var left = Math.max(this.left, rect.left),
-                right = Math.min(this.right, rect.right),
-                top = Math.max(this.top, rect.top),
-                bottom = Math.min(this.bottom, rect.bottom),
-                width = right - left,
-                height = bottom - top;
-    
-            return (width >= 0 && height >= 0) ? new Rect(left, top, width, height) : undefined;
-        };
-    
-        this.envelope = function (rect) {
-    
-            var left = Math.min(this.left, rect.left),
-                right = Math.max(this.right, rect.right),
-                top = Math.min(this.top, rect.top),
-                bottom = Math.max(this.bottom, rect.bottom),
-                width = right - left,
-                height = bottom - top;
-    
-            return new Rect(left, top, width, height);
-        };
-    
-        this.bind = function (callback) {
-    
-            if (!fracsData) {
-                fracsData = new FracsData(this);
-                $(window).bind("scroll resize", fracsData.check);
-            }
-            fracsData.bind(callback);
-        };
-    
-        this.unbind = function (callback) {
-    
-            if (fracsData) {
-                fracsData.unbind(callback);
-                if (fracsData.size() === 0) {
-                    $(window).unbind("scroll resize", fracsData.check);
-                    fracsData = undefined;
-                }
-            }
-        };
-    
-        this.check = function () {
-    
-            if (fracsData) {
-                fracsData.check();
-            }
-        };
-    
-        this.fracs = function () {
-    
-            $.fracs.fracs(this);
-        };
-    };
-
-    
-    var FracsResult = function (rectDocument, rectElement, rectViewport, visible, viewport, possible) {
-    
-        /*jslint confusion: true */
-    
-        if (!rectDocument || !rectElement || !rectViewport || !visible || !viewport || !possible) {
-            this.rects = undefined;
-            this.visible = 0;
-            this.viewport = 0;
-            this.possible = 0;
-        } else {
-            this.rects = {
-                document: rectDocument,
-                element: rectElement,
-                viewport: rectViewport
-            };
-            this.visible = visible;
-            this.viewport = viewport;
-            this.possible = possible;
-        }
-    
-        this.equals = function (that) {
-    
-            return this.fracsEqual(that) && this.rectsEqual(that);
-        };
-    
-        this.fracsEqual = function (that) {
-    
-            return this.visible === that.visible && this.viewport === that.viewport && this.possible === that.possible;
-        };
-    
-        this.rectsEqual = function (that) {
-    
-            if (!this.rects || !that.rects) {
-                return this.rects === that.rects;
-            }
-            return this.rects.document.equals(that.rects.document)
-                && this.rects.element.equals(that.rects.element)
-                && this.rects.viewport.equals(that.rects.viewport);
-        };
-    };
-
-    
-    var ScrollState = function () {
-    
-        var document = $.fracs.document(),
-            viewport = $.fracs.viewport(),
-            width = document.width - viewport.width,
-            height = document.height - viewport.height;
-    
-        this.width = width <= 0 ? undefined : viewport.left / width;
-        this.height = height <= 0 ? undefined : viewport.top / height;
-        this.left = viewport.left;
-        this.top = viewport.top;
-        this.right = document.right - viewport.right;
-        this.bottom = document.bottom - viewport.bottom;
-    
-        this.equals = function (that) {
-    
-            return this.width === that.width && this.height === that.height
-                && this.left === that.left && this.top === that.top
-                && this.right === that.right && this.bottom === that.bottom;
-        };
-    };
-
-    
-    var ScrollStateTracker = function () {
-    
-        var prevState,
-            callbacks = [],
-            check = function () {
-    
-                var state = new ScrollState();
-                if (!prevState || !prevState.equals(state)) {
-                    $.each(callbacks, function (idx, callback) {
-                        callback.call(window, state, prevState);
-                    });
-                    prevState = state;
-                }
-            };
-    
-        $(window).bind("resize scroll load", check);
-    
-        this.bind = function (callback) {
-    
-            callbacks.push(callback);
-        };
-    };
-
-    
-    // @beta
-    var FracsElement = function (htmlElement, fracs) {
-    
-        this.element = htmlElement;
-        this.fracs = fracs;
-    
-        this.update = function () {
-    
-            var fracs = $.fracs.fracs(this.element),
-                changed = !this.fracs || !this.fracs.equals(fracs);
-            this.fracs = fracs;
-            return changed;
-        };
-    };
-
-    
-    // @beta
-    var FracsGroup = function (htmlElements, property, callback) {
-    
-        var THIS = this,
-            targets = [],
-            prevBest = null;
-    
-        $.each(htmlElements, function (idx, element) {
-            if (element instanceof HTMLElement) {
-                targets.push(new FracsElement(element));
-            }
-        });
-    
-        this.check = function () {
-    
-            var best,
-                viewport = $.fracs.viewport();
-    
-            $.each(targets, function (idx, target) {
-                target.update();
-                if (!best || target.fracs[property] > best.fracs[property]) {
-                    best = target;
-                }
-            });
-    
-    
-            if (best && best.fracs[property] === 0) {
-                best = null;
-            }
-    
-            if (prevBest !== best) {
-                callback.call(THIS, best, prevBest);
-                prevBest = best;
-            }
-        };
-    };
-
-
-    var $document = $(document),
-        $window = $(window),
-        $htmlBody = $("html,body"),
-        scrollStateTracker,
-        dataNs = "fracs",
-        statics = {
-            document: function () {
-
-                /*jslint confusion: true */
-                return new Rect(0, 0, $document.width(), $document.height());
-            },
-            viewport: function () {
-
-                /*jslint confusion: true */
-                return new Rect($window.scrollLeft(), $window.scrollTop(), $window.width(), $window.height());
-            },
-            rect: function (htmlElement) {
-
-                var $target = $(htmlElement),
-                    offset = $target.offset();
-
-                if (!$target.is(":visible")) {
-                    return new Rect(0, 0, 0, 0);
-                }
-                return new Rect(offset.left, offset.top, $target.outerWidth(), $target.outerHeight());
-            },
-            fracs: function (rect, viewport) {
-
-                var intersection, intersectionElementSpace, intersectionViewportSpace, intersectionArea, possibleArea;
-
-                rect = rect instanceof HTMLElement ? statics.rect(rect) : rect;
-                viewport = viewport || statics.viewport();
-                intersection = rect.intersection(viewport);
-
-                if (!intersection) {
-                    return new FracsResult();
-                }
-
-                intersectionElementSpace = new Rect(intersection.left - rect.left, intersection.top - rect.top, intersection.width, intersection.height);
-                intersectionViewportSpace = new Rect(intersection.left - viewport.left, intersection.top - viewport.top, intersection.width, intersection.height);
-                intersectionArea = intersection.area();
-                possibleArea = Math.min(rect.width, viewport.width) * Math.min(rect.height, viewport.height);
-
-                return new FracsResult(
-                    intersection,
-                    intersectionElementSpace,
-                    intersectionViewportSpace,
-                    intersectionArea / rect.area(),
-                    intersectionArea / viewport.area(),
-                    intersectionArea / possibleArea
-               );
-            },
-            round: function (value, decs) {
-
-                if (isNaN(decs) || decs <= 0) {
-                    return Math.round(value);
-                }
-                return Math.round(value * Math.pow(10, decs)) / Math.pow(10, decs);
-            },
-            scrollTo: function (left, top, duration) {
-
-                duration = isNaN(duration) ? 1000 : duration;
-                $htmlBody.stop(true).animate({ scrollLeft: left, scrollTop: top }, duration);
-            },
-            scroll: function (left, top, duration) {
-
-                duration = isNaN(duration) ? 1000 : duration;
-                $htmlBody.stop(true).animate({ scrollLeft: $window.scrollLeft() + left, scrollTop: $window.scrollTop() + top }, duration);
-            },
-            scrollState: function (callback) {
-
-                if (callback instanceof Function) {
-                    scrollStateTracker = scrollStateTracker || new ScrollStateTracker();
-                    scrollStateTracker.bind(callback);
-                } else {
-                    return new ScrollState();
-                }
-            }
-        },
-        methods = {
-            bind: function (callback) {
-
-                return this.each(function () {
-
-                    var $this = $(this),
-                        data = $this.data(dataNs);
-
-                    if (!data) {
-                        data = new FracsData(this);
-                        $this.data(dataNs, data);
-                        $window.bind("scroll resize", data.check);
-                    }
-                    data.bind(callback);
-                });
-            },
-            unbind: function (callback) {
-
-                return this.each(function () {
-
-                    var $this = $(this),
-                        data = $this.data(dataNs);
-
-                    if (data) {
-                        data.unbind(callback);
-                        if (data.size() === 0) {
-                            $this.removeData(dataNs);
-                            $window.unbind("scroll resize", data.check);
-                        }
-                    }
-                });
-            },
-            check: function () {
-
-                return this.each(function () {
-
-                    var data = $(this).data(dataNs);
-
-                    if (data) {
-                        data.check();
-                    }
-                });
-            },
-            fracs: function () {
-
-                return statics.fracs(statics.rect(this.get(0)), statics.viewport());
-            },
-            rect: function () {
-
-                return statics.rect(this.get(0));
-            },
-            max: function (property, callback) {
-
-                if (callback instanceof Function) {
-
-                    var data = new FracsGroup(this, property, callback);
-
-                    $window.bind("scroll resize", data.check);
-                    data.check();
-                    return this;
-                } else {
-                    var obj, elements, maxValue;
-
-                    if ($.inArray(property, [ "possible", "visible", "viewport" ]) >= 0) {
-                        obj = "fracs";
-                    } else if ($.inArray(property, [ "width", "height", "left", "right", "top", "bottom" ]) >= 0) {
-                        obj = "rect";
-                    } else {
-                        return this;
-                    }
-
-                    this.each(function () {
-
-                        var fracs = statics[obj](this);
-
-                        if (!maxValue || fracs[property] > maxValue) {
-                            elements = [ this ];
-                            maxValue = fracs[property];
-                        } else if (fracs[property] === maxValue) {
-                            elements.push(this);
-                        }
-                    });
-                    return $(elements);
-                }
-            },
-            min: function (property) {
-
-                var obj, elements, minValue;
-
-                if ($.inArray(property, [ "possible", "visible", "viewport" ]) >= 0) {
-                    obj = "fracs";
-                } else if ($.inArray(property, [ "width", "height", "left", "right", "top", "bottom" ]) >= 0) {
-                    obj = "rect";
-                } else {
-                    return this;
-                }
-
-                this.each(function () {
-
-                    var fracs = statics[obj](this);
-
-                    if (!minValue || fracs[property] < minValue) {
-                        elements = [ this ];
-                        minValue = fracs[property];
-                    } else if (fracs[property] === minValue) {
-                        elements.push(this);
-                    }
-                });
-                return $(elements);
-            },
-            envelope: function () {
-
-                var envelope, rect;
-
-                this.each(function () {
-                    rect = statics.rect(this);
-                    envelope = !envelope ? rect : envelope.envelope(rect);
-                });
-                return envelope;
-            },
-            scrollTo: function (paddingLeft, paddingTop, duration) {
-
-                var rect;
-
-                paddingLeft = paddingLeft || 0;
-                paddingTop = paddingTop || 0;
-                rect = statics.rect(this.get(0));
-
-                statics.scrollTo(rect.left - paddingLeft, rect.top - paddingTop, duration);
-                return this;
-            },
-            softLink: function (paddingLeft, paddingTop, duration) {
-
-                return this.filter("a[href^=#]").each(function () {
-                    var $a = $(this),
-                        href = $a.attr("href");
-                    $a.click(function () {
-                        $(href).fracs("scrollTo", paddingLeft, paddingTop, duration);
-                    });
-                });
-            }
-        },
-        defaultStatic = function () {
-
-            return "fracs";
-        },
-        defaultMethod = function () {
-
-            if (arguments.length === 0) {
-                return "fracs";
-            } else if (arguments[0] instanceof Function) {
-                return "bind";
-            }
-        };
-
-
-    $.ModPlug.plugin("fracs", {
-        statics: statics,
-        methods: methods,
-        defaultStatic: defaultStatic,
-        defaultMethod: defaultMethod
-    });
-
-}(jQuery));
-
-/*
- * jQuery.fracs - Outline API
- */
-
-(function ($) {
-    "use strict";
-
-    /*globals jQuery */
-    /*jslint browser: true, vars: true */
-
-    
-    var Outline = function (canvas, options) {
-    
-        if (!(canvas instanceof HTMLElement && canvas.nodeName.toLowerCase() === "canvas")) {
-            return undefined;
-        }
-    
-    
-        var defaults = {
-                crop: false,
-                duration: 0,
-                focusWidth: 0.5,
-                focusHeight: 0.5,
-                autoFocus: true,
-                styles: [ {
-                    selector: "header,footer,section,article",
-                    fillStyle: "rgb(230,230,230)"
-                }, {
-                    selector: "h1",
-                    fillStyle: "rgb(240,140,060)"
-                }, {
-                    selector: "h2",
-                    fillStyle: "rgb(200,100,100)"
-                }, {
-                    selector: "h3",
-                    fillStyle: "rgb(100,200,100)"
-                }, {
-                    selector: "h4",
-                    fillStyle: "rgb(100,100,200)"
-                } ],
-                viewportStyle: {
-                    fillStyle: "rgba(228,77,38,0.3)"
-                },
-                viewportDragStyle: {
-                    fillStyle: "rgba(228,77,38,0.6)"
-                },
-                invertViewport: false
-            },
-            settings = $.extend({}, defaults, options),
-            $window = $(window),
-            $htmlBody = $("html,body"),
-            $canvas = $(canvas),
-            width = $canvas.attr("width"),
-            height = $canvas.attr("height"),
-            context = canvas.getContext("2d"),
-            docRect,
-            vpRect,
-            scale,
-            drag = false,
-            focusWidth,
-            focusHeight,
-            scroll = function (event) {
-    
-                var r, x, y;
-    
-                r = $canvas.fracs("rect");
-                x = event.pageX - r.left;
-                y = event.pageY - r.top;
-                $.fracs.scrollTo(x / scale - vpRect.width * focusWidth, y / scale - vpRect.height * focusHeight, settings.duration);
-            },
-            drawRect = function (context, rect, strokeWidth, strokeStyle, fillStyle, invert) {
-    
-                if (strokeWidth !== undefined && scale) {
-                    strokeWidth = strokeWidth > 0.2 / scale ? strokeWidth : 0.2 / scale;
-                }
-    
-                if (strokeStyle || fillStyle) {
-                    if (invert !== true) {
-                            context.beginPath();
-                            context.rect(rect.left, rect.top, rect.width, rect.height);
-                            if (fillStyle) {
-                                context.fillStyle = fillStyle;
-                                context.fill();
-                            }
-                            if (strokeStyle) {
-                                context.lineWidth = strokeWidth;
-                                context.strokeStyle = strokeStyle;
-                                context.stroke();
-                            }
-                    } else {
-                        if (fillStyle) {
-                            context.beginPath();
-                            context.rect(0, 0, docRect.width, rect.top);
-                            context.rect(0, rect.top, rect.left, rect.height);
-                            context.rect(rect.right, rect.top, docRect.right - rect.right, rect.height);
-                            context.rect(0, rect.bottom, docRect.width, docRect.bottom - rect.bottom);
-                            context.fillStyle = fillStyle;
-                            context.fill();
-                        }
-                        if (strokeStyle) {
-                            context.beginPath();
-                            context.rect(rect.left, rect.top, rect.width, rect.height);
-                            context.lineWidth = strokeWidth;
-                            context.strokeStyle = strokeStyle;
-                            context.stroke();
-                        }
-                    }
-                }
-            },
-            drawElement = function (context, htmlElement, strokeWidth, strokeStyle, fillStyle) {
-    
-                var $element = $(htmlElement),
-                    rect = $element.fracs("rect");
-    
-                if ($element.css("visibility") === "hidden") {
-                    return;
-                }
-    
-                strokeWidth = strokeWidth === "auto" ? $element.css("border-top-width") : strokeWidth;
-                strokeStyle = strokeStyle === "auto" ? $element.css("border-top-color") : strokeStyle;
-                fillStyle = fillStyle === "auto" ? $element.css("background-color") : fillStyle;
-                drawRect(context, rect, strokeWidth, strokeStyle, fillStyle);
-            },
-            drawViewport = function () {
-    
-                var strokeWidth, strokeStyle, fillStyle;
-    
-                if (drag && settings.viewportDragStyle) {
-                    strokeWidth = settings.viewportDragStyle.storkeWidth;
-                    strokeStyle = settings.viewportDragStyle.strokeStyle;
-                    fillStyle = settings.viewportDragStyle.fillStyle;
-                } else {
-                    strokeWidth = settings.viewportStyle.storkeWidth;
-                    strokeStyle = settings.viewportStyle.strokeStyle;
-                    fillStyle = settings.viewportStyle.fillStyle;
-                }
-                drawRect(context, vpRect, strokeWidth, strokeStyle, fillStyle, settings.invertViewport);
-            },
-            applyStyles = function (context) {
-    
-                $.each(settings.styles, function (idx, style) {
-                    $(style.selector).each(function () {
-                        drawElement(context, this, style.strokeWidth, style.strokeStyle, style.fillStyle);
-                    });
-                });
-            },
-            draw = function () {
-    
-                /*jslint confusion: true */
-    
-                var scaleX, scaleY;
-    
-                docRect = $.fracs.document();
-                vpRect = $.fracs.viewport();
-                scaleX = width / docRect.width;
-                scaleY = height / docRect.height;
-                scale = scaleX < scaleY ? scaleX : scaleY;
-    
-                if (settings.crop) {
-                    $canvas.attr("width", docRect.width * scale).attr("height", docRect.height * scale);
-                }
-    
-                context.clearRect(0, 0, $canvas.width(), $canvas.height());
-    
-                context.scale(scale, scale);
-                applyStyles(context);
-                drawViewport();
-                context.scale(1 / scale, 1 / scale);
-            },
-            init = function () {
-    
-                $canvas
-                    .css("cursor", "pointer")
-                    .mousedown(function (event) {
-    
-                        var r;
-    
-                        event.preventDefault();
-                        drag = true;
-                        if (settings.autoFocus) {
-                            r = $canvas.fracs("rect");
-                            focusWidth = (((event.pageX - r.left) / scale) - vpRect.left) / vpRect.width;
-                            focusHeight = (((event.pageY - r.top) / scale) - vpRect.top) / vpRect.height;
-                        }
-                        if (!settings.autoFocus || focusWidth < 0 || focusWidth > 1 || focusHeight < 0 || focusHeight > 1) {
-                            focusWidth = settings.focusWidth;
-                            focusHeight = settings.focusHeight;
-                        }
-                        scroll(event);
-                        $canvas.css("cursor", "crosshair").addClass("dragOn");
-                        $htmlBody.css("cursor", "crosshair");
-                        $window
-                            .bind("mousemove", scroll)
-                            .one("mouseup", function (event) {
-                                event.preventDefault();
-                                $canvas.css("cursor", "pointer").removeClass("dragOn");
-                                $htmlBody.css("cursor", "auto");
-                                $window.unbind("mousemove", scroll);
-                                drag = false;
-                                draw();
-                            });
-                    });
-                canvas.onselectstart = function () {
-                    return false;
-                };
-                $window.bind("load resize scroll", draw);
-                draw();
-            };
-    
-    
-        init();
-    
-    
-        this.draw = draw;
-    };
-
-
-    var dataNs = "outline",
-        methods = {
-            outline: function (options) {
-
-                return this.each(function () {
-
-                    var outline;
-
-                    if (options === "redraw") {
-                        outline = $(this).data(dataNs);
-                        if (outline) {
-                            outline.draw();
-                        }
-                    } else {
-                        outline = new Outline(this, options);
-                        if (outline) {
-                            $(this).data(dataNs, outline);
-                        }
-                    }
-                });
-            }
-        };
-
-
-    $.ModPlug.module("fracs", {
-        methods: methods
-    });
-
-}(jQuery));
-
diff --git a/src/h5ai/js/inc/jquery.scrollpanel.js b/src/h5ai/js/inc/jquery.scrollpanel.js
index 585d7961..af039ce7 100644
--- a/src/h5ai/js/inc/jquery.scrollpanel.js
+++ b/src/h5ai/js/inc/jquery.scrollpanel.js
@@ -1,139 +1,142 @@
+/*global window, jQuery */
+
 (function ($) {
+    "use strict";
 
     var init = function (htmlElement) {
-
-        var $element = $(htmlElement),
-            $scrollbar, $drag, $wrapper, $content, mouseOffsetY, updateId,
-            update, scroll;
-
-        if (!$element.css("position") || $element.css("position") === "static") {
-            $element.css("position", "relative");
-        }
-
-        $scrollbar = $("<div class='scrollbar' />");
-        $drag = $("<div class='drag' />").appendTo($scrollbar);
-        $element
-            .wrapInner("<div class='wrapper'><div class='content' /></div>")
-            .append($scrollbar);
-        $wrapper = $element.find("> .wrapper");
-        $content = $wrapper.find("> .content");
-        mouseOffsetY = 0;
-
-        update = function (repeat) {
-
-            var visibleHeight, contentHeight, scrollTop, scrollTopFrac, visVertFrac;
-
-            if (updateId && !repeat) {
-                clearInterval(updateId);
-                updateId = undefined;
-            } else if (!updateId && repeat) {
-                updateId = setInterval(function() { update(true); }, 50);
+    
+            var $element = $(htmlElement),
+                $scrollbar, $drag, $wrapper, $content, mouseOffsetY, updateId,
+                update, scroll;
+    
+            if (!$element.css("position") || $element.css("position") === "static") {
+                $element.css("position", "relative");
             }
-
-            $wrapper.css("height", $element.height());
-            visibleHeight = $element.height();
-            contentHeight = $content.outerHeight();
-            scrollTop = $wrapper.scrollTop();
-            scrollTopFrac = scrollTop / contentHeight;
-            visVertFrac = Math.min(visibleHeight / contentHeight, 1);
-
-            if (visVertFrac < 1) {
-                $scrollbar
-                    .fadeIn(50)
-                    .css({
-                        height: $element.innerHeight() + $scrollbar.height() - $scrollbar.outerHeight(true)
-                    });
-                $drag
-                    .css({
-                        top: $scrollbar.height() * scrollTopFrac,
-                        height: $scrollbar.height() * visVertFrac
-                    });
-            } else {
-                $scrollbar.fadeOut(50);
-            }
-        };
-
-        scroll = function (event) {
-
-            var clickFrac = (event.pageY - $scrollbar.offset().top - mouseOffsetY) / $scrollbar.height();
-
-            $wrapper.scrollTop($content.outerHeight() * clickFrac);
-            update();
-            event.preventDefault();
-        };
-
-        $element
-            .mousewheel(function (event, delta) {
-
-                $wrapper.scrollTop($wrapper.scrollTop() - 50 * delta);
+    
+            $scrollbar = $("<div class='scrollbar' />");
+            $drag = $("<div class='drag' />").appendTo($scrollbar);
+            $element
+                .wrapInner("<div class='wrapper'><div class='content' /></div>")
+                .append($scrollbar);
+            $wrapper = $element.find("> .wrapper");
+            $content = $wrapper.find("> .content");
+            mouseOffsetY = 0;
+    
+            update = function (repeat) {
+    
+                var visibleHeight, contentHeight, scrollTop, scrollTopFrac, visVertFrac;
+    
+                if (updateId && !repeat) {
+                    clearInterval(updateId);
+                    updateId = undefined;
+                } else if (!updateId && repeat) {
+                    updateId = setInterval(function() { update(true); }, 50);
+                }
+    
+                $wrapper.css("height", $element.height());
+                visibleHeight = $element.height();
+                contentHeight = $content.outerHeight();
+                scrollTop = $wrapper.scrollTop();
+                scrollTopFrac = scrollTop / contentHeight;
+                visVertFrac = Math.min(visibleHeight / contentHeight, 1);
+    
+                if (visVertFrac < 1) {
+                    $scrollbar
+                        .fadeIn(50)
+                        .css({
+                            height: $element.innerHeight() + $scrollbar.height() - $scrollbar.outerHeight(true)
+                        });
+                    $drag
+                        .css({
+                            top: $scrollbar.height() * scrollTopFrac,
+                            height: $scrollbar.height() * visVertFrac
+                        });
+                } else {
+                    $scrollbar.fadeOut(50);
+                }
+            };
+    
+            scroll = function (event) {
+    
+                var clickFrac = (event.pageY - $scrollbar.offset().top - mouseOffsetY) / $scrollbar.height();
+    
+                $wrapper.scrollTop($content.outerHeight() * clickFrac);
                 update();
-                event.stopPropagation();
                 event.preventDefault();
-            })
-            .scroll(update);
-        $element.get(0).updateScrollbar = update;
-        $wrapper
-            .css({
-                "padding-right": $scrollbar.outerWidth(true),
-                height: $element.height(),
-                overflow: "hidden"
-            });
-        $scrollbar
-            .css({
-                position: "absolute",
-                top: 0,
-                right: 0,
-                overflow: "hidden",
-                cursor: "pointer"
-            })
-            .mousedown(function (event) {
-
-                mouseOffsetY = $drag.outerHeight() / 2;
-                scroll(event);
-                $scrollbar.addClass("dragOn");
-                $(window)
-                    .bind("mousemove", scroll)
-                    .one("mouseup", function (event) {
-
-                        $scrollbar.removeClass("dragOn");
-                        $(window).unbind("mousemove", scroll);
-                        scroll(event);
-                        event.stopPropagation();
-                    });
-                event.preventDefault();
-            })
-            .each(function () {
-
-                this.onselectstart = function () {
-
-                    return false;
-                };
-            });
-        $drag
-            .css({
-                position: "absolute",
-                left: 0,
-                width: "100%"
-            })
-            .mousedown(function (event) {
-
-                mouseOffsetY = event.pageY - $drag.offset().top;
-                scroll(event);
-                $scrollbar.addClass("dragOn");
-                $(window)
-                    .bind("mousemove", scroll)
-                    .one("mouseup", function (event) {
-
-                        $scrollbar.removeClass("dragOn");
-                        $(window).unbind("mousemove", scroll);
-                        scroll(event);
-                        event.stopPropagation();
-                    });
-                event.stopPropagation();
-            });
-
-        update();
-    };
+            };
+    
+            $element
+                .mousewheel(function (event, delta) {
+    
+                    $wrapper.scrollTop($wrapper.scrollTop() - 50 * delta);
+                    update();
+                    event.stopPropagation();
+                    event.preventDefault();
+                })
+                .scroll(update);
+            $element.get(0).updateScrollbar = update;
+            $wrapper
+                .css({
+                    "padding-right": $scrollbar.outerWidth(true),
+                    height: $element.height(),
+                    overflow: "hidden"
+                });
+            $scrollbar
+                .css({
+                    position: "absolute",
+                    top: 0,
+                    right: 0,
+                    overflow: "hidden",
+                    cursor: "pointer"
+                })
+                .mousedown(function (event) {
+    
+                    mouseOffsetY = $drag.outerHeight() / 2;
+                    scroll(event);
+                    $scrollbar.addClass("dragOn");
+                    $(window)
+                        .bind("mousemove", scroll)
+                        .one("mouseup", function (event) {
+    
+                            $scrollbar.removeClass("dragOn");
+                            $(window).unbind("mousemove", scroll);
+                            scroll(event);
+                            event.stopPropagation();
+                        });
+                    event.preventDefault();
+                })
+                .each(function () {
+    
+                    this.onselectstart = function () {
+    
+                        return false;
+                    };
+                });
+            $drag
+                .css({
+                    position: "absolute",
+                    left: 0,
+                    width: "100%"
+                })
+                .mousedown(function (event) {
+    
+                    mouseOffsetY = event.pageY - $drag.offset().top;
+                    scroll(event);
+                    $scrollbar.addClass("dragOn");
+                    $(window)
+                        .bind("mousemove", scroll)
+                        .one("mouseup", function (event) {
+    
+                            $scrollbar.removeClass("dragOn");
+                            $(window).unbind("mousemove", scroll);
+                            scroll(event);
+                            event.stopPropagation();
+                        });
+                    event.stopPropagation();
+                });
+    
+            update();
+        };
 
 
     $.fn.scrollpanel = function () {
diff --git a/src/h5ai/js/inc/jquery.utils.js b/src/h5ai/js/inc/jquery.utils.js
index bcd46628..3d74e21b 100644
--- a/src/h5ai/js/inc/jquery.utils.js
+++ b/src/h5ai/js/inc/jquery.utils.js
@@ -1,6 +1,7 @@
+/*global window, jQuery */
+
 (function ($) {
     "use strict";
-    /*global jQuery, window*/
 
     // http://paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
     // modified
@@ -26,4 +27,4 @@
         return timer;
     }());
 
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/src/h5ai/js/inc/path.js b/src/h5ai/js/inc/path.js
index 71626a32..23a08673 100644
--- a/src/h5ai/js/inc/path.js
+++ b/src/h5ai/js/inc/path.js
@@ -1,7 +1,6 @@
+/*global $, Objects */
 
-var Path = function (pathCache, folder, tableRow) {
-    "use strict";
-    /*global $, h5ai, tree*/
+Objects.Path = function (pathCache, folder, tableRow) {
 
     var path,
         checkedDecodeUri = function (uri) {
@@ -11,7 +10,7 @@ var Path = function (pathCache, folder, tableRow) {
         },
         isEmpty = function () {
 
-            return path.content === undefined || $.isEmptyObject(path.content);
+            return !path.content || $.isEmptyObject(path.content);
         },
         onClick = function (context) {
 
@@ -124,7 +123,7 @@ var Path = function (pathCache, folder, tableRow) {
                 if (!h5ai.settings.setParentFolderLabels) {
                     $label.addClass("l10n-parentDirectory");
                 }
-                $html.addClass("parentfolder");
+                $html.addClass("folder-parent");
             }
 
             if (!isNaN(path.status)) {
@@ -171,6 +170,7 @@ var Path = function (pathCache, folder, tableRow) {
                     } else if (path.treeOpen) {
                         $indicator.addClass("open");
                     }
+
                     $indicator.click(function(event) {
 
                         if ($indicator.hasClass("unknown")) {
@@ -204,9 +204,10 @@ var Path = function (pathCache, folder, tableRow) {
                         }
                     });
                     $html.addClass("initiatedIndicator");
+
                     $blank.replaceWith($indicator);
                 }
-
+               
                 // is path the domain?
                 if (path.isDomain) {
                     $html.addClass("domain");
@@ -222,9 +223,9 @@ var Path = function (pathCache, folder, tableRow) {
                 // does it have subfolders?
                 if (!path.isEmpty()) {
                     $ul = $("<ul class='content' />").appendTo($html);
-                    for (idx in path.content) {
-                        $("<li />").append(path.content[idx].updateTreeHtml()).appendTo($ul);
-                    }
+                    $.each(path.content, function (idx, entry) {
+                        $("<li />").append(entry.updateTreeHtml()).appendTo($ul);
+                    });
                     if (path.status === undefined || !path.treeOpen) {
                         $ul.hide();
                     }
@@ -342,9 +343,7 @@ var Path = function (pathCache, folder, tableRow) {
 };
 
 
-var PathCache = function () {
-    "use strict";
-    /*global $*/
+Objects.PathCache = function () {
 
     var pathCache,
         cache = {},
@@ -385,7 +384,7 @@ var PathCache = function () {
                 path = cache[absHref];
 
             if (!path) {
-                path = new Path(pathCache, folder, tableRow);
+                path = new Objects.Path(pathCache, folder, tableRow);
                 if (!path.isParentFolder) {
                     cache[path.absHref] = path;
                 }
@@ -397,7 +396,8 @@ var PathCache = function () {
     pathCache = {
         splitPathname: splitPathname,
         pathEndsWithSlash: pathEndsWithSlash,
-        getPath: getPath
+        getPath: getPath,
+        cache: cache
     };
 
     return pathCache;
diff --git a/src/h5ai/js/inc/tree.js b/src/h5ai/js/inc/tree.js
index db7a5883..fa2dc0f9 100644
--- a/src/h5ai/js/inc/tree.js
+++ b/src/h5ai/js/inc/tree.js
@@ -1,7 +1,6 @@
+/*global $, Objects */
 
-var Tree = function (pathCache, h5ai) {
-    "use strict";
-    /*global $*/
+Objects.Tree = function (pathCache, h5ai) {
 
     var contentTypeRegEx = /^text\/html;h5ai=/,
         pathnameStatusCache = {},
@@ -45,11 +44,9 @@ var Tree = function (pathCache, h5ai) {
         },
         updatePaths = function () {
 
-            var ref;
-
-            for (ref in pathCache.cache) {
-                updatePath(pathCache.cache[ref]);
-            }
+            $.each(pathCache.cache, function (ref, cached) {
+                updatePath(cached);
+            });
         },
         fetchStatusAndContent = function (pathname, includeParent, callback) {
 
diff --git a/src/h5ai/js/lib/jquery.fracs-core.min.js b/src/h5ai/js/lib/jquery.fracs-core.min.js
new file mode 100644
index 00000000..c692a560
--- /dev/null
+++ b/src/h5ai/js/lib/jquery.fracs-core.min.js
@@ -0,0 +1,7 @@
+/*
+ * jQuery.fracs-core 0.11
+ * http://larsjung.de/fracs
+ * 
+ * provided under the terms of the MIT License
+ */
+(function(a){"use strict";var b="_ModPlug_0.5_API",c={plugin:function(c,d){if(!c||a[c]||a.fn[c])return c?a[c]?2:3:1;var e={statics:{},methods:{},defaultStatic:undefined,defaultMethod:undefined},f=a.extend({},e,d),g=function(){var b,d;b=Array.prototype.slice.call(arguments),d=f.defaultStatic instanceof Function?f.defaultStatic.apply(this,b):f.defaultStatic;if(g[d]instanceof Function)return g[d].apply(this,b);a.error("Static method defaulted to '"+d+"' does not exist on 'jQuery."+c+"'")},h={},i=function(b){var d,e;if(h[b]instanceof Function)return d=Array.prototype.slice.call(arguments,1),h[b].apply(this,d);d=Array.prototype.slice.call(arguments),e=f.defaultMethod instanceof Function?f.defaultMethod.apply(this,d):f.defaultMethod;if(h[e]instanceof Function)return h[e].apply(this,d);a.error("Method '"+b+"' defaulted to '"+e+"' does not exist on 'jQuery."+c+"'")},j={addStatics:function(c){return a.extend(g,c),g[b]=j,this},addMethods:function(b){return a.extend(h,b),this}};return j.addStatics(f.statics).addMethods(f.methods),a[c]=g,a.fn[c]=i,0},module:function(c,d){if(!a[c]||!a[c][b])return a[c]?2:1;var e={statics:{},methods:{}},f=a.extend({},e,d);return a[c][b].addStatics(f.statics).addMethods(f.methods),0}};window.ModPlug=a.ModPlug=c})(jQuery),function(a){"use strict";var b=window.Fracs=window.Fracs||{},c=a(window),d=a(document),e=a("html,body"),f="fracs",g;b.Rect=function(a,c,d,e){if(this instanceof b.Rect)this.left=Math.round(a),this.top=Math.round(c),this.width=Math.round(d),this.height=Math.round(e),this.right=this.left+this.width,this.bottom=this.top+this.height;else return new b.Rect(a,c,d,e)},a.extend(b.Rect,{prototype:{equals:function(a){return this.left===a.left&&this.top===a.top&&this.width===a.width&&this.height===a.height},area:function(){return this.width*this.height},intersection:function(a){var c=Math.max(this.left,a.left),d=Math.min(this.right,a.right),e=Math.max(this.top,a.top),f=Math.min(this.bottom,a.bottom),g=d-c,h=f-e;return g>=0&&h>=0?b.Rect(c,e,g,h):undefined},envelope:function(a){var c=Math.min(this.left,a.left),d=Math.max(this.right,a.right),e=Math.min(this.top,a.top),f=Math.max(this.bottom,a.bottom),g=d-c,h=f-e;return b.Rect(c,e,g,h)},fracs:function(){return b.Fractions.ofRect(this)}},ofDocument:function(){return b.Rect(0,0,d.width(),d.height())},ofViewport:function(){return b.Rect(c.scrollLeft(),c.scrollTop(),c.width(),c.height())},ofElement:function(c){var d=a(c),e;return d.is(":visible")?(e=d.offset(),b.Rect(e.left,e.top,d.outerWidth(),d.outerHeight())):b.Rect(0,0,-1,0)}}),b.Fractions=function(a,c,d,e,f,g){if(this instanceof b.Fractions)!a||!c||!d||!e||!f||!g?(this.rects=undefined,this.visible=0,this.viewport=0,this.possible=0):(this.rects={document:a,element:c,viewport:d},this.visible=e,this.viewport=f,this.possible=g);else return new b.Fractions(a,c,d,e,f,g)},a.extend(b.Fractions,{prototype:{equals:function(a){return this.fracsEqual(a)&&this.rectsEqual(a)},fracsEqual:function(a){return this.visible===a.visible&&this.viewport===a.viewport&&this.possible===a.possible},rectsEqual:function(a){return!this.rects||!a.rects?this.rects===a.rects:this.rects.document.equals(a.rects.document)&&this.rects.element.equals(a.rects.element)&&this.rects.viewport.equals(a.rects.viewport)}},ofRect:function(a,c){var d,e,f,g,h;return c=c||b.Rect.ofViewport(),d=a.intersection(c),d?(e=b.Rect(d.left-a.left,d.top-a.top,d.width,d.height),f=b.Rect(d.left-c.left,d.top-c.top,d.width,d.height),g=d.area(),h=Math.min(a.width,c.width)*Math.min(a.height,c.height),b.Fractions(d,e,f,g/a.area(),g/c.area(),g/h)):b.Fractions()},ofElement:function(a,c){return b.Fractions.ofRect(b.Rect.ofElement(a),c)}}),b.Cursor=function(a,c){if(this instanceof b.Mouse)this.distX=a,this.distY=c,this.distMin=Math.min(a,c),this.distMax=Math.max(a,c);else return new b.Mouse(a,c)},a.extend(b.Cursor,{prototype:{equals:function(a){return this.distX===a.distX&&this.distY===a.distY},dist:function(){return Math.sqrt(this.distX*this.distX+this.distY*this.distY)}},ofRect:function(a,c,d){var e=a<d.left?d.left-a:a>d.right?a-d.right:0,f=c<d.top?d.top-c:c>d.bottom?c-d.bottom:0;return b.Cursor(e,f)},ofElement:function(a,c,d){return b.Cursor.ofRect(a,c,b.Rect.ofElement(d))}}),b.Callbacks=function(){if(this instanceof b.Callbacks)this.callbacks=[];else return new b.Callbacks},b.Callbacks.prototype={size:function(){return this.callbacks.length},bind:function(b){b instanceof Function&&a.inArray(b,this.callbacks)===-1&&this.callbacks.push(b)},unbind:function(b){var c;b instanceof Function?(c=a.inArray(b,this.callbacks),c>=0&&this.callbacks.splice(c,1)):this.callbacks=[]},trigger:function(b,c){a.each(this.callbacks,function(a,d){d.apply(b,c)})}},b.FracsCallbacks=function(c){if(this instanceof b.FracsCallbacks)this.callbacks=[],this.element=c,this.fracs=undefined,this.prevFracs=undefined,this.checkProxy=a.proxy(this.check,this),this.autoCheck();else return new b.FracsCallbacks(c)},b.FracsCallbacks.prototype=a.extend({},b.Callbacks.prototype,{trigger:function(){b.Callbacks.prototype.trigger.call(this,this.element,[this.fracs,this.prevFracs])},check:function(){var a=this.element instanceof b.Rect?this.element:b.Rect.ofElement(this.element),c=b.Fractions.ofRect(a);return!this.fracs||!this.fracs.equals(c)?(this.prevFracs=this.fracs,this.fracs=c,this.trigger(),!0):!1},autoCheck:function(a){var b="resize scroll load",d=a===!1?"unbind":"bind";c[d](b,this.checkProxy)}}),b.ScrollStateCallbacks=function(){if(this instanceof b.ScrollStateCallbacks)this.callbacks=[],this.state=undefined,this.prevState=undefined,this.checkProxy=a.proxy(this.check,this),this.autoCheck();else return new b.ScrollStateCallbacks},b.ScrollStateCallbacks.prototype=a.extend({},b.Callbacks.prototype,{trigger:function(){b.Callbacks.prototype.trigger.call(this,window,[this.state,this.prevState])},check:function(){var a=b.ScrollState();return!this.state||!this.state.equals(a)?(this.prevState=this.state,this.state=a,this.trigger(),!0):!1},autoCheck:function(a){var b="resize scroll load",d=a===!1?"unbind":"bind";c[d](b,this.checkProxy)}}),b.GroupCallbacks=function(c,d,e){if(this instanceof b.GroupCallbacks)this.callbacks=[],this.group=b.Group(c),this.type=d,this.property=e,this.best=undefined,this.prevBest=undefined,this.checkProxy=a.proxy(this.check,this),this.autoCheck();else return new b.GroupCallbacks(c,d,e)},b.GroupCallbacks.prototype=a.extend({},b.Callbacks.prototype,{trigger:function(){b.Callbacks.prototype.trigger.call(this,this.group,[this.best,this.prevBest])},check:function(){var a=this.group[this.type](this.property),b=a.elements.length===0||a.value===0?undefined:a.elements[0];return!this.best||this.best!==b?(this.prevBest=this.best,this.best=b,this.trigger(),!0):!1},autoCheck:function(a){var b="resize scroll load",d=a===!1?"unbind":"bind";c[d](b,this.checkProxy)}}),b.CursorCallbacks=function(c){if(this instanceof b.CursorCallbacks)this.callbacks=[],this.element=c,this.cursor=undefined,this.prevCursor=undefined,this.checkProxy=a.proxy(this.check,this),this.autoCheck();else return new b.CursorCallbacks(c)},b.CursorCallbacks.prototype=a.extend({},b.Callbacks.prototype,{trigger:function(){b.Callbacks.prototype.trigger.call(this,this.element,[this.cursor,this.prevCursor])},check:function(a){var c=b.Cursor.ofElement(a.pageX,a.pageY,this.element);return!this.cursor||!this.cursor.equals(c)?(this.prevCursor=this.cursor,this.cursor=c,this.trigger(),!0):!1},autoCheck:function(a){var b="cursormove",d=a===!1?"unbind":"bind";c[d](b,this.checkProxy)}}),b.ScrollState=function(a,c,d,e,f,g){if(!(this instanceof b.ScrollState))return new b.ScrollState(a,c,d,e,f,g);if(a===undefined||c===undefined||d===undefined||e===undefined||f===undefined||g===undefined){var h=b.Rect.ofDocument(),i=b.Rect.ofViewport(),j=h.width-i.width,k=h.height-i.height;this.width=j<=0?undefined:i.left/j,this.height=k<=0?undefined:i.top/k,this.left=i.left,this.top=i.top,this.right=h.right-i.right,this.bottom=h.bottom-i.bottom}else this.width=a,this.height=c,this.left=d,this.top=e,this.right=f,this.bottom=g},a.extend(b.ScrollState,{prototype:{equals:function(a){return this.width===a.width&&this.height===a.height&&this.left===a.left&&this.top===a.top&&this.right===a.right&&this.bottom===a.bottom}},scrollTo:function(a,b,c){a=a||0,b=b||0,c=isNaN(c)?1e3:c,e.stop(!0).animate({scrollLeft:a,scrollTop:b},c)},scroll:function(a,d,e){a=a||0,d=d||0,b.ScrollState.scrollTo(c.scrollLeft()+a,c.scrollTop()+d,e)},scrollToRect:function(a,c,d,e){c=c||0,d=d||0,b.ScrollState.scrollTo(a.left-c,a.top-d,e)},scrollToElement:function(a,c,d,e){var f=b.Rect.ofElement(a);b.ScrollState.scrollToRect(f,c,d,e)}}),b.Element=function(a){if(this instanceof b.Element)this.element=a,this.fracs=undefined,this.prevFracs=undefined,this.rect=undefined,this.prevRect=undefined,this.update();else return new b.Element(a)},b.Element.prototype={update:function(){var a=b.Fractions.ofElement(this.element),c=b.Rect.ofElement(this.element),d=!1;if(!this.fracs||!this.fracs.equals(a))this.prevFracs=this.fracs,this.fracs=a,d=!0;if(!this.rect||!this.rect.equals(c))this.prevRect=this.rect,this.rect=c,d=!0;return d}},function(a,b){var c=["possible","visible","viewport"],d=["width","height","left","right","top","bottom"],e=function(b){if(a.inArray(b,c)>=0)return"fracs";if(a.inArray(b,d)>=0)return"rect"},f=function(a,b){return a>b},g=function(a,b){return a<b},h=function(b,c,d){var f,g,h=e(c);return h?(a.each(b,function(a,b){var e;b.update(),e=h==="fracs"?b.fracs[c]:b.rect[c],g===undefined||d(e,g)?(f=[b],g=e):e===g&&f.push(b)}),{elements:f,value:g}):{elements:[],value:undefined}},i=function(c){return a.map(c,function(a){return b.Element(a)})},j=function(b){return a.map(b,function(a){return a.element})};b.Group=function(a){if(this instanceof b.Group)this.elements=i(a);else return new b.Group(a)},b.Group.prototype={max:function(a,b){var c=h(this.elements,a,f);return b===!0?j(c.elements):c},min:function(a,b){var c=h(this.elements,a,g);return b===!0?j(c.elements):c}}}(jQuery,b),a.ModPlug.plugin("fracs",{statics:{document:function(){return b.Rect.ofDocument()},fracs:function(a,c){return b.Fractions.ofRect(a,c)},rect:function(a){return b.Rect.ofElement(a)},round:function(a,b){var c;return isNaN(b)||b<=0?Math.round(a):(c=Math.pow(10,b),Math.round(a*c)/c)},scroll:function(a,c,d){return b.ScrollState.scroll(a,c,d),this},scrollState:function(a){return a?(g=g||b.ScrollStateCallbacks(),g.bind(a),this):b.ScrollState()},scrollTo:function(a,c,d){return b.ScrollState.scrollTo(a,c,d),this},viewport:function(){return b.Rect.ofViewport()}},methods:{bind:function(c){return this.each(function(){var d=a(this),e=d.data(f);e||(e=b.FracsCallbacks(this),d.data(f,e)),e.bind(c)})},check:function(){return this.each(function(){var b=a(this).data(f);b&&b.check()})},cursor:function(a,c){return a instanceof Function?this.each(function(){b.CursorCallbacks(this).bind(a)}):b.Cursor.ofElement(a,c,this.get(0))},envelope:function(){var a,c;return this.each(function(){c=b.Rect.ofElement(this),a=a?a.envelope(c):c}),a},fracs:function(){return b.Fractions.ofElement(this.get(0))},max:function(c,d){return d?(b.GroupCallbacks(this,"max",c).bind(d),this):a(b.Group(this).maxHtmlElements(c))},min:function(c,d){return d?(b.GroupCallbacks(this,"min",c).bind(d),this):a(b.Group(this).minHtmlElements(c))},rect:function(){return b.Rect.ofElement(this.get(0))},softLink:function(c,d,e){return this.filter("a[href^=#]").each(function(){var f=a(this);f.click(function(){b.ScrollState.scrollToElement(a(f.attr("href")).get(0),c,d,e)})})},scrollTo:function(a,c,d){return b.ScrollState.scrollToElement(this.get(0),a,c,d),this},unbind:function(b){return this.each(function(){var c=a(this),d=c.data(f);d&&d.unbind(b)})}},defaultStatic:function(){return"fracs"},defaultMethod:function(a){if(arguments.length===0)return"fracs";if(a instanceof Function)return"bind"}})}(jQuery)
\ No newline at end of file
diff --git a/src/h5ai/js/inc/jquery.mousewheel.min.js b/src/h5ai/js/lib/jquery.mousewheel.min.js
similarity index 100%
rename from src/h5ai/js/inc/jquery.mousewheel.min.js
rename to src/h5ai/js/lib/jquery.mousewheel.min.js
diff --git a/src/h5ai/js/main-js.js b/src/h5ai/js/main-js.js
index bd09d420..ff51664c 100644
--- a/src/h5ai/js/main-js.js
+++ b/src/h5ai/js/main-js.js
@@ -1,20 +1,23 @@
+/*global jQuery, h5aiOptions, h5aiLangs*/
+
+// @include "inc/jquery.scrollpanel.js"
+// @include "inc/jquery.utils.js"
+
 (function($) {
     "use strict";
-    /*global jQuery, h5aiOptions, h5aiLangs*/
 
-    // @include "inc/jquery.mousewheel.min.js"
-    // @include "inc/jquery.scrollpanel.js"
-    // @include "inc/jquery.utils.js"
-    // @include "inc/jquery.fracs.js"
-    // @include "inc/path.js"
+    var Objects = {},
+        pathCache, h5ai, extended, tree;
+
     // @include "inc/h5ai.js"
+    // @include "inc/path.js"
     // @include "inc/extended.js"
     // @include "inc/tree.js"
 
-    var pathCache = new PathCache(),
-        h5ai = new H5ai(h5aiOptions, h5aiLangs),
-        extended = new Extended(pathCache, h5ai),
-        tree = new Tree(pathCache, h5ai);
+    pathCache = new Objects.PathCache();
+    h5ai = new Objects.H5ai(h5aiOptions, h5aiLangs);
+    extended = new Objects.Extended(pathCache, h5ai);
+    tree = new Objects.Tree(pathCache, h5ai);
 
     $.h5ai = {
         click: $.proxy(h5ai.pathClick, h5ai)
diff --git a/src/h5ai/js/main-php.js b/src/h5ai/js/main-php.js
index ec18573a..77e5fb6d 100644
--- a/src/h5ai/js/main-php.js
+++ b/src/h5ai/js/main-php.js
@@ -1,14 +1,17 @@
+/*global jQuery, h5aiOptions, h5aiLangs*/
+
+// @include "inc/jquery.scrollpanel.js"
+// @include "inc/jquery.utils.js"
+
 (function($) {
     "use strict";
-    /*global jQuery, h5aiOptions, h5aiLangs*/
 
-    // @include "inc/jquery.mousewheel.min.js"
-    // @include "inc/jquery.scrollpanel.js"
-    // @include "inc/jquery.utils.js"
-    // @include "inc/jquery.fracs.js"
+    var Objects = {},
+        h5ai;
+
     // @include "inc/h5ai.js"
 
-    var h5ai = new H5ai(h5aiOptions, h5aiLangs);
+    h5ai = new Objects.H5ai(h5aiOptions, h5aiLangs);
 
     $.h5ai = {
         click: $.proxy(h5ai.pathClick, h5ai)