From 4c1ed3d1e8e05acfb0039ee0e8006f72916ae6a2 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Thu, 29 Sep 2011 13:43:22 +0200
Subject: [PATCH 1/4] Redesigned js.

---
 src/h5ai/js/inc/{tree.js => Connector.js}    |  37 +-
 src/h5ai/js/inc/{extended.js => Extended.js} |  18 +-
 src/h5ai/js/inc/{h5ai.js => H5ai.js}         |   6 +-
 src/h5ai/js/inc/Html.js                      | 260 ++++++++++++
 src/h5ai/js/inc/Path.js                      | 105 +++++
 src/h5ai/js/inc/PathCache.js                 |  61 +++
 src/h5ai/js/inc/path.js                      | 404 -------------------
 src/h5ai/js/main-js.js                       |  39 +-
 src/h5ai/js/main-php.js                      |  24 +-
 9 files changed, 493 insertions(+), 461 deletions(-)
 rename src/h5ai/js/inc/{tree.js => Connector.js} (81%)
 rename src/h5ai/js/inc/{extended.js => Extended.js} (86%)
 rename src/h5ai/js/inc/{h5ai.js => H5ai.js} (99%)
 create mode 100644 src/h5ai/js/inc/Html.js
 create mode 100644 src/h5ai/js/inc/Path.js
 create mode 100644 src/h5ai/js/inc/PathCache.js
 delete mode 100644 src/h5ai/js/inc/path.js

diff --git a/src/h5ai/js/inc/tree.js b/src/h5ai/js/inc/Connector.js
similarity index 81%
rename from src/h5ai/js/inc/tree.js
rename to src/h5ai/js/inc/Connector.js
index fa2dc0f9..ab644855 100644
--- a/src/h5ai/js/inc/tree.js
+++ b/src/h5ai/js/inc/Connector.js
@@ -1,13 +1,13 @@
-/*global $, Objects */
+/*global $, H5aiJs */
 
