More refactorings.

build.properties

@@ -16,5 +16,5 @@ release.dir        = release
 
 
 # tools
-wepp               = tools/wepp
+tool.wepp          = tools/wepp
 

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();
+    };
 };

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 () {
+            $("#tree .entry.folder .indicator:not(.initiated)")
-
+                .click(onIndicatorClick)
-                $(this).addClass("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
+    };
 };

src/h5ai/js/inc/Path.js

@@ -2,104 +2,95 @@
 
 H5aiJs.factory.Path = function (folder, tableRow) {
 
-    var path,
+    var checkedDecodeUri = function (uri) {
-        checkedDecodeUri = function (uri) {
 
             try { return decodeURI(uri); } catch (err) {}
             return uri;
         },
-        isEmpty = function () {
+        $tds, $img, $a, splits;
 
-            return !path.content || $.isEmptyObject(path.content);
+    // parentFolder: undefined,
-        },
+    // label: undefined,
-        onClick = function (context) {
+    // 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);
+    this.status = undefined;  // undefined, "h5ai" or HTTP response code
-        },
+    this.content = undefined;  // associative array path.absHref -> path
-        init = function () {
+    this.html = {
+        $crumb: undefined,
+        $extended: undefined,
+        $tree: undefined
+    };
+    this.treeOpen = false;
     
-            var $tds, $img, $a, splits;
+    if (!H5aiJs.pathCache.pathEndsWithSlash(folder)) {
+        folder += "/";
+    }
 
-            path = {
+    if (tableRow) {
-                // parentFolder: undefined,
+        $tds = $(tableRow).find("td");
-                // label: undefined,
+        $img = $tds.eq(0).find("img");
-                // date: undefined,
+        $a = $tds.eq(1).find("a");
-                // 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
+        this.parentFolder = folder;
-                content: undefined,  // associative array path.absHref -> path
+        this.label = $a.text();
-                html: {
+        this.date = $tds.eq(2).text();
-                    $crumb: undefined,
+        this.size = $tds.eq(3).text();
-                    $extended: undefined,
+        this.href = $a.attr("href");
-                    $tree: undefined
+        this.alt = $img.attr("alt");
-                },
+        this.icon16 = $img.attr("src");
-                treeOpen: false,
+    } else {
+        splits = H5aiJs.pathCache.splitPathname(folder);
 
-                isEmpty: isEmpty,
+        this.parentFolder = splits[0];
-                onClick: onClick
+        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";
+    }
 
-            if (!H5aiJs.pathCache.pathEndsWithSlash(folder)) {
+    if (H5aiJs.pathCache.pathEndsWithSlash(this.label)) {
-                folder += "/";
+        this.label = this.label.slice(0, -1);
-            }
+    }
 
-            if (tableRow) {
+    this.icon48 = this.icon16.replace("16x16", "48x48");
-                $tds = $(tableRow).find("td");
+    this.isFolder = (this.alt === "[DIR]");
-                $img = $tds.eq(0).find("img");
+    this.isParentFolder = (this.isFolder && this.label === "Parent Directory");
-                $a = $tds.eq(1).find("a");
+    this.absHref = this.isParentFolder ? this.href : this.parentFolder + this.href;
+    this.isCurrentFolder = (this.absHref === document.location.pathname);
+    this.isDomain = (this.absHref === "/");
 
-                path.parentFolder = folder;
+    if (this.isParentFolder && H5aiJs.h5ai.settings.setParentFolderLabels) {
-                path.label = $a.text();
+        if (this.isDomain) {
-                path.date = $tds.eq(2).text();
+            this.label = checkedDecodeUri(document.domain);
-                path.size = $tds.eq(3).text();
+        } else {
-                path.href = $a.attr("href");
+            this.label = checkedDecodeUri(H5aiJs.pathCache.splitPathname(H5aiJs.pathCache.splitPathname(this.parentFolder)[0])[1].slice(0, -1));
-                path.alt = $img.attr("alt");
+        }
-                path.icon16 = $img.attr("src");
+    }
-            } else {
+};
-                splits = H5aiJs.pathCache.splitPathname(folder);
+
-
+H5aiJs.factory.Path.prototype = {
-                path.parentFolder = splits[0];
+    
-                path.label = checkedDecodeUri(splits[1]);
+    isEmpty: function () {
-                if (path.label === "/") {
+
-                    path.label = checkedDecodeUri(document.domain) + "/";
+        return !this.content || $.isEmptyObject(this.content);
-                }
+    },
-                path.date = "";
+    onClick: function (context) {
-                path.size = "";
+
-                path.href = splits[1];
+        H5aiJs.h5ai.triggerPathClick(this, context);
-                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;
 };

src/h5ai/js/inc/PathCache.js

@@ -2,8 +2,7 @@
 
 H5aiJs.factory.PathCache = function () {
 
-    var pathCache,
+    var cache = {},
-        cache = {},
         rePathnameSplit = /^(\/(.*\/)*)([^\/]+\/?)$/,
         rePathEndsWithSlash = /\/$/,
         splitPathname = function (pathname) {
@@ -50,12 +49,8 @@ H5aiJs.factory.PathCache = function () {
             return path;
         };
 
-    pathCache = {
+    this.splitPathname = splitPathname;
-        splitPathname: splitPathname,
+    this.pathEndsWithSlash = pathEndsWithSlash;
-        pathEndsWithSlash: pathEndsWithSlash,
+    this.getPath = getPath;
-        getPath: getPath,
+    this.cache = cache;
-        cache: cache
-    };
-
-    return pathCache;
 };

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));

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();

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();

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}" />