-Objects.Tree = function (pathCache, h5ai) {
+H5aiJs.factory.Connector = function () {
 
     var contentTypeRegEx = /^text\/html;h5ai=/,
         pathnameStatusCache = {},
         fetchStatus = function (pathname, callback) {
 
-            if (h5ai.settings.folderStatus[pathname]) {
-                callback(h5ai.settings.folderStatus[pathname]);
+            if (H5aiJs.h5ai.settings.folderStatus[pathname]) {
+                callback(H5aiJs.h5ai.settings.folderStatus[pathname]);
                 return;
             } else if (pathnameStatusCache[pathname]) {
                 callback(pathnameStatusCache[pathname]);
@@ -37,14 +37,14 @@ Objects.Tree = function (pathCache, h5ai) {
                     if (status !== "h5ai") {
                         path.status = status;
                     }
-                    path.updateHtml();
-                    h5ai.linkHoverStates();
+                    H5aiJs.html.updateHtml(path);
+                    H5aiJs.h5ai.linkHoverStates();
                 });
             }
         },
         updatePaths = function () {
 
-            $.each(pathCache.cache, function (ref, cached) {
+            $.each(H5aiJs.pathCache.cache, function (ref, cached) {
                 updatePath(cached);
             });
         },
@@ -76,7 +76,7 @@ Objects.Tree = function (pathCache, h5ai) {
 
                         $(html).find("#table td").closest("tr").each(function () {
 
-                            var path = pathCache.getPath(pathname, this);
+                            var path = H5aiJs.pathCache.getPath(pathname, this);
 
                             if (path.isFolder && (!path.isParentFolder || includeParent)) {
                                 content[path.absHref] = path;
@@ -92,7 +92,7 @@ Objects.Tree = function (pathCache, h5ai) {
 
             fetchStatusAndContent(pathname, false, function (status, content) {
 
-                var path = pathCache.getPath(pathname);
+                var path = H5aiJs.pathCache.getPath(pathname);
 
                 path.status = status;
                 path.content = content;
@@ -103,7 +103,7 @@ Objects.Tree = function (pathCache, h5ai) {
 
             fetchPath(pathname, function (path) {
 
-                var parent = pathCache.splitPathname(pathname)[0];
+                var parent = H5aiJs.pathCache.splitPathname(pathname)[0];
 
                 path.treeOpen = true;
                 if (childPath) {
@@ -120,25 +120,24 @@ Objects.Tree = function (pathCache, h5ai) {
 
             fetchTree(document.location.pathname, function (path) {
                 $("#tree")
-                    .append(path.updateTreeHtml())
+                    .append(H5aiJs.html.updateTreeHtml(path))
                     .scrollpanel()
                     .show();
-                h5ai.shiftTree(false, true);
-                h5ai.linkHoverStates();
+                H5aiJs.h5ai.shiftTree(false, true);
+                H5aiJs.h5ai.linkHoverStates();
                 setTimeout(function () { $("#tree").get(0).updateScrollbar(); }, 1);
             });
         },
         init = function () {
 
-            if (h5ai.settings.showTree) {
+            if (H5aiJs.h5ai.settings.showTree) {
                 updatePaths();
                 populateTree();
             }
-        },
-        tree = {
-            fetchStatusAndContent: fetchStatusAndContent,
-            init: init
         };
 
-    return tree;
+    return {
+        fetchStatusAndContent: fetchStatusAndContent,
+        init: init
+    };
 };
diff --git a/src/h5ai/js/inc/extended.js b/src/h5ai/js/inc/Extended.js
similarity index 86%
rename from src/h5ai/js/inc/extended.js
rename to src/h5ai/js/inc/Extended.js
index e741865d..486107c2 100644
--- a/src/h5ai/js/inc/extended.js
+++ b/src/h5ai/js/inc/Extended.js
@@ -1,6 +1,6 @@
-/*global $, Objects */
+/*global $, H5aiJs */
 
-Objects.Extended = function (pathCache, h5ai) {
+H5aiJs.factory.Extended = function () {
 
     var settings = {
             customHeader: "h5ai.header.html",
@@ -17,15 +17,15 @@ Objects.Extended = function (pathCache, h5ai) {
 
             var $ul = $("body > nav ul"),
                 pathname = "/",
-                path = pathCache.getPath(pathname),
+                path = H5aiJs.pathCache.getPath(pathname),
                 pathnameParts = document.location.pathname.split("/");
 
-            $ul.append(path.updateCrumbHtml());
+            $ul.append(H5aiJs.html.updateCrumbHtml(path));
 
             $.each(pathnameParts, function (idx, part) {
                 if (part !== "") {
                     pathname += part + "/";
-                    $ul.append(pathCache.getPath(pathname).updateCrumbHtml());
+                    $ul.append(H5aiJs.html.updateCrumbHtml(H5aiJs.pathCache.getPath(pathname)));
                 }
             });
         },
@@ -37,8 +37,8 @@ Objects.Extended = function (pathCache, h5ai) {
                 $size = $ths.eq(3).find("a"),
                 sortquery = document.location.search,
                 order = {
-                    column: (sortquery.indexOf("C=N") >= 0) ? "name" : (sortquery.indexOf("C=M") >= 0) ? "date" : (sortquery.indexOf("C=S") >= 0) ? "size" : h5ai.settings.sortorder.column,
-                    ascending: (sortquery.indexOf("O=A") >= 0) ? true : (sortquery.indexOf("O=D") >= 0) ? false : h5ai.settings.sortorder.ascending
+                    column: (sortquery.indexOf("C=N") >= 0) ? "name" : (sortquery.indexOf("C=M") >= 0) ? "date" : (sortquery.indexOf("C=S") >= 0) ? "size" : H5aiJs.h5ai.settings.sortorder.column,
+                    ascending: (sortquery.indexOf("O=A") >= 0) ? true : (sortquery.indexOf("O=D") >= 0) ? false : H5aiJs.h5ai.settings.sortorder.ascending
                 },
                 $icon, $ul, $li;
 
@@ -66,8 +66,8 @@ Objects.Extended = function (pathCache, h5ai) {
 
             // entries
             $("#table td").closest("tr").each(function () {
-                var path = pathCache.getPath(document.location.pathname, this);
-                $ul.append(path.updateExtendedHtml());
+                var path = H5aiJs.pathCache.getPath(document.location.pathname, this);
+                $ul.append(H5aiJs.html.updateExtendedHtml(path));
             });
 
             $("#extended").append($ul);
diff --git a/src/h5ai/js/inc/h5ai.js b/src/h5ai/js/inc/H5ai.js
similarity index 99%
rename from src/h5ai/js/inc/h5ai.js
rename to src/h5ai/js/inc/H5ai.js
index 56cfcfc6..79779d7d 100644
--- a/src/h5ai/js/inc/h5ai.js
+++ b/src/h5ai/js/inc/H5ai.js
@@ -1,6 +1,6 @@
-/*global window, $, Objects, localStorage */
+/*global window, $, H5aiJs, localStorage */
 
-Objects.H5ai = function (options, langs) {
+H5aiJs.factory.H5ai = function (options, langs) {
 
     var defaults = {
             store: {
@@ -256,7 +256,7 @@ Objects.H5ai = function (options, langs) {
 
             if ($indicator.hasClass("unknown")) {
                 $.get("/h5ai/php/treecontent.php", { "href": $entry.find("> a").attr("href") }, function (html) {
-                    
+
                     var $content = $(html);
 
                     $indicator.removeClass("unknown");
diff --git a/src/h5ai/js/inc/Html.js b/src/h5ai/js/inc/Html.js
new file mode 100644
index 00000000..79e5977e
--- /dev/null
+++ b/src/h5ai/js/inc/Html.js
@@ -0,0 +1,260 @@
+/*global $, H5aiJs */
+
+H5aiJs.factory.Html = function () {
+
+    var imagesPath = "/h5ai/images",
+        iconsPath = "/h5ai/icons",
+        image = function (id) {
+
+            return imagesPath + "/" + id + ".png";
+        },
+        icon = function (id, big) {
+
+            return iconsPath + "/" + (big ? "48x48" : "16x16") + "/" + id + ".png";
+        },
+        onClick = function (path, context) {
+
+            H5aiJs.h5ai.triggerPathClick(path, context);
+        },
+        updateCrumbHtml = function (path) {
+
+            var $html, $a;
+
+            if (path.html.$crumb && path.html.$crumb.data("status") === path.status) {
+                return path.html.$crumb;
+            }
+
+            $html = $("<li class='crumb' />")
+                        .data("path", path)
+                        .addClass(path.isFolder ? "folder" : "file");
+
+            if (path.status) {
+                $html.data("status", path.status);
+            }
+
+            $a = $("<a><img src='" + image("crumb") + "' alt='>' />" + path.label + "</a>")
+                    .appendTo($html)
+                    .attr("href", path.absHref)
+                    .click(function() { onClick(path, "crumb"); });
+
+            if (path.isDomain) {
+                $html.addClass("domain");
+                $a.find("img").attr("src", image("home"));
+            }
+
+            if (path.isCurrentFolder) {
+                $html.addClass("current");
+            }
+
+            if (!isNaN(path.status)) {
+                if (path.status === 200) {
+                    $("<img class='hint' src='" + image("page") + "' alt='not listable' />").appendTo($a);
+                } else {
+                    $("<span class='hint'>(" + path.status + ")</span>").appendTo($a);
+                }
+            }
+
+            if (path.html.$crumb) {
+                path.html.$crumb.replaceWith($html);
+            }
+            path.html.$crumb = $html;
+
+            return $html;
+        },
+        updateExtendedHtml = function (path) {
+
+            var $html, $a, $label;
+
+            if (path.html.$extended && path.html.$extended.data("status") === path.status) {
+                return path.html.$extended;
+            }
+
+            $html = $("<li class='entry' />")
+                        .data("path", path)
+                        .addClass(path.isFolder ? "folder" : "file");
+
+            if (path.status) {
+                $html.data("status", path.status);
+            }
+
+            $label = $("<span class='label'>" + path.label + "</span>");
+            $a = $("<a />")
+                    .attr("href", path.absHref)
+                    .click(function() { onClick(path, "extended"); })
+                    .appendTo($html)
+                    .append($("<span class='icon small'><img src='" + path.icon16 + "' alt='" + path.alt + "' /></span>"))
+                    .append($("<span class='icon big'><img src='" + path.icon48 + "' alt='" + path.alt + "' /></span>"))
+                    .append($label)
+                    .append($("<span class='date'>" + path.date + "</span>"))
+                    .append($("<span class='size'>" + path.size + "</span>"));
+
+            $a.hover(
+                function () {
+                    if ($("#extended").hasClass("icons-view")) {
+                        var $this = $(this);
+                        $(".status.default").hide();
+                        $(".status.dynamic")
+                            .empty()
+                            .append($this.find(".label").clone())
+                            .append($("<span class='sep'>·</span>"))
+                            .append($this.find(".date").clone())
+                            .show();
+
+                        if (!$this.closest(".entry").hasClass("folder")) {
+                            $(".status.dynamic")
+                                .append($("<span class='sep'>·</span>"))
+                                .append($this.find(".size").clone());
+                        }
+                    }
+                },
+                function () {
+                    $(".status.default").show();
+                    $(".status.dynamic").empty().hide();
+                }
+            );
+
+            if (path.isParentFolder) {
+                if (!H5aiJs.h5ai.settings.setParentFolderLabels) {
+                    $label.addClass("l10n-parentDirectory");
+                }
+                $html.addClass("folder-parent");
+            }
+
+            if (!isNaN(path.status)) {
+                if (path.status === 200) {
+                    $html.addClass("page");
+                    $a.find(".icon.small img").attr("src", icon("folder-page"));
+                    $a.find(".icon.big img").attr("src", icon("folder-page", true));
+                } else {
+                    $html.addClass("error");
+                    $label.append($("<span class='hint'> " + path.status + " </span>"));
+                }
+            }
+
+            if (path.html.$extended) {
+                path.html.$extended.replaceWith($html);
+            }
+            path.html.$extended = $html;
+
+            return $html;
+        },
+        updateTreeHtml = function (path) {
+
+            var $html, $blank, $a, $indicator, $ul, idx;
+
+            $html = $("<div class='entry' />")
+                        .data("path", path)
+                        .addClass(path.isFolder ? "folder" : "file");
+
+            $blank = $("<span class='blank' />").appendTo($html);
+
+            $a = $("<a />")
+                    .attr("href", path.absHref)
+                    .click(function() { path.onClick(path, "tree"); })
+                    .appendTo($html)
+                    .append($("<span class='icon'><img src='" + path.icon16 + "' /></span>"))
+                    .append($("<span class='label'>" + path.label + "</span>"));
+
+            if (path.isFolder) {
+                // indicator
+                if (path.status === undefined || !path.isEmpty()) {
+                    $indicator = $("<span class='indicator initiated'><img src='" + image("tree") + "' /></span>")
+                        .click(function (event) {
+
+                            var $entry = $indicator.closest(".entry"); // $html
+
+                            if ($indicator.hasClass("unknown")) {
+                                H5aiJs.connector.fetchStatusAndContent(path.absHref, false, function (status, content) {
+
+                                    path.status = status;
+                                    path.content = content;
+                                    path.treeOpen = true;
+                                    $("#tree").get(0).updateScrollbar(true);
+                                    updateTreeHtml(path);
+                                    $("#tree").get(0).updateScrollbar();
+                                });
+                            } else if ($indicator.hasClass("open")) {
+                                path.treeOpen = false;
+                                $indicator.removeClass("open");
+                                $("#tree").get(0).updateScrollbar(true);
+                                $entry.find("> ul.content").slideUp(function() {
+
+                                    $("#tree").get(0).updateScrollbar();
+                                });
+                            } else {
+                                path.treeOpen = true;
+                                $indicator.addClass("open");
+                                $("#tree").get(0).updateScrollbar(true);
+                                $entry.find("> ul.content").slideDown(function() {
+
+                                    $("#tree").get(0).updateScrollbar();
+                                });
+                            }
+
+                        });
+
+                    if (path.status === undefined) {
+                        $indicator.addClass("unknown");
+                    } else if (path.treeOpen) {
+                        $indicator.addClass("open");
+                    }
+
+                    $blank.replaceWith($indicator);
+                }
+
+                // is path the domain?
+                if (path.isDomain) {
+                    $html.addClass("domain");
+                    $a.find(".icon img").attr("src", icon("folder-home"));
+                }
+
+                // is path the current folder?
+                if (path.isCurrentFolder) {
+                    $html.addClass("current");
+                    $a.find(".icon img").attr("src", icon("folder-open"));
+                }
+
+                // does it have subfolders?
+                if (!path.isEmpty()) {
+                    $ul = $("<ul class='content' />").appendTo($html);
+                    $.each(path.content, function (idx, entry) {
+                        $("<li />").append(updateTreeHtml(entry)).appendTo($ul);
+                    });
+                    if (path.status === undefined || !path.treeOpen) {
+                        $ul.hide();
+                    }
+                }
+
+                // reflect folder status
+                if (!isNaN(path.status)) {
+                    if (path.status === 200) {
+                        $a.find(".icon img").attr("src", icon("folder-page"));
+                        $a.append($("<span class='hint'><img src='" + image("page") + "' /></span>"));
+                    } else {
+                        $html.addClass("error");
+                        $a.append($("<span class='hint'>" + path.status + "</span>"));
+                    }
+                }
+            }
+
+            if (path.html.$tree) {
+                path.html.$tree.replaceWith($html);
+            }
+            path.html.$tree = $html;
+
+            return $html;
+        },
+        updateHtml = function (path) {
+
+            updateCrumbHtml(path);
+            updateExtendedHtml(path);
+            updateTreeHtml(path);
+        };
+
+    return {
+        updateCrumbHtml: updateCrumbHtml,
+        updateExtendedHtml: updateExtendedHtml,
+        updateTreeHtml: updateTreeHtml,
+        updateHtml: updateHtml
+    };
+};
diff --git a/src/h5ai/js/inc/Path.js b/src/h5ai/js/inc/Path.js
new file mode 100644
index 00000000..923944b4
--- /dev/null
+++ b/src/h5ai/js/inc/Path.js
@@ -0,0 +1,105 @@
+/*global $, H5aiJs */
+
+H5aiJs.factory.Path = function (folder, tableRow) {
+
+    var path,
+        checkedDecodeUri = function (uri) {
+
+            try { return decodeURI(uri); } catch (err) {}
+            return uri;
+        },
+        isEmpty = function () {
+
+            return !path.content || $.isEmptyObject(path.content);
+        },
+        onClick = function (context) {
+
+            H5aiJs.h5ai.triggerPathClick(path, context);
+        },
+        init = function () {
+
+            var $tds, $img, $a, splits;
+
+            path = {
+                // parentFolder: undefined,
+                // label: undefined,
+                // date: undefined,
+                // size: undefined,
+                // href: undefined,
+                // absHref: undefined,
+                // alt: undefined,
+                // icon16: undefined,
+                // icon48: undefined,
+                // isFolder: undefined,
+                // isParentFolder: undefined,
+                // isCurrentFolder: undefined,
+                // isDomain: undefined,
+
+                status: undefined,  // undefined, "h5ai" or HTTP response code
+                content: undefined,  // associative array path.absHref -> path
+                html: {
+                    $crumb: undefined,
+                    $extended: undefined,
+                    $tree: undefined
+                },
+                treeOpen: false,
+
+                isEmpty: isEmpty,
+                onClick: onClick
+            };
+
+            if (!H5aiJs.pathCache.pathEndsWithSlash(folder)) {
+                folder += "/";
+            }
+
+            if (tableRow) {
+                $tds = $(tableRow).find("td");
+                $img = $tds.eq(0).find("img");
+                $a = $tds.eq(1).find("a");
+
+                path.parentFolder = folder;
+                path.label = $a.text();
+                path.date = $tds.eq(2).text();
+                path.size = $tds.eq(3).text();
+                path.href = $a.attr("href");
+                path.alt = $img.attr("alt");
+                path.icon16 = $img.attr("src");
+            } else {
+                splits = H5aiJs.pathCache.splitPathname(folder);
+
+                path.parentFolder = splits[0];
+                path.label = checkedDecodeUri(splits[1]);
+                if (path.label === "/") {
+                    path.label = checkedDecodeUri(document.domain) + "/";
+                }
+                path.date = "";
+                path.size = "";
+                path.href = splits[1];
+                path.alt = "[DIR]";
+                path.icon16 = "/h5ai/icons/16x16/folder.png";
+            }
+
+            if (H5aiJs.pathCache.pathEndsWithSlash(path.label)) {
+                path.label = path.label.slice(0, -1);
+            }
+
+            path.icon48 = path.icon16.replace("16x16", "48x48");
+            path.isFolder = (path.alt === "[DIR]");
+            path.isParentFolder = (path.isFolder && path.label === "Parent Directory");
+            path.absHref = path.isParentFolder ? path.href : path.parentFolder + path.href;
+            path.isCurrentFolder = (path.absHref === document.location.pathname);
+            path.isDomain = (path.absHref === "/");
+
+            if (path.isParentFolder && H5aiJs.h5ai.settings.setParentFolderLabels) {
+                if (path.isDomain) {
+                    path.label = checkedDecodeUri(document.domain);
+                } else {
+                    path.label = checkedDecodeUri(H5aiJs.pathCache.splitPathname(H5aiJs.pathCache.splitPathname(path.parentFolder)[0])[1].slice(0, -1));
+                }
+            }
+        };
+
+    init();
+
+    return path;
+};
diff --git a/src/h5ai/js/inc/PathCache.js b/src/h5ai/js/inc/PathCache.js
new file mode 100644
index 00000000..90c4edca
--- /dev/null
+++ b/src/h5ai/js/inc/PathCache.js
@@ -0,0 +1,61 @@
+/*global $, H5aiJs */
+
+H5aiJs.factory.PathCache = function () {
+
+    var pathCache,
+        cache = {},
+        rePathnameSplit = /^(\/(.*\/)*)([^\/]+\/?)$/,
+        rePathEndsWithSlash = /\/$/,
+        splitPathname = function (pathname) {
+
+            var match;
+
+            if (pathname === "/") {
+                return ["", "/"];
+            }
+            match = rePathnameSplit.exec(pathname);
+            return [match[1], match[3]];
+        },
+        pathEndsWithSlash = function (pathname) {
+
+            return rePathEndsWithSlash.test(pathname);
+        },
+        getAbsHref = function (folder, tableRow) {
+
+            var $a, isParentFolder, href;
+
+            if (!pathEndsWithSlash(folder)) {
+                folder += "/";
+            }
+            if (!tableRow) {
+                return folder;
+            }
+            $a = $(tableRow).find("td").eq(1).find("a");
+            isParentFolder = ($a.text() === "Parent Directory");
+            href = $a.attr("href");
+            return isParentFolder ? undefined : folder + href;
+        },
+        getPath = function (folder, tableRow) {
+
+            var absHref = getAbsHref(folder, tableRow),
+                path = cache[absHref];
+
+            if (!path) {
+                path = new H5aiJs.factory.Path(folder, tableRow);
+                if (!path.isParentFolder) {
+                    cache[path.absHref] = path;
+                }
+            }
+
+            return path;
+        };
+
+    pathCache = {
+        splitPathname: splitPathname,
+        pathEndsWithSlash: pathEndsWithSlash,
+        getPath: getPath,
+        cache: cache
+    };
+
+    return pathCache;
+};
diff --git a/src/h5ai/js/inc/path.js b/src/h5ai/js/inc/path.js
deleted file mode 100644
index 23a08673..00000000
--- a/src/h5ai/js/inc/path.js
+++ /dev/null
@@ -1,404 +0,0 @@
-/*global $, Objects */
-
-Objects.Path = function (pathCache, folder, tableRow) {
-
-    var path,
-        checkedDecodeUri = function (uri) {
-
-            try { return decodeURI(uri); } catch (err) {}
-            return uri;
-        },
-        isEmpty = function () {
-
-            return !path.content || $.isEmptyObject(path.content);
-        },
-        onClick = function (context) {
-
-            h5ai.triggerPathClick(path, context);
-        },
-        updateHtml = function () {
-
-            path.updateCrumbHtml();
-            path.updateExtendedHtml();
-            path.updateTreeHtml();
-        },
-        updateCrumbHtml = function () {
-
-            var $html, $a;
-
-            if (path.html.$crumb && path.html.$crumb.data("status") === path.status) {
-                return path.html.$crumb;
-            }
-
-            $html = $("<li class='crumb' />")
-                        .data("path", path)
-                        .addClass(path.isFolder ? "folder" : "file");
-
-            if (path.status) {
-                $html.data("status", path.status);
-            }
-
-            $a = $("<a><img src='/h5ai/images/crumb.png' alt='>' />" + path.label + "</a>")
-                    .appendTo($html)
-                    .attr("href", path.absHref)
-                    .click(function() { onClick("crumb"); });
-
-            if (path.isDomain) {
-                $html.addClass("domain");
-                $a.find("img").attr("src", "/h5ai/images/home.png");
-            }
-
-            if (path.isCurrentFolder) {
-                $html.addClass("current");
-            }
-
-            if (!isNaN(path.status)) {
-                if (path.status === 200) {
-                    $("<img class='hint' src='/h5ai/images/page.png' alt='not listable' />").appendTo($a);
-                } else {
-                    $("<span class='hint'>(" + path.status + ")</span>").appendTo($a);
-                }
-            }
-
-            if (path.html.$crumb) {
-                path.html.$cpathreplaceWith($html);
-            }
-            path.html.$crumb = $html;
-
-            return $html;
-        },
-        updateExtendedHtml = function () {
-
-            var $html, $a, $label;
-
-            if (path.html.$extended && path.html.$extended.data("status") === path.status) {
-                return path.html.$extended;
-            }
-
-            $html = $("<li class='entry' />")
-                        .data("path", path)
-                        .addClass(path.isFolder ? "folder" : "file");
-
-            if (path.status) {
-                $html.data("status", path.status);
-            }
-
-            $label = $("<span class='label'>" + path.label + "</span>");
-            $a = $("<a />")
-                    .attr("href", path.absHref)
-                    .click(function() { onClick("extended"); })
-                    .appendTo($html)
-                    .append($("<span class='icon small'><img src='" + path.icon16 + "' alt='" + path.alt + "' /></span>"))
-                    .append($("<span class='icon big'><img src='" + path.icon48 + "' alt='" + path.alt + "' /></span>"))
-                    .append($label)
-                    .append($("<span class='date'>" + path.date + "</span>"))
-                    .append($("<span class='size'>" + path.size + "</span>"));
-
-            $a.hover(
-                function () {
-                    if ($("#extended").hasClass("icons-view")) {
-                        var $this = $(this);
-                        $(".status.default").hide();
-                        $(".status.dynamic")
-                            .empty()
-                            .append($this.find(".label").clone())
-                            .append($("<span class='sep'>·</span>"))
-                            .append($this.find(".date").clone())
-                            .show();
-
-                        if (!$this.closest(".entry").hasClass("folder")) {
-                            $(".status.dynamic")
-                                .append($("<span class='sep'>·</span>"))
-                                .append($this.find(".size").clone());
-                        }
-                    }
-                },
-                function () {
-                    $(".status.default").show();
-                    $(".status.dynamic").empty().hide();
-                }
-            );
-
-            if (path.isParentFolder) {
-                if (!h5ai.settings.setParentFolderLabels) {
-                    $label.addClass("l10n-parentDirectory");
-                }
-                $html.addClass("folder-parent");
-            }
-
-            if (!isNaN(path.status)) {
-                if (path.status === 200) {
-                    $html.addClass("page");
-                    $a.find(".icon.small img").attr("src", "/h5ai/icons/16x16/folder-page.png");
-                    $a.find(".icon.big img").attr("src", "/h5ai/icons/48x48/folder-page.png");
-                } else {
-                    $html.addClass("error");
-                    $label.append($("<span class='hint'> " + path.status + " </span>"));
-                }
-            }
-
-            if (path.html.$extended) {
-                path.html.$extended.replaceWith($html);
-            }
-            path.html.$extended = $html;
-
-            return $html;
-        },
-        updateTreeHtml = function () {
-
-            var $html, $blank, $a, $indicator, $ul, idx;
-
-            $html = $("<div class='entry' />")
-                        .data("path", path)
-                        .addClass(path.isFolder ? "folder" : "file");
-
-            $blank = $("<span class='blank' />").appendTo($html);
-
-            $a = $("<a />")
-                    .attr("href", path.absHref)
-                    .click(function() { path.onClick("tree"); })
-                    .appendTo($html)
-                    .append($("<span class='icon'><img src='" + path.icon16 + "' /></span>"))
-                    .append($("<span class='label'>" + path.label + "</span>"));
-
-            if (path.isFolder) {
-                // indicator
-                if (path.status === undefined || !path.isEmpty()) {
-                    $indicator = $("<span class='indicator'><img src='/h5ai/images/tree.png' /></span>");
-                    if (path.status === undefined) {
-                        $indicator.addClass("unknown");
-                    } else if (path.treeOpen) {
-                        $indicator.addClass("open");
-                    }
-
-                    $indicator.click(function(event) {
-
-                        if ($indicator.hasClass("unknown")) {
-                            tree.fetchStatusAndContent(path.absHref, false, function (status, content) {
-
-                                path.status = status;
-                                path.content = content;
-                                path.treeOpen = true;
-                                $("#tree").get(0).updateScrollbar(true);
-                                path.updateTreeHtml(function() {
-
-                                    $("#tree").get(0).updateScrollbar();
-                                });
-                            });
-                        } else if ($indicator.hasClass("open")) {
-                            path.treeOpen = false;
-                            $indicator.removeClass("open");
-                            $("#tree").get(0).updateScrollbar(true);
-                            $html.find("> ul.content").slideUp(function() {
-
-                                $("#tree").get(0).updateScrollbar();
-                            });
-                        } else {
-                            path.treeOpen = true;
-                            $indicator.addClass("open");
-                            $("#tree").get(0).updateScrollbar(true);
-                            $html.find("> ul.content").slideDown(function() {
-
-                                $("#tree").get(0).updateScrollbar();
-                            });
-                        }
-                    });
-                    $html.addClass("initiatedIndicator");
-
-                    $blank.replaceWith($indicator);
-                }
-               
-                // is path the domain?
-                if (path.isDomain) {
-                    $html.addClass("domain");
-                    $a.find(".icon img").attr("src", "/h5ai/icons/16x16/folder-home.png");
-                }
-
-                // is path the current folder?
-                if (path.isCurrentFolder) {
-                    $html.addClass("current");
-                    $a.find(".icon img").attr("src", "/h5ai/icons/16x16/folder-open.png");
-                }
-
-                // does it have subfolders?
-                if (!path.isEmpty()) {
-                    $ul = $("<ul class='content' />").appendTo($html);
-                    $.each(path.content, function (idx, entry) {
-                        $("<li />").append(entry.updateTreeHtml()).appendTo($ul);
-                    });
-                    if (path.status === undefined || !path.treeOpen) {
-                        $ul.hide();
-                    }
-                }
-
-                // reflect folder status
-                if (!isNaN(path.status)) {
-                    if (path.status === 200) {
-                        $a.find(".icon img").attr("src", "/h5ai/icons/16x16/folder-page.png");
-                        $a.append($("<span class='hint'><img src='/h5ai/images/page.png' /></span>"));
-                    } else {
-                        $html.addClass("error");
-                        $a.append($("<span class='hint'>" + path.status + "</span>"));
-                    }
-                }
-            }
-
-            if (path.html.$tree) {
-                path.html.$tree.replaceWith($html);
-            }
-            path.html.$tree = $html;
-
-            return $html;
-        },
-        init = function () {
-
-            var $tds, $img, $a, splits;
-
-            path = {
-                // parentFolder: undefined,
-                // label: undefined,
-                // date: undefined,
-                // size: undefined,
-                // href: undefined,
-                // absHref: undefined,
-                // alt: undefined,
-                // icon16: undefined,
-                // icon48: undefined,
-                // isFolder: undefined,
-                // isParentFolder: undefined,
-                // isCurrentFolder: undefined,
-                // isDomain: undefined,
-
-                status: undefined,  // undefined, "h5ai" or HTTP response code
-                content: undefined,  // associative array path.absHref -> path
-                html: {
-                    $crumb: undefined,
-                    $extended: undefined,
-                    $tree: undefined
-                },
-                treeOpen: false,
-
-                isEmpty: isEmpty,
-                onClick: onClick,
-                updateHtml: updateHtml,
-                updateCrumbHtml: updateCrumbHtml,
-                updateExtendedHtml: updateExtendedHtml,
-                updateTreeHtml: updateTreeHtml
-            };
-
-            if (!pathCache.pathEndsWithSlash(folder)) {
-                folder += "/";
-            }
-
-            if (tableRow) {
-                $tds = $(tableRow).find("td");
-                $img = $tds.eq(0).find("img");
-                $a = $tds.eq(1).find("a");
-
-                path.parentFolder = folder;
-                path.label = $a.text();
-                path.date = $tds.eq(2).text();
-                path.size = $tds.eq(3).text();
-                path.href = $a.attr("href");
-                path.alt = $img.attr("alt");
-                path.icon16 = $img.attr("src");
-            } else {
-                splits = pathCache.splitPathname(folder);
-
-                path.parentFolder = splits[0];
-                path.label = checkedDecodeUri(splits[1]);
-                if (path.label === "/") {
-                    path.label = checkedDecodeUri(document.domain) + "/";
-                }
-                path.date = "";
-                path.size = "";
-                path.href = splits[1];
-                path.alt = "[DIR]";
-                path.icon16 = "/h5ai/icons/16x16/folder.png";
-            }
-
-            if (pathCache.pathEndsWithSlash(path.label)) {
-                path.label = path.label.slice(0, -1);
-            }
-
-            path.icon48 = path.icon16.replace("16x16", "48x48");
-            path.isFolder = (path.alt === "[DIR]");
-            path.isParentFolder = (path.isFolder && path.label === "Parent Directory");
-            path.absHref = path.isParentFolder ? path.href : path.parentFolder + path.href;
-            path.isCurrentFolder = (path.absHref === document.location.pathname);
-            path.isDomain = (path.absHref === "/");
-
-            if (path.isParentFolder && h5ai.settings.setParentFolderLabels) {
-                if (path.isDomain) {
-                    path.label = checkedDecodeUri(document.domain);
-                } else {
-                    path.label = checkedDecodeUri(pathCache.splitPathname(pathCache.splitPathname(path.parentFolder)[0])[1].slice(0, -1));
-                }
-            }
-        };
-
-    init();
-
-    return path;
-};
-
-
-Objects.PathCache = function () {
-
-    var pathCache,
-        cache = {},
-        rePathnameSplit = /^(\/(.*\/)*)([^\/]+\/?)$/,
-        rePathEndsWithSlash = /\/$/,
-        splitPathname = function (pathname) {
-
-            var match;
-
-            if (pathname === "/") {
-                return ["", "/"];
-            }
-            match = rePathnameSplit.exec(pathname);
-            return [match[1], match[3]];
-        },
-        pathEndsWithSlash = function (pathname) {
-
-            return rePathEndsWithSlash.test(pathname);
-        },
-        getAbsHref = function (folder, tableRow) {
-
-            var $a, isParentFolder, href;
-
-            if (!pathEndsWithSlash(folder)) {
-                folder += "/";
-            }
-            if (!tableRow) {
-                return folder;
-            }
-            $a = $(tableRow).find("td").eq(1).find("a");
-            isParentFolder = ($a.text() === "Parent Directory");
-            href = $a.attr("href");
-            return isParentFolder ? undefined : folder + href;
-        },
-        getPath = function (folder, tableRow) {
-
-            var absHref = getAbsHref(folder, tableRow),
-                path = cache[absHref];
-
-            if (!path) {
-                path = new Objects.Path(pathCache, folder, tableRow);
-                if (!path.isParentFolder) {
-                    cache[path.absHref] = path;
-                }
-            }
-
-            return path;
-        };
-
-    pathCache = {
-        splitPathname: splitPathname,
-        pathEndsWithSlash: pathEndsWithSlash,
-        getPath: getPath,
-        cache: cache
-    };
-
-    return pathCache;
-};
diff --git a/src/h5ai/js/main-js.js b/src/h5ai/js/main-js.js
index ff51664c..9aca265f 100644
--- a/src/h5ai/js/main-js.js
+++ b/src/h5ai/js/main-js.js
@@ -6,28 +6,35 @@
 (function($) {
     "use strict";
 
-    var Objects = {},
-        pathCache, h5ai, extended, tree;
+    var H5aiJs = {
+            factory: {},
+            init: function () {
+                this.h5ai = new this.factory.H5ai(h5aiOptions, h5aiLangs);
+                this.pathCache = new this.factory.PathCache();
+                this.connector = new this.factory.Connector();
+                this.html = new this.factory.Html();
+                this.extended = new this.factory.Extended();
 
-    // @include "inc/h5ai.js"
-    // @include "inc/path.js"
-    // @include "inc/extended.js"
-    // @include "inc/tree.js"
+                this.extended.init();
+                this.connector.init();
+                this.h5ai.init();
 
-    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(this.h5ai.pathClick, this.h5ai)
+                };
+            }
+        };
 
-    $.h5ai = {
-        click: $.proxy(h5ai.pathClick, h5ai)
-    };
+    // @include "inc/H5ai.js"
+    // @include "inc/Path.js"
+    // @include "inc/PathCache.js"
+    // @include "inc/Connector.js"
+    // @include "inc/Html.js"
+    // @include "inc/Extended.js"
 
     $(function () {
 
-        extended.init();
-        tree.init();
-        h5ai.init();
+        H5aiJs.init();
     });
 
 }(jQuery));
diff --git a/src/h5ai/js/main-php.js b/src/h5ai/js/main-php.js
index 77e5fb6d..570b01cf 100644
--- a/src/h5ai/js/main-php.js
+++ b/src/h5ai/js/main-php.js
@@ -6,22 +6,26 @@
 (function($) {
     "use strict";
 
-    var Objects = {},
-        h5ai;
+    var H5aiJs = {
+            factory: {},
+            init: function () {
+                this.h5ai = new this.factory.H5ai(h5aiOptions, h5aiLangs);
 
-    // @include "inc/h5ai.js"
+                this.h5ai.init();
+                $("#tree").scrollpanel();
+                this.h5ai.shiftTree(false, true);
 
-    h5ai = new Objects.H5ai(h5aiOptions, h5aiLangs);
+                $.h5ai = {
+                    click: $.proxy(this.h5ai.pathClick, this.h5ai)
+                };
+            }
+        };
 
-    $.h5ai = {
-        click: $.proxy(h5ai.pathClick, h5ai)
-    };
+    // @include "inc/H5ai.js"
 
     $(function () {
 
-        h5ai.init();
-        $("#tree").scrollpanel();
-        h5ai.shiftTree(false, true);
+        H5aiJs.init();
     });
 
 }(jQuery));

From caced60eaa2f6d7208c910aa14b07884ec365c28 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Thu, 6 Oct 2011 05:12:29 +0200
Subject: [PATCH 2/4] More refactorings.

---
 build.properties                      |   2 +-
 src/h5ai/js/inc/Extended.js           |  20 ++-
 src/h5ai/js/inc/H5ai.js               |  44 +++----
 src/h5ai/js/inc/Path.js               | 167 ++++++++++++--------------
 src/h5ai/js/inc/PathCache.js          |  15 +--
 src/h5ai/js/inc/jquery.scrollpanel.js |  40 +++---
 src/h5ai/js/inc/jquery.utils.js       |  21 ++--
 src/h5ai/js/main-js.js                |   1 +
 src/h5ai/js/main-php.js               |   1 +
 tools/wepp.ant.xml                    |   4 +-
 10 files changed, 150 insertions(+), 165 deletions(-)

diff --git a/build.properties b/build.properties
index 9ea727a9..061dc895 100644
--- a/build.properties
+++ b/build.properties
@@ -16,5 +16,5 @@ release.dir        = release
 
 
 # tools
-wepp               = tools/wepp
+tool.wepp          = tools/wepp
 
diff --git a/src/h5ai/js/inc/Extended.js b/src/h5ai/js/inc/Extended.js
index 486107c2..d5acd5a4 100644
--- a/src/h5ai/js/inc/Extended.js
+++ b/src/h5ai/js/inc/Extended.js
@@ -99,18 +99,14 @@ H5aiJs.factory.Extended = function () {
 
             $(".folderCount").text($("#extended .entry.folder:not(.parentfolder)").size());
             $(".fileCount").text($("#extended .entry.file").size());
-        },
-        init = function () {
-
-            initTitle();
-            initBreadcrumb();
-            initExtendedView();
-            customize();
-            initCounts();
-        },
-        extended = {
-            init: init
         };
 
-    return extended;
+    this.init = function () {
+
+        initTitle();
+        initBreadcrumb();
+        initExtendedView();
+        customize();
+        initCounts();
+    };
 };
diff --git a/src/h5ai/js/inc/H5ai.js b/src/h5ai/js/inc/H5ai.js
index 79779d7d..70a4df45 100644
--- a/src/h5ai/js/inc/H5ai.js
+++ b/src/h5ai/js/inc/H5ai.js
@@ -2,7 +2,8 @@
 
 H5aiJs.factory.H5ai = function (options, langs) {
 
-    var defaults = {
+    var $window = $(window),
+        defaults = {
             store: {
                 viewmode: "h5ai.viewmode",
                 lang: "h5ai.lang"
@@ -41,7 +42,7 @@ H5aiJs.factory.H5ai = function (options, langs) {
         triggerPathClick = function (path, context) {
 
             $.each(settings.callbacks.pathClick, function (idx, callback) {
-                callback.call(window, path, context);
+                callback(path, context);
             });
         },
         getViewmode = function () {
@@ -82,7 +83,7 @@ H5aiJs.factory.H5ai = function (options, langs) {
 
             var adjustTopSpace = function () {
 
-                var winHeight = $(window).height(),
+                var winHeight = $window.height(),
                     navHeight = $("body > nav").outerHeight(),
                     footerHeight = $("body > footer").outerHeight(),
                     contentSpacing = 50,
@@ -103,7 +104,7 @@ H5aiJs.factory.H5ai = function (options, langs) {
                 } catch (err) {}
             };
 
-            $(window).resize(function () {
+            $window.resize(function () {
                 adjustTopSpace();
             });
             adjustTopSpace();
@@ -141,7 +142,7 @@ H5aiJs.factory.H5ai = function (options, langs) {
                     $(".status.default").show();
                     $(".status.dynamic").empty().hide();
                 }
-         );
+            );
         },
         shiftTree = function (forceVisible, dontAnimate) {
 
@@ -168,7 +169,7 @@ H5aiJs.factory.H5ai = function (options, langs) {
                 function () { shiftTree(true); },
                 function () { shiftTree(); }
             );
-            $(window).resize(function () { shiftTree(); });
+            $window.resize(function () { shiftTree(); });
             shiftTree(false, true);
         },
         linkHoverStates = function () {
@@ -266,7 +267,9 @@ H5aiJs.factory.H5ai = function (options, langs) {
                         $indicator.addClass("open");
                         $entry.find("> .content").replaceWith($content);
                         $("#tree").get(0).updateScrollbar();
-                        initIndicators();
+                        $content.find(".indicator:not(.initiated)")
+                            .click(onIndicatorClick)
+                            .addClass("initiated");
                     }
                 });
             } else if ($indicator.hasClass("open")) {
@@ -285,16 +288,14 @@ H5aiJs.factory.H5ai = function (options, langs) {
         },
         initIndicators = function () {
 
-            $("#tree .entry.folder .indicator:not(.initiated)").each(function () {
-
-                $(this).addClass("initiated").click(onIndicatorClick);
-            });
+            $("#tree .entry.folder .indicator:not(.initiated)")
+                .click(onIndicatorClick)
+                .addClass("initiated");
         },
         initZippedDownload = function () {
 
             var x = 0,
                 y = 0,
-                $window = $(window),
                 selected = function (hrefs) {
 
                     var query, idx;
@@ -377,16 +378,15 @@ H5aiJs.factory.H5ai = function (options, langs) {
             localize(langs, settings.lang, settings.useBrowserLang);
             initIndicators();
             initZippedDownload();
-        },
-        h5ai = {
-            settings: settings,
-            shiftTree: shiftTree,
-            linkHoverStates: linkHoverStates,
-            pathClick: pathClick,
-            triggerPathClick: triggerPathClick,
-            initIndicators: initIndicators,
-            init: init
         };
 
-    return h5ai;
+    return {
+        settings: settings,
+        shiftTree: shiftTree,
+        linkHoverStates: linkHoverStates,
+        pathClick: pathClick,
+        triggerPathClick: triggerPathClick,
+        initIndicators: initIndicators,
+        init: init
+    };
 };
diff --git a/src/h5ai/js/inc/Path.js b/src/h5ai/js/inc/Path.js
index 923944b4..03c1d5ba 100644
--- a/src/h5ai/js/inc/Path.js
+++ b/src/h5ai/js/inc/Path.js
@@ -2,104 +2,95 @@
 
 H5aiJs.factory.Path = function (folder, tableRow) {
 
-    var path,
-        checkedDecodeUri = function (uri) {
+    var checkedDecodeUri = function (uri) {
 
             try { return decodeURI(uri); } catch (err) {}
             return uri;
         },
-        isEmpty = function () {
+        $tds, $img, $a, splits;
 
-            return !path.content || $.isEmptyObject(path.content);
-        },
-        onClick = function (context) {
+    // parentFolder: undefined,
+    // label: undefined,
+    // date: undefined,
+    // size: undefined,
+    // href: undefined,
+    // absHref: undefined,
+    // alt: undefined,
+    // icon16: undefined,
+    // icon48: undefined,
+    // isFolder: undefined,
+    // isParentFolder: undefined,
+    // isCurrentFolder: undefined,
+    // isDomain: undefined,
 
-            H5aiJs.h5ai.triggerPathClick(path, context);
-        },
-        init = function () {
+    this.status = undefined;  // undefined, "h5ai" or HTTP response code
+    this.content = undefined;  // associative array path.absHref -> path
+    this.html = {
+        $crumb: undefined,
+        $extended: undefined,
+        $tree: undefined
+    };
+    this.treeOpen = false;
+    
+    if (!H5aiJs.pathCache.pathEndsWithSlash(folder)) {
+        folder += "/";
+    }
 
-            var $tds, $img, $a, splits;
+    if (tableRow) {
+        $tds = $(tableRow).find("td");
+        $img = $tds.eq(0).find("img");
+        $a = $tds.eq(1).find("a");
 
-            path = {
-                // parentFolder: undefined,
-                // label: undefined,
-                // date: undefined,
-                // size: undefined,
-                // href: undefined,
-                // absHref: undefined,
-                // alt: undefined,
-                // icon16: undefined,
-                // icon48: undefined,
-                // isFolder: undefined,
-                // isParentFolder: undefined,
-                // isCurrentFolder: undefined,
-                // isDomain: undefined,
+        this.parentFolder = folder;
+        this.label = $a.text();
+        this.date = $tds.eq(2).text();
+        this.size = $tds.eq(3).text();
+        this.href = $a.attr("href");
+        this.alt = $img.attr("alt");
+        this.icon16 = $img.attr("src");
+    } else {
+        splits = H5aiJs.pathCache.splitPathname(folder);
 
-                status: undefined,  // undefined, "h5ai" or HTTP response code
-                content: undefined,  // associative array path.absHref -> path
-                html: {
-                    $crumb: undefined,
-                    $extended: undefined,
-                    $tree: undefined
-                },
-                treeOpen: false,
+        this.parentFolder = splits[0];
+        this.label = checkedDecodeUri(splits[1]);
+        if (this.label === "/") {
+            this.label = checkedDecodeUri(document.domain) + "/";
+        }
+        this.date = "";
+        this.size = "";
+        this.href = splits[1];
+        this.alt = "[DIR]";
+        this.icon16 = "/h5ai/icons/16x16/folder.png";
+    }
 
-                isEmpty: isEmpty,
-                onClick: onClick
-            };
+    if (H5aiJs.pathCache.pathEndsWithSlash(this.label)) {
+        this.label = this.label.slice(0, -1);
+    }
 
-            if (!H5aiJs.pathCache.pathEndsWithSlash(folder)) {
-                folder += "/";
-            }
+    this.icon48 = this.icon16.replace("16x16", "48x48");
+    this.isFolder = (this.alt === "[DIR]");
+    this.isParentFolder = (this.isFolder && this.label === "Parent Directory");
+    this.absHref = this.isParentFolder ? this.href : this.parentFolder + this.href;
+    this.isCurrentFolder = (this.absHref === document.location.pathname);
+    this.isDomain = (this.absHref === "/");
 
-            if (tableRow) {
-                $tds = $(tableRow).find("td");
-                $img = $tds.eq(0).find("img");
-                $a = $tds.eq(1).find("a");
-
-                path.parentFolder = folder;
-                path.label = $a.text();
-                path.date = $tds.eq(2).text();
-                path.size = $tds.eq(3).text();
-                path.href = $a.attr("href");
-                path.alt = $img.attr("alt");
-                path.icon16 = $img.attr("src");
-            } else {
-                splits = H5aiJs.pathCache.splitPathname(folder);
-
-                path.parentFolder = splits[0];
-                path.label = checkedDecodeUri(splits[1]);
-                if (path.label === "/") {
-                    path.label = checkedDecodeUri(document.domain) + "/";
-                }
-                path.date = "";
-                path.size = "";
-                path.href = splits[1];
-                path.alt = "[DIR]";
-                path.icon16 = "/h5ai/icons/16x16/folder.png";
-            }
-
-            if (H5aiJs.pathCache.pathEndsWithSlash(path.label)) {
-                path.label = path.label.slice(0, -1);
-            }
-
-            path.icon48 = path.icon16.replace("16x16", "48x48");
-            path.isFolder = (path.alt === "[DIR]");
-            path.isParentFolder = (path.isFolder && path.label === "Parent Directory");
-            path.absHref = path.isParentFolder ? path.href : path.parentFolder + path.href;
-            path.isCurrentFolder = (path.absHref === document.location.pathname);
-            path.isDomain = (path.absHref === "/");
-
-            if (path.isParentFolder && H5aiJs.h5ai.settings.setParentFolderLabels) {
-                if (path.isDomain) {
-                    path.label = checkedDecodeUri(document.domain);
-                } else {
-                    path.label = checkedDecodeUri(H5aiJs.pathCache.splitPathname(H5aiJs.pathCache.splitPathname(path.parentFolder)[0])[1].slice(0, -1));
-                }
-            }
-        };
-
-    init();
-
-    return path;
+    if (this.isParentFolder && H5aiJs.h5ai.settings.setParentFolderLabels) {
+        if (this.isDomain) {
+            this.label = checkedDecodeUri(document.domain);
+        } else {
+            this.label = checkedDecodeUri(H5aiJs.pathCache.splitPathname(H5aiJs.pathCache.splitPathname(this.parentFolder)[0])[1].slice(0, -1));
+        }
+    }
+};
+
+H5aiJs.factory.Path.prototype = {
+    
+    isEmpty: function () {
+
+        return !this.content || $.isEmptyObject(this.content);
+    },
+    onClick: function (context) {
+
+        H5aiJs.h5ai.triggerPathClick(this, context);
+    }
 };
diff --git a/src/h5ai/js/inc/PathCache.js b/src/h5ai/js/inc/PathCache.js
index 90c4edca..f0689616 100644
--- a/src/h5ai/js/inc/PathCache.js
+++ b/src/h5ai/js/inc/PathCache.js
@@ -2,8 +2,7 @@
 
 H5aiJs.factory.PathCache = function () {
 
-    var pathCache,
-        cache = {},
+    var cache = {},
         rePathnameSplit = /^(\/(.*\/)*)([^\/]+\/?)$/,
         rePathEndsWithSlash = /\/$/,
         splitPathname = function (pathname) {
@@ -50,12 +49,8 @@ H5aiJs.factory.PathCache = function () {
             return path;
         };
 
-    pathCache = {
-        splitPathname: splitPathname,
-        pathEndsWithSlash: pathEndsWithSlash,
-        getPath: getPath,
-        cache: cache
-    };
-
-    return pathCache;
+    this.splitPathname = splitPathname;
+    this.pathEndsWithSlash = pathEndsWithSlash;
+    this.getPath = getPath;
+    this.cache = cache;
 };
diff --git a/src/h5ai/js/inc/jquery.scrollpanel.js b/src/h5ai/js/inc/jquery.scrollpanel.js
index af039ce7..78b5af6e 100644
--- a/src/h5ai/js/inc/jquery.scrollpanel.js
+++ b/src/h5ai/js/inc/jquery.scrollpanel.js
@@ -4,15 +4,15 @@
     "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
@@ -21,25 +21,25 @@
             $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)
@@ -55,19 +55,19 @@
                     $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);
                     update();
                     event.stopPropagation();
@@ -90,14 +90,14 @@
                     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);
@@ -106,9 +106,9 @@
                     event.preventDefault();
                 })
                 .each(function () {
-    
+
                     this.onselectstart = function () {
-    
+
                         return false;
                     };
                 });
@@ -119,14 +119,14 @@
                     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);
@@ -134,7 +134,7 @@
                         });
                     event.stopPropagation();
                 });
-    
+
             update();
         };
 
diff --git a/src/h5ai/js/inc/jquery.utils.js b/src/h5ai/js/inc/jquery.utils.js
index 3d74e21b..02d9dac0 100644
--- a/src/h5ai/js/inc/jquery.utils.js
+++ b/src/h5ai/js/inc/jquery.utils.js
@@ -6,6 +6,7 @@
     // http://paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
     // modified
     $.log = function () {
+
         $.log.history = $.log.history || [];
         $.log.history.push(arguments);
         if (window.console) {
@@ -14,17 +15,17 @@
     };
 
     $.timer = (function () {
-        var start = $.now(),
-            last = start,
-            timer = {
-                log: function (label) {
-                    var now = $.now();
-                    $.log("timer", label, "+" + (now - last), "=" + (now - start));
-                    last = now;
-                }
-            };
 
-        return timer;
+        var start = $.now(),
+            last = start;
+
+        return {
+            log: function (label) {
+                var now = $.now();
+                $.log("timer", label, "+" + (now - last), "=" + (now - start));
+                last = now;
+            }
+        };
     }());
 
 }(jQuery));
diff --git a/src/h5ai/js/main-js.js b/src/h5ai/js/main-js.js
index 9aca265f..d4275fd1 100644
--- a/src/h5ai/js/main-js.js
+++ b/src/h5ai/js/main-js.js
@@ -9,6 +9,7 @@
     var H5aiJs = {
             factory: {},
             init: function () {
+
                 this.h5ai = new this.factory.H5ai(h5aiOptions, h5aiLangs);
                 this.pathCache = new this.factory.PathCache();
                 this.connector = new this.factory.Connector();
diff --git a/src/h5ai/js/main-php.js b/src/h5ai/js/main-php.js
index 570b01cf..13e02424 100644
--- a/src/h5ai/js/main-php.js
+++ b/src/h5ai/js/main-php.js
@@ -9,6 +9,7 @@
     var H5aiJs = {
             factory: {},
             init: function () {
+
                 this.h5ai = new this.factory.H5ai(h5aiOptions, h5aiLangs);
 
                 this.h5ai.init();
diff --git a/tools/wepp.ant.xml b/tools/wepp.ant.xml
index 7bbb8d93..2339652e 100644
--- a/tools/wepp.ant.xml
+++ b/tools/wepp.ant.xml
@@ -6,7 +6,7 @@
         <attribute name="toFile" />
         <attribute name="args" default="" />
         <sequential>
-            <exec executable="${wepp}">
+            <exec executable="${tool.wepp}">
                 <arg line="@{args}" />
                 <arg value="--in" />
                 <arg value="@{file}" />
@@ -20,7 +20,7 @@
         <attribute name="dir" />
         <attribute name="args" default="" />
         <sequential>
-            <exec executable="${wepp}">
+            <exec executable="${tool.wepp}">
                 <arg line="@{args}" />
                 <arg value="--inDir" />
                 <arg value="@{dir}" />

From 3c23c7e95680728632103f22301076875a6d9157 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Fri, 7 Oct 2011 16:38:30 +0200
Subject: [PATCH 3/4] Changes default language from  to .

---
 src/h5ai/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/h5ai/options.js b/src/h5ai/options.js
index 163b3298..02221cb7 100644
--- a/src/h5ai/options.js
+++ b/src/h5ai/options.js
@@ -57,7 +57,7 @@ h5aiOptions = {
      * possible values. Adjust it to your needs. If lang is not found in
      * h5aiLangs it defaults to "en".
      */
-    "lang": null,
+    "lang": "en",
 
     /*
      * Try to use browser language, falls back to previous specified lang.

From 4a65ce61df83ec6d8afdae46873130c53e2fdfdd Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sun, 30 Oct 2011 21:50:25 +0100
Subject: [PATCH 4/4] Improves file selection for zipped download. Zipped
 download is now disabled by default.

---
 src/h5ai/css/inc/extended.less                |   4 +-
 src/h5ai/footer.html                          |   4 +-
 src/h5ai/header.html                          |   2 +-
 src/h5ai/header.php                           |   6 +-
 src/h5ai/js/inc/Extended.js                   |   4 +-
 src/h5ai/js/inc/H5ai.js                       | 111 ++++++++++++------
 src/h5ai/js/inc/jquery.utils.js               |  31 -----
 src/h5ai/js/inc/lib/amplify.min.js            |  10 ++
 .../js/{ => inc}/lib/jquery.fracs-core.min.js |   0
 src/h5ai/js/{ => inc}/lib/jquery.min.js       |   0
 .../js/{ => inc}/lib/jquery.mousewheel.min.js |   0
 .../js/inc/{ => lib}/jquery.scrollpanel.js    |   2 +-
 src/h5ai/js/lib/modernizr.min.js              |   4 -
 src/h5ai/js/libs.js                           |   7 ++
 src/h5ai/js/main-js.js                        |   4 -
 src/h5ai/js/main-php.js                       |   4 -
 src/h5ai/js/modernizr.min.js                  |   4 +
 src/h5ai/options.js                           |   4 +-
 src/h5ai/php/zipcontent.php                   |   5 +-
 src/js.htaccess                               |   3 +-
 20 files changed, 109 insertions(+), 100 deletions(-)
 delete mode 100644 src/h5ai/js/inc/jquery.utils.js
 create mode 100644 src/h5ai/js/inc/lib/amplify.min.js
 rename src/h5ai/js/{ => inc}/lib/jquery.fracs-core.min.js (100%)
 rename src/h5ai/js/{ => inc}/lib/jquery.min.js (100%)
 rename src/h5ai/js/{ => inc}/lib/jquery.mousewheel.min.js (100%)
 rename src/h5ai/js/inc/{ => lib}/jquery.scrollpanel.js (99%)
 delete mode 100644 src/h5ai/js/lib/modernizr.min.js
 create mode 100644 src/h5ai/js/libs.js
 create mode 100644 src/h5ai/js/modernizr.min.js

diff --git a/src/h5ai/css/inc/extended.less b/src/h5ai/css/inc/extended.less
index 6aa5b6d0..a89a2c1b 100644
--- a/src/h5ai/css/inc/extended.less
+++ b/src/h5ai/css/inc/extended.less
@@ -45,7 +45,7 @@
                         background-color: #f6f6f6;
                         color: #e80;
                     }
-                    &.selected {
+                    &.selected:not(.selecting), &.selecting:not(.selected) {
                         border-color: rgba(240,100,0,0.2);
                         background-color: rgba(240,100,0,0.2);
                     }
@@ -193,7 +193,7 @@
                         border-color: #eee;
                         background-color: #f6f6f6;
                     }
-                    &.selected {
+                    &.selected:not(.selecting), &.selecting:not(.selected) {
                         border-color: rgba(240,100,0,0.2);
                         background-color: rgba(240,100,0,0.2);
                     }
diff --git a/src/h5ai/footer.html b/src/h5ai/footer.html
index 1d81b3f8..07167e41 100644
--- a/src/h5ai/footer.html
+++ b/src/h5ai/footer.html
@@ -27,9 +27,7 @@
             </span>
         </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/js/libs.js"></script>
     <script src="/h5ai/options.js"></script>
     <script src="/h5ai/js/main-js.js"></script>
 </body>
diff --git a/src/h5ai/header.html b/src/h5ai/header.html
index 7764bd33..11cd52a7 100644
--- a/src/h5ai/header.html
+++ b/src/h5ai/header.html
@@ -14,7 +14,7 @@
     <link rel="apple-touch-icon" type="image/png" href="/h5ai/images/h5ai-48x48.png">
     <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold">
     <link rel="stylesheet" href="/h5ai/css/main-js.css">
-    <script src="/h5ai/js/lib/modernizr.min.js"></script>
+    <script src="/h5ai/js/modernizr.min.js"></script>
 </head>
 <body>
     <div id="selection-rect"></div>
diff --git a/src/h5ai/header.php b/src/h5ai/header.php
index 79ec5817..6e645106 100644
--- a/src/h5ai/header.php
+++ b/src/h5ai/header.php
@@ -15,7 +15,7 @@
     <link rel="apple-touch-icon" type="image/png" href="/h5ai/images/h5ai-48x48.png">
     <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold">
     <link rel="stylesheet" href="/h5ai/css/main-php.css">
-    <script src="/h5ai/js/lib/modernizr.min.js"></script>
+    <script src="/h5ai/js/modernizr.min.js"></script>
 </head>
 <body>
     <div id="selection-rect"></div>
@@ -60,9 +60,7 @@
             </span>
         </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/js/libs.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 d5acd5a4..1de1bec1 100644
--- a/src/h5ai/js/inc/Extended.js
+++ b/src/h5ai/js/inc/Extended.js
@@ -95,7 +95,7 @@ H5aiJs.factory.Extended = function () {
                 }
             });
         },
-        initCounts = function () {
+        initTotals = function () {
 
             $(".folderCount").text($("#extended .entry.folder:not(.parentfolder)").size());
             $(".fileCount").text($("#extended .entry.file").size());
@@ -107,6 +107,6 @@ H5aiJs.factory.Extended = function () {
         initBreadcrumb();
         initExtendedView();
         customize();
-        initCounts();
+        initTotals();
     };
 };
diff --git a/src/h5ai/js/inc/H5ai.js b/src/h5ai/js/inc/H5ai.js
index 70a4df45..6b3d1adb 100644
--- a/src/h5ai/js/inc/H5ai.js
+++ b/src/h5ai/js/inc/H5ai.js
@@ -1,12 +1,13 @@
-/*global window, $, H5aiJs, localStorage */
 
 H5aiJs.factory.H5ai = function (options, langs) {
+    /*global window, $, amplify*/
 
     var $window = $(window),
+        $document = $(document),
         defaults = {
             store: {
-                viewmode: "h5ai.viewmode",
-                lang: "h5ai.lang"
+                viewmode: "h5ai.pref.viewmode",
+                lang: "h5ai.pref.lang"
             },
             callbacks: {
                 pathClick: []
@@ -47,14 +48,14 @@ H5aiJs.factory.H5ai = function (options, langs) {
         },
         getViewmode = function () {
 
-            var viewmode = localStorage.getItem(settings.store.viewmode);
+            var viewmode = amplify.store(settings.store.viewmode);
 
             return $.inArray(viewmode, settings.viewmodes) >= 0 ? viewmode : settings.viewmodes[0];
         },
         applyViewmode = function (viewmode) {
 
             if (viewmode) {
-                localStorage.setItem(settings.store.viewmode, viewmode);
+                amplify.store(settings.store.viewmode, viewmode);
             }
             viewmode = getViewmode();
 
@@ -189,7 +190,7 @@ H5aiJs.factory.H5ai = function (options, langs) {
         },
         localize = function (langs, lang, useBrowserLang) {
 
-            var storedLang = localStorage.getItem(settings.store.lang),
+            var storedLang = amplify.store(settings.store.lang),
                 browserLang, selected, key;
 
             if (langs[storedLang]) {
@@ -219,7 +220,7 @@ H5aiJs.factory.H5ai = function (options, langs) {
         },
         initLangSelector = function (langs) {
 
-            var idx, lang,
+            var $langOptions = $(".langOptions"),
                 sortedLangsKeys = [],
                 $ul;
 
@@ -235,18 +236,22 @@ H5aiJs.factory.H5ai = function (options, langs) {
                     .text(lang + " - " + langs[lang].lang)
                     .appendTo($ul)
                     .click(function () {
-                        localStorage.setItem(settings.store.lang, lang);
+                        amplify.store(settings.store.lang, lang);
                         localize(langs, lang, false);
                     });
             });
             $("#langSelector .langOptions").append($ul);
             $("#langSelector").hover(
                 function () {
-                    var $ele = $(".langOptions");
-                    $ele.css("top", "-" + $ele.outerHeight() + "px").stop(true, true).fadeIn();
+                    $langOptions
+                        .css("top", "-" + $langOptions.outerHeight() + "px")
+                        .stop(true, true)
+                        .fadeIn();
                 },
                 function () {
-                    $(".langOptions").stop(true, true).fadeOut();
+                    $langOptions
+                        .stop(true, true)
+                        .fadeOut();
                 }
             );
         },
@@ -296,14 +301,23 @@ H5aiJs.factory.H5ai = function (options, langs) {
 
             var x = 0,
                 y = 0,
-                selected = function (hrefs) {
+                ctrl = false,
+                updateDownloadBtn = function () {
 
-                    var query, 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);
+                    var query,
+                        href,
+                        $selected = $("#extended a.selected");
+
+                    if ($selected.size() > 0) {
+                        $selected.each(function () {
+                            href = $(this).attr("href");
+                            query = query ? query + ":" + href : href;
+                        });
+                        query = "/h5ai/php/zipcontent.php?hrefs=" + query;
+                        $("#download").show().find("a").attr("href", query);
+                    } else {
+                        $("#download").hide().find("a").attr("href", "#");
+                    }
                 },
                 selectionUpdate = function (event) {
 
@@ -317,41 +331,45 @@ H5aiJs.factory.H5ai = function (options, langs) {
                     $("#selection-rect").css({left: l, top: t, width: w, height: h});
 
                     sel = $("#selection-rect").fracs("rect");
-                    $("#extended a").removeClass("selected").each(function () {
+                    $("#extended a").removeClass("selecting").each(function () {
 
                         var $a = $(this),
                             rect = $a.fracs("rect"),
                             inter = sel.intersection(rect);
                         if (inter && !$a.closest(".entry").hasClass("folder-parent")) {
-                            $a.addClass("selected");
+                            $a.addClass("selecting");
                         }
                     });
                 },
                 selectionEnd = function (event) {
 
                     event.preventDefault();
+                    $document.unbind("mousemove", selectionUpdate);
                     $("#selection-rect").hide().css({left: 0, top: 0, width: 0, height: 0});
-
-                    $window.unbind("mousemove", selectionUpdate);
-
-                    var hrefs = [];
-                    $("#extended a.selected").each(function () {
-                        hrefs.push($(this).attr("href"));
-                    });
-                    if (hrefs.length > 0) {
-                        selected(hrefs);
-                    }
+                    $("#extended a.selecting.selected").removeClass("selecting").removeClass("selected");
+                    $("#extended a.selecting").removeClass("selecting").addClass("selected");
+                    updateDownloadBtn();
                 },
                 selectionStart = function (event) {
 
-                    event.preventDefault();
+                    var view = $.fracs.viewport();
+
                     x = event.pageX;
                     y = event.pageY;
-                    $("#download").hide().find("a").attr("href", "#");
-                    $("#extended a").removeClass("selected");
-                    $("#selection-rect").show().css({left: x, top: y, width: 0, height: 0});
+                    if (x >= view.right || y >= view.bottom) {
+                        // don't block the scrollbars
+                        return;
+                    }
 
-                    $window
+                    event.preventDefault();
+                    if (!ctrl) {
+                        $("#extended a").removeClass("selected");
+                        updateDownloadBtn();
+                    }
+                    $("#selection-rect").show().css({left: x, top: y, width: 0, height: 0});
+                    selectionUpdate(event);
+
+                    $document
                         .bind("mousemove", selectionUpdate)
                         .one("mouseup", selectionEnd);
                 },
@@ -359,12 +377,29 @@ H5aiJs.factory.H5ai = function (options, langs) {
 
                     event.stopPropagation();
                     return false;
+                },
+                noSelectionUnlessCtrl = function (event) {
+
+                    if (!ctrl) {
+                        noSelection(event);
+                    }
                 };
 
             if (settings.zippedDownload) {
-                $("body>nav,body>footer,#tree,#extended a").bind("mousedown", noSelection);
-                $("#extended a").live("mousedown", noSelection);
-                $window.bind("mousedown", selectionStart);
+                $("body>nav,body>footer,#tree").bind("mousedown", noSelection);
+                $("#extended .entry a").bind("mousedown", noSelectionUnlessCtrl).live("mousedown", noSelectionUnlessCtrl);
+                $document
+                    .bind("mousedown", selectionStart)
+                    .keydown(function (event) {
+                        if (event.keyCode === 17) {
+                            ctrl = true;
+                        }
+                    })
+                    .keyup(function (event) {
+                        if (event.keyCode === 17) {
+                            ctrl = false;
+                        }
+                    });
             }
         },
         init = function () {
diff --git a/src/h5ai/js/inc/jquery.utils.js b/src/h5ai/js/inc/jquery.utils.js
deleted file mode 100644
index 02d9dac0..00000000
--- a/src/h5ai/js/inc/jquery.utils.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*global window, jQuery */
-
-(function ($) {
-    "use strict";
-
-    // http://paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
-    // modified
-    $.log = function () {
-
-        $.log.history = $.log.history || [];
-        $.log.history.push(arguments);
-        if (window.console) {
-            window.console.log(Array.prototype.slice.call(arguments));
-        }
-    };
-
-    $.timer = (function () {
-
-        var start = $.now(),
-            last = start;
-
-        return {
-            log: function (label) {
-                var now = $.now();
-                $.log("timer", label, "+" + (now - last), "=" + (now - start));
-                last = now;
-            }
-        };
-    }());
-
-}(jQuery));
diff --git a/src/h5ai/js/inc/lib/amplify.min.js b/src/h5ai/js/inc/lib/amplify.min.js
new file mode 100644
index 00000000..6e6a9a95
--- /dev/null
+++ b/src/h5ai/js/inc/lib/amplify.min.js
@@ -0,0 +1,10 @@
+/*!
+ * AmplifyJS 1.0.0 - Core, Store, Request
+ * 
+ * Copyright 2011 appendTo LLC. (http://appendto.com/team)
+ * Dual licensed under the MIT or GPL licenses.
+ * http://appendto.com/open-source-licenses
+ * 
+ * http://amplifyjs.com
+ */
+(function(a,b){var c=[].slice,d={},e=a.amplify={publish:function(a){var b=c.call(arguments,1),e,f,g=0,h;if(!d[a])return!0;for(f=d[a].length;g<f;g++){e=d[a][g],h=e.callback.apply(e.context,b);if(h===!1)break}return h!==!1},subscribe:function(a,b,c,e){arguments.length===3&&typeof c=="number"&&(e=c,c=b,b=null),arguments.length===2&&(c=b,b=null),e=e||10;var f=0,g=a.split(/\s/),h=g.length;for(;f<h;f++){a=g[f],d[a]||(d[a]=[]);var i=d[a].length-1,j={callback:c,context:b,priority:e};for(;i>=0;i--)if(d[a][i].priority<=e){d[a].splice(i+1,0,j);return c}d[a].unshift(j)}return c},unsubscribe:function(a,b){if(!!d[a]){var c=d[a].length,e=0;for(;e<c;e++)if(d[a][e].callback===b){d[a].splice(e,1);break}}}}})(this),function(a,b){function e(a,e){c.addType(a,function(f,g,h){var i,j,k,l,m=g,n=(new Date).getTime();if(!f){m={},l=[],k=0;try{f=e.length;while(f=e.key(k++))d.test(f)&&(j=JSON.parse(e.getItem(f)),j.expires&&j.expires<=n?l.push(f):m[f.replace(d,"")]=j.data);while(f=l.pop())e.removeItem(f)}catch(o){}return m}f="__amplify__"+f;if(g===b){i=e.getItem(f),j=i?JSON.parse(i):{expires:-1};if(j.expires&&j.expires<=n)e.removeItem(f);else return j.data}else if(g===null)e.removeItem(f);else{j=JSON.stringify({data:g,expires:h.expires?n+h.expires:null});try{e.setItem(f,j)}catch(o){c[a]();try{e.setItem(f,j)}catch(o){throw c.error()}}}return m})}var c=a.store=function(a,b,d,e){var e=c.type;d&&d.type&&d.type in c.types&&(e=d.type);return c.types[e](a,b,d||{})};c.types={},c.type=null,c.addType=function(a,b){c.type||(c.type=a),c.types[a]=b,c[a]=function(b,d,e){e=e||{},e.type=a;return c(b,d,e)}},c.error=function(){return"amplify.store quota exceeded"};var d=/^__amplify__/;for(var f in{localStorage:1,sessionStorage:1})try{window[f].getItem&&e(f,window[f])}catch(g){}if(window.globalStorage)try{e("globalStorage",window.globalStorage[window.location.hostname]),c.type==="sessionStorage"&&(c.type="globalStorage")}catch(g){}(function(){if(!c.types.localStorage){var a=document.createElement("div"),d="amplify";a.style.display="none",document.getElementsByTagName("head")[0].appendChild(a),a.addBehavior&&(a.addBehavior("#default#userdata"),c.addType("userData",function(e,f,g){a.load(d);var h,i,j,k,l,m=f,n=(new Date).getTime();if(!e){m={},l=[],k=0;while(h=a.XMLDocument.documentElement.attributes[k++])i=JSON.parse(h.value),i.expires&&i.expires<=n?l.push(h.name):m[h.name]=i.data;while(e=l.pop())a.removeAttribute(e);a.save(d);return m}e=e.replace(/[^-._0-9A-Za-z\xb7\xc0-\xd6\xd8-\xf6\xf8-\u037d\u37f-\u1fff\u200c-\u200d\u203f\u2040\u2070-\u218f]/g,"-");if(f===b){h=a.getAttribute(e),i=h?JSON.parse(h):{expires:-1};if(i.expires&&i.expires<=n)a.removeAttribute(e);else return i.data}else f===null?a.removeAttribute(e):(j=a.getAttribute(e),i=JSON.stringify({data:f,expires:g.expires?n+g.expires:null}),a.setAttribute(e,i));try{a.save(d)}catch(o){j===null?a.removeAttribute(e):a.setAttribute(e,j),c.userData();try{a.setAttribute(e,i),a.save(d)}catch(o){j===null?a.removeAttribute(e):a.setAttribute(e,j);throw c.error()}}return m}))}})(),function(){function d(a){return a===b?b:JSON.parse(JSON.stringify(a))}var a={};c.addType("memory",function(c,e,f){if(!c)return d(a);if(e===b)return d(a[c]);if(e===null){delete a[c];return null}a[c]=e,f.expires&&setTimeout(function(){delete a[c]},f.expires);return e})}()}(this.amplify=this.amplify||{}),function(a,b){function d(a){return{}.toString.call(a)==="[object Function]"}function c(){}a.request=function(b,e,f){var g=b||{};typeof g=="string"&&(d(e)&&(f=e,e={}),g={resourceId:b,data:e||{},success:f});var h={abort:c},i=a.request.resources[g.resourceId],j=g.success||c,k=g.error||c;g.success=function(b,c){c=c||"success",a.publish("request.success",g,b,c),a.publish("request.complete",g,b,c),j(b,c)},g.error=function(b,c){c=c||"error",a.publish("request.error",g,b,c),a.publish("request.complete",g,b,c),k(b,c)};if(!i){if(!g.resourceId)throw"amplify.request: no resourceId provided";throw"amplify.request: unknown resourceId: "+g.resourceId}if(!a.publish("request.before",g))g.error(null,"abort");else{a.request.resources[g.resourceId](g,h);return h}},a.request.types={},a.request.resources={},a.request.define=function(b,c,d){if(typeof c=="string"){if(!(c in a.request.types))throw"amplify.request.define: unknown type: "+c;d.resourceId=b,a.request.resources[b]=a.request.types[c](d)}else a.request.resources[b]=c}}(amplify),function(a,b,c){var d=["status","statusText","responseText","responseXML","readyState"],e=/\{([^\}]+)\}/g;a.request.types.ajax=function(f){f=b.extend({type:"GET"},f);return function(g,h){function q(a,e){b.each(d,function(a,b){try{p[b]=i[b]}catch(c){}}),/OK$/.test(p.statusText)&&(p.statusText="success"),a===c&&(a=null),o&&(e="abort"),/timeout|error|abort/.test(e)?p.error(a,e):p.success(a,e),q=b.noop}var i,j=f.url,k=g.data,l=h.abort,m={},n=[],o=!1,p={readyState:0,setRequestHeader:function(a,b){return i.setRequestHeader(a,b)},getAllResponseHeaders:function(){return i.getAllResponseHeaders()},getResponseHeader:function(a){return i.getResponseHeader(a)},overrideMimeType:function(a){return i.overrideMideType(a)},abort:function(){o=!0;try{i.abort()}catch(a){}q(null,"abort")},success:function(a,b){g.success(a,b)},error:function(a,b){g.error(a,b)}};typeof k!="string"&&(k=b.extend(!0,{},f.data,k),j=j.replace(e,function(a,b){if(b in k){n.push(b);return k[b]}}),b.each(n,function(a,b){delete k[b]})),b.extend(m,f,{url:j,type:f.type,data:k,dataType:f.dataType,success:function(a,b){q(a,b)},error:function(a,b){q(null,b)},beforeSend:function(b,c){i=b,m=c;var d=f.beforeSend?f.beforeSend.call(this,p,m):!0;return d&&a.publish("request.before.ajax",f,g,m,p)}}),b.ajax(m),h.abort=function(){p.abort(),l.call(this)}}};var f=a.request.cache={_key:function(a,b,c){function g(){return c.charCodeAt(e++)<<24|c.charCodeAt(e++)<<16|c.charCodeAt(e++)<<8|c.charCodeAt(e++)<<0}c=b+c;var d=c.length,e=0,f=g();while(e<d)f^=g();return"request-"+a+"-"+f},_default:function(){var a={};return function(b,c,d,e){var g=f._key(c.resourceId,d.url,d.data),h=b.cache;if(g in a){e.success(a[g]);return!1}var i=e.success;e.success=function(b){a[g]=b,typeof h=="number"&&setTimeout(function(){delete a[g]},h),i.apply(this,arguments)}}}()};a.store&&(b.each(a.store.types,function(b){f[b]=function(c,d,e,g){var h=f._key(d.resourceId,e.url,e.data),i=a.store[b](h);if(i){e.success(i);return!1}var j=g.success;g.success=function(d){a.store[b](h,d,{expires:c.cache.expires}),j.apply(this,arguments)}}}),f.persist=f[a.store.type]),a.subscribe("request.before.ajax",function(a){var b=a.cache;if(b){b=b.type||b;return f[b in f?b:"_default"].apply(this,arguments)}}),a.request.decoders={jsend:function(a,b,c,d,e){a.status==="success"?d(a.data):a.status==="fail"?e(a.data,"fail"):a.status==="error"&&(delete a.status,e(a,"error"))}},a.subscribe("request.before.ajax",function(c,d,e,f){function k(a,b){h(a,b)}function j(a,b){g(a,b)}var g=f.success,h=f.error,i=b.isFunction(c.decoder)?c.decoder:c.decoder in a.request.decoders?a.request.decoders[c.decoder]:a.request.decoders._default;!i||(f.success=function(a,b){i(a,b,f,j,k)},f.error=function(a,b){i(a,b,f,j,k)})})}(amplify,jQuery)
\ No newline at end of file
diff --git a/src/h5ai/js/lib/jquery.fracs-core.min.js b/src/h5ai/js/inc/lib/jquery.fracs-core.min.js
similarity index 100%
rename from src/h5ai/js/lib/jquery.fracs-core.min.js
rename to src/h5ai/js/inc/lib/jquery.fracs-core.min.js
diff --git a/src/h5ai/js/lib/jquery.min.js b/src/h5ai/js/inc/lib/jquery.min.js
similarity index 100%
rename from src/h5ai/js/lib/jquery.min.js
rename to src/h5ai/js/inc/lib/jquery.min.js
diff --git a/src/h5ai/js/lib/jquery.mousewheel.min.js b/src/h5ai/js/inc/lib/jquery.mousewheel.min.js
similarity index 100%
rename from src/h5ai/js/lib/jquery.mousewheel.min.js
rename to src/h5ai/js/inc/lib/jquery.mousewheel.min.js
diff --git a/src/h5ai/js/inc/jquery.scrollpanel.js b/src/h5ai/js/inc/lib/jquery.scrollpanel.js
similarity index 99%
rename from src/h5ai/js/inc/jquery.scrollpanel.js
rename to src/h5ai/js/inc/lib/jquery.scrollpanel.js
index 78b5af6e..a28ca98b 100644
--- a/src/h5ai/js/inc/jquery.scrollpanel.js
+++ b/src/h5ai/js/inc/lib/jquery.scrollpanel.js
@@ -1,7 +1,7 @@
-/*global window, jQuery */
 
 (function ($) {
     "use strict";
+    /*global window, jQuery */
 
     var init = function (htmlElement) {
 
diff --git a/src/h5ai/js/lib/modernizr.min.js b/src/h5ai/js/lib/modernizr.min.js
deleted file mode 100644
index 0c17cfdd..00000000
--- a/src/h5ai/js/lib/modernizr.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.0.4 (Custom Build) | MIT & BSD
- * Contains: fontface | backgroundsize | borderimage | borderradius | boxshadow | flexbox | hsla | multiplebgs | opacity | rgba | textshadow | cssanimations | csscolumns | generatedcontent | cssgradients | cssreflections | csstransforms | csstransforms3d | csstransitions | applicationcache | canvas | canvastext | draganddrop | hashchange | history | audio | video | indexeddb | input | inputtypes | localstorage | postmessage | sessionstorage | websockets | websqldatabase | webworkers | geolocation | inlinesvg | smil | svg | svgclippaths | touch | webgl | iepp | respond | mq | cssclasses | addtest | prefixed | teststyles | testprop | testallprops | hasevent | prefixes | domprefixes | load
- */
-;window.Modernizr=function(a,b,c){function I(){e.input=function(a){for(var b=0,c=a.length;b<c;b++)t[a[b]]=a[b]in l;return t}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)l.setAttribute("type",f=a[d]),e=l.type!=="text",e&&(l.value=m,l.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&l.style.WebkitAppearance!==c?(g.appendChild(l),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(l,null).WebkitAppearance!=="textfield"&&l.offsetHeight!==0,g.removeChild(l)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=l.checkValidity&&l.checkValidity()===!1:/^color$/.test(f)?(g.appendChild(l),g.offsetWidth,e=l.value!=m,g.removeChild(l)):e=l.value!=m)),s[a[d]]=!!e;return s}("search tel url email datetime date month week time datetime-local number range color".split(" "))}function G(a,b){var c=a.charAt(0).toUpperCase()+a.substr(1),d=(a+" "+p.join(c+" ")+c).split(" ");return F(d,b)}function F(a,b){for(var d in a)if(k[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function E(a,b){return!!~(""+a).indexOf(b)}function D(a,b){return typeof a===b}function C(a,b){return B(o.join(a+";")+(b||""))}function B(a){k.cssText=a}var d="2.0.4",e={},f=!0,g=b.documentElement,h=b.head||b.getElementsByTagName("head")[0],i="modernizr",j=b.createElement(i),k=j.style,l=b.createElement("input"),m=":)",n=Object.prototype.toString,o=" -webkit- -moz- -o- -ms- -khtml- ".split(" "),p="Webkit Moz O ms Khtml".split(" "),q={svg:"http://www.w3.org/2000/svg"},r={},s={},t={},u=[],v=function(a,c,d,e){var f,h,j,k=b.createElement("div");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:i+(d+1),k.appendChild(j);f=["&shy;","<style>",a,"</style>"].join(""),k.id=i,k.innerHTML+=f,g.appendChild(k),h=c(k,a),k.parentNode.removeChild(k);return!!h},w=function(b){if(a.matchMedia)return matchMedia(b).matches;var c;v("@media "+b+" { #"+i+" { position: absolute; } }",function(b){c=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).position=="absolute"});return c},x=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=D(e[d],"function"),D(e[d],c)||(e[d]=c),e.removeAttribute(d))),e=null;return f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),y,z={}.hasOwnProperty,A;!D(z,c)&&!D(z.call,c)?A=function(a,b){return z.call(a,b)}:A=function(a,b){return b in a&&D(a.constructor.prototype[b],c)};var H=function(c,d){var f=c.join(""),g=d.length;v(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||j.touch.offsetTop===9,e.csstransforms3d=j.csstransforms3d.offsetLeft===9,e.generatedcontent=j.generatedcontent.offsetHeight>=1,e.fontface=/src/i.test(h)&&h.indexOf(d.split(" ")[0])===0},g,d)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",o.join("touch-enabled),("),i,")","{#touch{top:9px;position:absolute}}"].join(""),["@media (",o.join("transform-3d),("),i,")","{#csstransforms3d{left:9px;position:absolute}}"].join(""),['#generatedcontent:after{content:"',m,'"}'].join("")],["fontface","touch","csstransforms3d","generatedcontent"]);r.flexbox=function(){function c(a,b,c,d){a.style.cssText=o.join(b+":"+c+";")+(d||"")}function a(a,b,c,d){b+=":",a.style.cssText=(b+o.join(c+";"+b)).slice(0,-b.length)+(d||"")}var d=b.createElement("div"),e=b.createElement("div");a(d,"display","box","width:42px;padding:0;"),c(e,"box-flex","1","width:10px;"),d.appendChild(e),g.appendChild(d);var f=e.offsetWidth===42;d.removeChild(e),g.removeChild(d);return f},r.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},r.canvastext=function(){return!!e.canvas&&!!D(b.createElement("canvas").getContext("2d").fillText,"function")},r.webgl=function(){return!!a.WebGLRenderingContext},r.touch=function(){return e.touch},r.geolocation=function(){return!!navigator.geolocation},r.postmessage=function(){return!!a.postMessage},r.websqldatabase=function(){var b=!!a.openDatabase;return b},r.indexedDB=function(){for(var b=-1,c=p.length;++b<c;)if(a[p[b].toLowerCase()+"IndexedDB"])return!0;return!!a.indexedDB},r.hashchange=function(){return x("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},r.history=function(){return!!a.history&&!!history.pushState},r.draganddrop=function(){return x("dragstart")&&x("drop")},r.websockets=function(){for(var b=-1,c=p.length;++b<c;)if(a[p[b]+"WebSocket"])return!0;return"WebSocket"in a},r.rgba=function(){B("background-color:rgba(150,255,150,.5)");return E(k.backgroundColor,"rgba")},r.hsla=function(){B("background-color:hsla(120,40%,100%,.5)");return E(k.backgroundColor,"rgba")||E(k.backgroundColor,"hsla")},r.multiplebgs=function(){B("background:url(https://),url(https://),red url(https://)");return/(url\s*\(.*?){3}/.test(k.background)},r.backgroundsize=function(){return G("backgroundSize")},r.borderimage=function(){return G("borderImage")},r.borderradius=function(){return G("borderRadius")},r.boxshadow=function(){return G("boxShadow")},r.textshadow=function(){return b.createElement("div").style.textShadow===""},r.opacity=function(){C("opacity:.55");return/^0.55$/.test(k.opacity)},r.cssanimations=function(){return G("animationName")},r.csscolumns=function(){return G("columnCount")},r.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";B((a+o.join(b+a)+o.join(c+a)).slice(0,-a.length));return E(k.backgroundImage,"gradient")},r.cssreflections=function(){return G("boxReflect")},r.csstransforms=function(){return!!F(["transformProperty","WebkitTransform","MozTransform","OTransform","msTransform"])},r.csstransforms3d=function(){var a=!!F(["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"]);a&&"webkitPerspective"in g.style&&(a=e.csstransforms3d);return a},r.csstransitions=function(){return G("transitionProperty")},r.fontface=function(){return e.fontface},r.generatedcontent=function(){return e.generatedcontent},r.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType){c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"');var d='video/mp4; codecs="avc1.42E01E';c.h264=a.canPlayType(d+'"')||a.canPlayType(d+', mp4a.40.2"'),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"')}}catch(e){}return c},r.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"'),c.mp3=a.canPlayType("audio/mpeg;"),c.wav=a.canPlayType('audio/wav; codecs="1"'),c.m4a=a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")}catch(d){}return c},r.localstorage=function(){try{return!!localStorage.getItem}catch(a){return!1}},r.sessionstorage=function(){try{return!!sessionStorage.getItem}catch(a){return!1}},r.webworkers=function(){return!!a.Worker},r.applicationcache=function(){return!!a.applicationCache},r.svg=function(){return!!b.createElementNS&&!!b.createElementNS(q.svg,"svg").createSVGRect},r.inlinesvg=function(){var a=b.createElement("div");a.innerHTML="<svg/>";return(a.firstChild&&a.firstChild.namespaceURI)==q.svg},r.smil=function(){return!!b.createElementNS&&/SVG/.test(n.call(b.createElementNS(q.svg,"animate")))},r.svgclippaths=function(){return!!b.createElementNS&&/SVG/.test(n.call(b.createElementNS(q.svg,"clipPath")))};for(var J in r)A(r,J)&&(y=J.toLowerCase(),e[y]=r[J](),u.push((e[y]?"":"no-")+y));e.input||I(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)A(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return;b=typeof b=="boolean"?b:!!b(),g.className+=" "+(b?"":"no-")+a,e[a]=b}return e},B(""),j=l=null,a.attachEvent&&function(){var a=b.createElement("div");a.innerHTML="<elem></elem>";return a.childNodes.length!==1}()&&function(a,b){function s(a){var b=-1;while(++b<g)a.createElement(f[b])}a.iepp=a.iepp||{};var d=a.iepp,e=d.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",f=e.split("|"),g=f.length,h=new RegExp("(^|\\s)("+e+")","gi"),i=new RegExp("<(/*)("+e+")","gi"),j=/^\s*[\{\}]\s*$/,k=new RegExp("(^|[^\\n]*?\\s)("+e+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),l=b.createDocumentFragment(),m=b.documentElement,n=m.firstChild,o=b.createElement("body"),p=b.createElement("style"),q=/print|all/,r;d.getCSS=function(a,b){if(a+""===c)return"";var e=-1,f=a.length,g,h=[];while(++e<f){g=a[e];if(g.disabled)continue;b=g.media||b,q.test(b)&&h.push(d.getCSS(g.imports,b),g.cssText),b="all"}return h.join("")},d.parseCSS=function(a){var b=[],c;while((c=k.exec(a))!=null)b.push(((j.exec(c[1])?"\n":c[1])+c[2]+c[3]).replace(h,"$1.iepp_$2")+c[4]);return b.join("\n")},d.writeHTML=function(){var a=-1;r=r||b.body;while(++a<g){var c=b.getElementsByTagName(f[a]),d=c.length,e=-1;while(++e<d)c[e].className.indexOf("iepp_")<0&&(c[e].className+=" iepp_"+f[a])}l.appendChild(r),m.appendChild(o),o.className=r.className,o.id=r.id,o.innerHTML=r.innerHTML.replace(i,"<$1font")},d._beforePrint=function(){p.styleSheet.cssText=d.parseCSS(d.getCSS(b.styleSheets,"all")),d.writeHTML()},d.restoreHTML=function(){o.innerHTML="",m.removeChild(o),m.appendChild(r)},d._afterPrint=function(){d.restoreHTML(),p.styleSheet.cssText=""},s(b),s(l);d.disablePP||(n.insertBefore(p,n.firstChild),p.media="print",p.className="iepp-printshim",a.attachEvent("onbeforeprint",d._beforePrint),a.attachEvent("onafterprint",d._afterPrint))}(a,b),e._version=d,e._prefixes=o,e._domPrefixes=p,e.mq=w,e.hasEvent=x,e.testProp=function(a){return F([a])},e.testAllProps=G,e.testStyles=v,e.prefixed=function(a){return G(a,"pfx")},g.className=g.className.replace(/\bno-js\b/,"")+(f?" js "+u.join(" "):"");return e}(this,this.document),function(a,b){function u(){r(!0)}a.respond={},respond.update=function(){},respond.mediaQueriesSupported=b;if(!b){var c=a.document,d=c.documentElement,e=[],f=[],g=[],h={},i=30,j=c.getElementsByTagName("head")[0]||d,k=j.getElementsByTagName("link"),l=[],m=function(){var b=k,c=b.length,d=0,e,f,g,i;for(;d<c;d++)e=b[d],f=e.href,g=e.media,i=e.rel&&e.rel.toLowerCase()==="stylesheet",!!f&&i&&!h[f]&&(!/^([a-zA-Z]+?:(\/\/)?(www\.)?)/.test(f)||f.replace(RegExp.$1,"").split("/")[0]===a.location.host?l.push({href:f,media:g}):h[f]=!0);n()},n=function(){if(l.length){var a=l.shift();s(a.href,function(b){o(b,a.href,a.media),h[a.href]=!0,n()})}},o=function(a,b,c){var d=a.match(/@media[^\{]+\{([^\{\}]+\{[^\}\{]+\})+/gi),g=d&&d.length||0,b=b.substring(0,b.lastIndexOf("/")),h=function(a){return a.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+b+"$2$3")},i=!g&&c,j=0,k,l,m,n,o;b.length&&(b+="/"),i&&(g=1);for(;j<g;j++){k=0,i?(l=c,f.push(h(a))):(l=d[j].match(/@media ([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1,f.push(RegExp.$2&&h(RegExp.$2))),n=l.split(","),o=n.length;for(;k<o;k++)m=n[k],e.push({media:m.match(/(only\s+)?([a-zA-Z]+)(\sand)?/)&&RegExp.$2,rules:f.length-1,minw:m.match(/\(min\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/)&&parseFloat(RegExp.$1),maxw:m.match(/\(max\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/)&&parseFloat(RegExp.$1)})}r()},p,q,r=function(a){var b="clientWidth",h=d[b],l=c.compatMode==="CSS1Compat"&&h||c.body[b]||h,m={},n=c.createDocumentFragment(),o=k[k.length-1],s=(new Date).getTime();if(a&&p&&s-p<i)clearTimeout(q),q=setTimeout(r,i);else{p=s;for(var t in e){var u=e[t];if(!u.minw&&!u.maxw||(!u.minw||u.minw&&l>=u.minw)&&(!u.maxw||u.maxw&&l<=u.maxw))m[u.media]||(m[u.media]=[]),m[u.media].push(f[u.rules])}for(var t in g)g[t]&&g[t].parentNode===j&&j.removeChild(g[t]);for(var t in m){var v=c.createElement("style"),w=m[t].join("\n");v.type="text/css",v.media=t,v.styleSheet?v.styleSheet.cssText=w:v.appendChild(c.createTextNode(w)),n.appendChild(v),g.push(v)}j.insertBefore(n,o.nextSibling)}},s=function(a,b){var c=t();if(!!c){c.open("GET",a,!0),c.onreadystatechange=function(){c.readyState==4&&(c.status==200||c.status==304)&&b(c.responseText)};if(c.readyState==4)return;c.send()}},t=function(){var a=!1,b=[function(){return new ActiveXObject("Microsoft.XMLHTTP")},function(){return new XMLHttpRequest}],c=b.length;while(c--){try{a=b[c]()}catch(d){continue}break}return function(){return a}}();m(),respond.update=m,a.addEventListener?a.addEventListener("resize",u,!1):a.attachEvent&&a.attachEvent("onresize",u)}}(this,Modernizr.mq("only all")),function(a,b,c){function k(a){return!a||a=="loaded"||a=="complete"}function j(){var a=1,b=-1;while(p.length- ++b)if(p[b].s&&!(a=p[b].r))break;a&&g()}function i(a){var c=b.createElement("script"),d;c.src=a.s,c.onreadystatechange=c.onload=function(){!d&&k(c.readyState)&&(d=1,j(),c.onload=c.onreadystatechange=null)},m(function(){d||(d=1,j())},H.errorTimeout),a.e?c.onload():n.parentNode.insertBefore(c,n)}function h(a){var c=b.createElement("link"),d;c.href=a.s,c.rel="stylesheet",c.type="text/css",!a.e&&(w||r)?function a(b){m(function(){if(!d)try{b.sheet.cssRules.length?(d=1,j()):a(b)}catch(c){c.code==1e3||c.message=="security"||c.message=="denied"?(d=1,m(function(){j()},0)):a(b)}},0)}(c):(c.onload=function(){d||(d=1,m(function(){j()},0))},a.e&&c.onload()),m(function(){d||(d=1,j())},H.errorTimeout),!a.e&&n.parentNode.insertBefore(c,n)}function g(){var a=p.shift();q=1,a?a.t?m(function(){a.t=="c"?h(a):i(a)},0):(a(),j()):q=0}function f(a,c,d,e,f,h){function i(){!o&&k(l.readyState)&&(r.r=o=1,!q&&j(),l.onload=l.onreadystatechange=null,m(function(){u.removeChild(l)},0))}var l=b.createElement(a),o=0,r={t:d,s:c,e:h};l.src=l.data=c,!s&&(l.style.display="none"),l.width=l.height="0",a!="object"&&(l.type=d),l.onload=l.onreadystatechange=i,a=="img"?l.onerror=i:a=="script"&&(l.onerror=function(){r.e=r.r=1,g()}),p.splice(e,0,r),u.insertBefore(l,s?null:n),m(function(){o||(u.removeChild(l),r.r=r.e=o=1,j())},H.errorTimeout)}function e(a,b,c){var d=b=="c"?z:y;q=0,b=b||"j",C(a)?f(d,a,b,this.i++,l,c):(p.splice(this.i++,0,a),p.length==1&&g());return this}function d(){var a=H;a.loader={load:e,i:0};return a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=r&&!s,u=s?l:n.parentNode,v=a.opera&&o.call(a.opera)=="[object Opera]",w="webkitAppearance"in l.style,x=w&&"async"in b.createElement("script"),y=r?"object":v||x?"img":"script",z=w?"img":y,A=Array.isArray||function(a){return o.call(a)=="[object Array]"},B=function(a){return typeof a=="object"},C=function(a){return typeof a=="string"},D=function(a){return o.call(a)=="[object Function]"},E=[],F={},G,H;H=function(a){function f(a){var b=a.split("!"),c=E.length,d=b.pop(),e=b.length,f={url:d,origUrl:d,prefixes:b},g,h;for(h=0;h<e;h++)g=F[b[h]],g&&(f=g(f));for(h=0;h<c;h++)f=E[h](f);return f}function e(a,b,e,g,h){var i=f(a),j=i.autoCallback;if(!i.bypass){b&&(b=D(b)?b:b[a]||b[g]||b[a.split("/").pop().split("?")[0]]);if(i.instead)return i.instead(a,b,e,g,h);e.load(i.url,i.forceCSS||!i.forceJS&&/css$/.test(i.url)?"c":c,i.noexec),(D(b)||D(j))&&e.load(function(){d(),b&&b(i.origUrl,h,g),j&&j(i.origUrl,h,g)})}}function b(a,b){function c(a){if(C(a))e(a,h,b,0,d);else if(B(a))for(i in a)a.hasOwnProperty(i)&&e(a[i],h,b,i,d)}var d=!!a.test,f=d?a.yep:a.nope,g=a.load||a.both,h=a.callback,i;c(f),c(g),a.complete&&b.load(a.complete)}var g,h,i=this.yepnope.loader;if(C(a))e(a,0,i,0);else if(A(a))for(g=0;g<a.length;g++)h=a[g],C(h)?e(h,0,i,0):A(h)?H(h):B(h)&&b(h,i);else B(a)&&b(a,i)},H.addPrefix=function(a,b){F[a]=b},H.addFilter=function(a){E.push(a)},H.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",G=function(){b.removeEventListener("DOMContentLoaded",G,0),b.readyState="complete"},0)),a.yepnope=d()}(this,this.document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/src/h5ai/js/libs.js b/src/h5ai/js/libs.js
new file mode 100644
index 00000000..a09a2632
--- /dev/null
+++ b/src/h5ai/js/libs.js
@@ -0,0 +1,7 @@
+
+// @include "inc/lib/jquery.min.js"
+// @include "inc/lib/jquery.mousewheel.min.js"
+// @include "inc/lib/jquery.fracs-core.min.js"
+// @include "inc/lib/jquery.scrollpanel.js"
+
+// @include "inc/lib/amplify.min.js"
diff --git a/src/h5ai/js/main-js.js b/src/h5ai/js/main-js.js
index d4275fd1..d0cd2b38 100644
--- a/src/h5ai/js/main-js.js
+++ b/src/h5ai/js/main-js.js
@@ -1,7 +1,3 @@
-/*global jQuery, h5aiOptions, h5aiLangs*/
-
-// @include "inc/jquery.scrollpanel.js"
-// @include "inc/jquery.utils.js"
 
 (function($) {
     "use strict";
diff --git a/src/h5ai/js/main-php.js b/src/h5ai/js/main-php.js
index 13e02424..59974fc0 100644
--- a/src/h5ai/js/main-php.js
+++ b/src/h5ai/js/main-php.js
@@ -1,7 +1,3 @@
-/*global jQuery, h5aiOptions, h5aiLangs*/
-
-// @include "inc/jquery.scrollpanel.js"
-// @include "inc/jquery.utils.js"
 
 (function($) {
     "use strict";
diff --git a/src/h5ai/js/modernizr.min.js b/src/h5ai/js/modernizr.min.js
new file mode 100644
index 00000000..68440dfe
--- /dev/null
+++ b/src/h5ai/js/modernizr.min.js
@@ -0,0 +1,4 @@
+/* Modernizr 2.0.6 (Custom Build) | MIT & BSD
+ * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-iepp-cssclasses-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
+ */
+;window.Modernizr=function(a,b,c){function G(){e.input=function(a){for(var b=0,c=a.length;b<c;b++)s[a[b]]=a[b]in l;return s}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)l.setAttribute("type",f=a[d]),e=l.type!=="text",e&&(l.value=m,l.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&l.style.WebkitAppearance!==c?(g.appendChild(l),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(l,null).WebkitAppearance!=="textfield"&&l.offsetHeight!==0,g.removeChild(l)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=l.checkValidity&&l.checkValidity()===!1:/^color$/.test(f)?(g.appendChild(l),g.offsetWidth,e=l.value!=m,g.removeChild(l)):e=l.value!=m)),r[a[d]]=!!e;return r}("search tel url email datetime date month week time datetime-local number range color".split(" "))}function E(a,b){var c=a.charAt(0).toUpperCase()+a.substr(1),d=(a+" "+p.join(c+" ")+c).split(" ");return D(d,b)}function D(a,b){for(var d in a)if(k[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function C(a,b){return!!~(""+a).indexOf(b)}function B(a,b){return typeof a===b}function A(a,b){return z(o.join(a+";")+(b||""))}function z(a){k.cssText=a}var d="2.0.6",e={},f=!0,g=b.documentElement,h=b.head||b.getElementsByTagName("head")[0],i="modernizr",j=b.createElement(i),k=j.style,l=b.createElement("input"),m=":)",n=Object.prototype.toString,o=" -webkit- -moz- -o- -ms- -khtml- ".split(" "),p="Webkit Moz O ms Khtml".split(" "),q={},r={},s={},t=[],u=function(a,c,d,e){var f,h,j,k=b.createElement("div");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:i+(d+1),k.appendChild(j);f=["&shy;","<style>",a,"</style>"].join(""),k.id=i,k.innerHTML+=f,g.appendChild(k),h=c(k,a),k.parentNode.removeChild(k);return!!h},v=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=B(e[d],"function"),B(e[d],c)||(e[d]=c),e.removeAttribute(d))),e=null;return f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),w,x={}.hasOwnProperty,y;!B(x,c)&&!B(x.call,c)?y=function(a,b){return x.call(a,b)}:y=function(a,b){return b in a&&B(a.constructor.prototype[b],c)};var F=function(a,c){var d=a.join(""),f=c.length;u(d,function(a,c){var d=b.styleSheets[b.styleSheets.length-1],g=d.cssRules&&d.cssRules[0]?d.cssRules[0].cssText:d.cssText||"",h=a.childNodes,i={};while(f--)i[h[f].id]=h[f];e.csstransforms3d=i.csstransforms3d.offsetLeft===9,e.generatedcontent=i.generatedcontent.offsetHeight>=1,e.fontface=/src/i.test(g)&&g.indexOf(c.split(" ")[0])===0},f,c)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",o.join("transform-3d),("),i,")","{#csstransforms3d{left:9px;position:absolute}}"].join(""),['#generatedcontent:after{content:"',m,'";visibility:hidden}'].join("")],["fontface","csstransforms3d","generatedcontent"]);q.flexbox=function(){function c(a,b,c,d){a.style.cssText=o.join(b+":"+c+";")+(d||"")}function a(a,b,c,d){b+=":",a.style.cssText=(b+o.join(c+";"+b)).slice(0,-b.length)+(d||"")}var d=b.createElement("div"),e=b.createElement("div");a(d,"display","box","width:42px;padding:0;"),c(e,"box-flex","1","width:10px;"),d.appendChild(e),g.appendChild(d);var f=e.offsetWidth===42;d.removeChild(e),g.removeChild(d);return f},q.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},q.canvastext=function(){return!!e.canvas&&!!B(b.createElement("canvas").getContext("2d").fillText,"function")},q.postmessage=function(){return!!a.postMessage},q.websqldatabase=function(){var b=!!a.openDatabase;return b},q.indexedDB=function(){for(var b=-1,c=p.length;++b<c;)if(a[p[b].toLowerCase()+"IndexedDB"])return!0;return!!a.indexedDB},q.hashchange=function(){return v("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},q.history=function(){return!!a.history&&!!history.pushState},q.draganddrop=function(){return v("dragstart")&&v("drop")},q.websockets=function(){for(var b=-1,c=p.length;++b<c;)if(a[p[b]+"WebSocket"])return!0;return"WebSocket"in a},q.rgba=function(){z("background-color:rgba(150,255,150,.5)");return C(k.backgroundColor,"rgba")},q.hsla=function(){z("background-color:hsla(120,40%,100%,.5)");return C(k.backgroundColor,"rgba")||C(k.backgroundColor,"hsla")},q.multiplebgs=function(){z("background:url(https://),url(https://),red url(https://)");return/(url\s*\(.*?){3}/.test(k.background)},q.backgroundsize=function(){return E("backgroundSize")},q.borderimage=function(){return E("borderImage")},q.borderradius=function(){return E("borderRadius")},q.boxshadow=function(){return E("boxShadow")},q.textshadow=function(){return b.createElement("div").style.textShadow===""},q.opacity=function(){A("opacity:.55");return/^0.55$/.test(k.opacity)},q.cssanimations=function(){return E("animationName")},q.csscolumns=function(){return E("columnCount")},q.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";z((a+o.join(b+a)+o.join(c+a)).slice(0,-a.length));return C(k.backgroundImage,"gradient")},q.cssreflections=function(){return E("boxReflect")},q.csstransforms=function(){return!!D(["transformProperty","WebkitTransform","MozTransform","OTransform","msTransform"])},q.csstransforms3d=function(){var a=!!D(["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"]);a&&"webkitPerspective"in g.style&&(a=e.csstransforms3d);return a},q.csstransitions=function(){return E("transitionProperty")},q.fontface=function(){return e.fontface},q.generatedcontent=function(){return e.generatedcontent},q.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType){c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"');var d='video/mp4; codecs="avc1.42E01E';c.h264=a.canPlayType(d+'"')||a.canPlayType(d+', mp4a.40.2"'),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"')}}catch(e){}return c},q.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"'),c.mp3=a.canPlayType("audio/mpeg;"),c.wav=a.canPlayType('audio/wav; codecs="1"'),c.m4a=a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")}catch(d){}return c},q.localstorage=function(){try{return!!localStorage.getItem}catch(a){return!1}},q.sessionstorage=function(){try{return!!sessionStorage.getItem}catch(a){return!1}},q.webworkers=function(){return!!a.Worker},q.applicationcache=function(){return!!a.applicationCache};for(var H in q)y(q,H)&&(w=H.toLowerCase(),e[w]=q[H](),t.push((e[w]?"":"no-")+w));e.input||G(),z(""),j=l=null,a.attachEvent&&function(){var a=b.createElement("div");a.innerHTML="<elem></elem>";return a.childNodes.length!==1}()&&function(a,b){function s(a){var b=-1;while(++b<g)a.createElement(f[b])}a.iepp=a.iepp||{};var d=a.iepp,e=d.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",f=e.split("|"),g=f.length,h=new RegExp("(^|\\s)("+e+")","gi"),i=new RegExp("<(/*)("+e+")","gi"),j=/^\s*[\{\}]\s*$/,k=new RegExp("(^|[^\\n]*?\\s)("+e+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),l=b.createDocumentFragment(),m=b.documentElement,n=m.firstChild,o=b.createElement("body"),p=b.createElement("style"),q=/print|all/,r;d.getCSS=function(a,b){if(a+""===c)return"";var e=-1,f=a.length,g,h=[];while(++e<f){g=a[e];if(g.disabled)continue;b=g.media||b,q.test(b)&&h.push(d.getCSS(g.imports,b),g.cssText),b="all"}return h.join("")},d.parseCSS=function(a){var b=[],c;while((c=k.exec(a))!=null)b.push(((j.exec(c[1])?"\n":c[1])+c[2]+c[3]).replace(h,"$1.iepp_$2")+c[4]);return b.join("\n")},d.writeHTML=function(){var a=-1;r=r||b.body;while(++a<g){var c=b.getElementsByTagName(f[a]),d=c.length,e=-1;while(++e<d)c[e].className.indexOf("iepp_")<0&&(c[e].className+=" iepp_"+f[a])}l.appendChild(r),m.appendChild(o),o.className=r.className,o.id=r.id,o.innerHTML=r.innerHTML.replace(i,"<$1font")},d._beforePrint=function(){p.styleSheet.cssText=d.parseCSS(d.getCSS(b.styleSheets,"all")),d.writeHTML()},d.restoreHTML=function(){o.innerHTML="",m.removeChild(o),m.appendChild(r)},d._afterPrint=function(){d.restoreHTML(),p.styleSheet.cssText=""},s(b),s(l);d.disablePP||(n.insertBefore(p,n.firstChild),p.media="print",p.className="iepp-printshim",a.attachEvent("onbeforeprint",d._beforePrint),a.attachEvent("onafterprint",d._afterPrint))}(a,b),e._version=d,e._prefixes=o,e._domPrefixes=p,e.hasEvent=v,e.testProp=function(a){return D([a])},e.testAllProps=E,e.testStyles=u,g.className=g.className.replace(/\bno-js\b/,"")+(f?" js "+t.join(" "):"");return e}(this,this.document),function(a,b,c){function k(a){return!a||a=="loaded"||a=="complete"}function j(){var a=1,b=-1;while(p.length- ++b)if(p[b].s&&!(a=p[b].r))break;a&&g()}function i(a){var c=b.createElement("script"),d;c.src=a.s,c.onreadystatechange=c.onload=function(){!d&&k(c.readyState)&&(d=1,j(),c.onload=c.onreadystatechange=null)},m(function(){d||(d=1,j())},H.errorTimeout),a.e?c.onload():n.parentNode.insertBefore(c,n)}function h(a){var c=b.createElement("link"),d;c.href=a.s,c.rel="stylesheet",c.type="text/css";if(!a.e&&(w||r)){var e=function(a){m(function(){if(!d)try{a.sheet.cssRules.length?(d=1,j()):e(a)}catch(b){b.code==1e3||b.message=="security"||b.message=="denied"?(d=1,m(function(){j()},0)):e(a)}},0)};e(c)}else c.onload=function(){d||(d=1,m(function(){j()},0))},a.e&&c.onload();m(function(){d||(d=1,j())},H.errorTimeout),!a.e&&n.parentNode.insertBefore(c,n)}function g(){var a=p.shift();q=1,a?a.t?m(function(){a.t=="c"?h(a):i(a)},0):(a(),j()):q=0}function f(a,c,d,e,f,h){function i(){!o&&k(l.readyState)&&(r.r=o=1,!q&&j(),l.onload=l.onreadystatechange=null,m(function(){u.removeChild(l)},0))}var l=b.createElement(a),o=0,r={t:d,s:c,e:h};l.src=l.data=c,!s&&(l.style.display="none"),l.width=l.height="0",a!="object"&&(l.type=d),l.onload=l.onreadystatechange=i,a=="img"?l.onerror=i:a=="script"&&(l.onerror=function(){r.e=r.r=1,g()}),p.splice(e,0,r),u.insertBefore(l,s?null:n),m(function(){o||(u.removeChild(l),r.r=r.e=o=1,j())},H.errorTimeout)}function e(a,b,c){var d=b=="c"?z:y;q=0,b=b||"j",C(a)?f(d,a,b,this.i++,l,c):(p.splice(this.i++,0,a),p.length==1&&g());return this}function d(){var a=H;a.loader={load:e,i:0};return a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=r&&!s,u=s?l:n.parentNode,v=a.opera&&o.call(a.opera)=="[object Opera]",w="webkitAppearance"in l.style,x=w&&"async"in b.createElement("script"),y=r?"object":v||x?"img":"script",z=w?"img":y,A=Array.isArray||function(a){return o.call(a)=="[object Array]"},B=function(a){return Object(a)===a},C=function(a){return typeof a=="string"},D=function(a){return o.call(a)=="[object Function]"},E=[],F={},G,H;H=function(a){function f(a){var b=a.split("!"),c=E.length,d=b.pop(),e=b.length,f={url:d,origUrl:d,prefixes:b},g,h;for(h=0;h<e;h++)g=F[b[h]],g&&(f=g(f));for(h=0;h<c;h++)f=E[h](f);return f}function e(a,b,e,g,h){var i=f(a),j=i.autoCallback;if(!i.bypass){b&&(b=D(b)?b:b[a]||b[g]||b[a.split("/").pop().split("?")[0]]);if(i.instead)return i.instead(a,b,e,g,h);e.load(i.url,i.forceCSS||!i.forceJS&&/css$/.test(i.url)?"c":c,i.noexec),(D(b)||D(j))&&e.load(function(){d(),b&&b(i.origUrl,h,g),j&&j(i.origUrl,h,g)})}}function b(a,b){function c(a){if(C(a))e(a,h,b,0,d);else if(B(a))for(i in a)a.hasOwnProperty(i)&&e(a[i],h,b,i,d)}var d=!!a.test,f=d?a.yep:a.nope,g=a.load||a.both,h=a.callback,i;c(f),c(g),a.complete&&b.load(a.complete)}var g,h,i=this.yepnope.loader;if(C(a))e(a,0,i,0);else if(A(a))for(g=0;g<a.length;g++)h=a[g],C(h)?e(h,0,i,0):A(h)?H(h):B(h)&&b(h,i);else B(a)&&b(a,i)},H.addPrefix=function(a,b){F[a]=b},H.addFilter=function(a){E.push(a)},H.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",G=function(){b.removeEventListener("DOMContentLoaded",G,0),b.readyState="complete"},0)),a.yepnope=d()}(this,this.document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/src/h5ai/options.js b/src/h5ai/options.js
index 02221cb7..d296ea2c 100644
--- a/src/h5ai/options.js
+++ b/src/h5ai/options.js
@@ -103,7 +103,7 @@ h5aiOptions = {
      * Enable zipped download of selected entries. Requieres
      * PHP on the server.
      */
-    "zippedDownload": true
+    "zippedDownload": false
 };
 
 
@@ -194,7 +194,7 @@ h5aiLangs = {
         "empty": "vide",
         "folders": "Répertoires",
         "files": "Fichiers",
-        "download": "download"
+        "download": "télécharger"
     },
 
     "it": {
diff --git a/src/h5ai/php/zipcontent.php b/src/h5ai/php/zipcontent.php
index 76ad5ba4..fe68ea60 100644
--- a/src/h5ai/php/zipcontent.php
+++ b/src/h5ai/php/zipcontent.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!array_key_exists("hrefs", $_REQUEST)) {
-    echo "failed";
+    echo "1: no href specified";
     exit;
 }
 
@@ -12,7 +12,6 @@ $h5ai = new H5ai();
 $zipit = new ZipIt($h5ai);
 
 $hrefs = explode(":", trim($_REQUEST["hrefs"]));
-
 $zipFile = $zipit->zip($hrefs);
 
 if ($zipFile !== false) {
@@ -22,7 +21,7 @@ if ($zipFile !== false) {
     header("Connection: close");
     readfile($zipFile);
 } else {
-    echo "sorry, something went wrong while building the zip.";
+    echo "2: something went wrong while building the zip";
 }
 
 ?>
\ No newline at end of file
diff --git a/src/js.htaccess b/src/js.htaccess
index 39436a20..d18f8cff 100644
--- a/src/js.htaccess
+++ b/src/js.htaccess
@@ -27,7 +27,8 @@ IndexIgnore          h5ai  h5ai.header.html  h5ai.footer.html
 # table options
 ################################
 
-# syntax for default sort order is: IndexOrderDefault Ascending|Descending Name|Date|Size
+# syntax for default sort order is:
+# IndexOrderDefault Ascending|Descending Name|Date|Size
 IndexOrderDefault    Ascending Name
 
 IndexOptions         Type=text/html;h5ai=%BUILD_VERSION%