dolt 0.17.0 → 0.18.0

data/vendor/ui/js/src/components/clone-url-selection.js

@@ -1,4 +1,9 @@
 /*global cull, dome*/
+this.gts = this.gts || {};
+
+/**
+ * When clicking clone URLs, copy them to the related input field.
+ */
 this.gts.cloneUrlSelection = function cloneUrlSelection(element) {
     var input = element.getElementsByTagName("input")[0];
 

data/vendor/ui/js/src/components/dropdown.js

@@ -42,8 +42,9 @@ this.gts.dropdown = (function (D) {
         function toggle(element) {
             if (active) { return close(); }
 
-            if ("ontouchstart" in document.documentElement) {
-                // if mobile we we use a backdrop because click events don't delegate
+            if (document.documentElement.hasOwnProperty("ontouchstart")) {
+                // if mobile we we use a backdrop because click events don't
+                // delegate
                 backdrop = D.el("div", {
                     className: "dropdown-backdrop",
                     events: { click: close }

data/vendor/ui/js/src/components/ganalytics.js

@@ -11,6 +11,9 @@ gts.googleAnalytics = function (account, domainName) {
     var ga = document.createElement("script");
     ga.type = "text/javascript";
     ga.async = true;
-    ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
-    (document.getElementsByTagName("head")[0] || document.getElementsByTagName("body")[0]).appendChild(ga);
+    ga.src = ("https:" === document.location.protocol ?
+              "https://ssl" :
+              "http://www") + ".google-analytics.com/ga.js";
+    (document.getElementsByTagName("head")[0] ||
+     document.getElementsByTagName("body")[0]).appendChild(ga);
 };

data/vendor/ui/js/src/components/live-markdown-preview.js

@@ -1,26 +1,22 @@
 /*global Showdown*/
+
+/**
+ * Monitor a textarea and render a live preview of its content parsed as
+ * Markdown. The textarea needs to have the data attribute
+ * data-gts-preview-target set, and it should be an id of an element elsewhere
+ * in the document. The target element needs to contain at least a div element,
+ * which is where the preview will be rendered.
+ * 
+ * When previewing, the target will be hidden when the textarea is empty, and
+ * shown with block display when there is content.
+ */
 this.gts.liveMarkdownPreview = function liveMarkdownPreview(textarea) {
-    var target = document.getElementById(textarea.getAttribute("data-gts-preview-target"));
+    var attr = textarea.getAttribute("data-gts-preview-target");
+    var target = document.getElementById(attr);
     if (!target || typeof Showdown === "undefined") { return; }
     var converter = new Showdown.converter();
     var previous, content;
 
-    var cageSeed = new Date().getTime();
-
-    function zeroPad(num) {
-        return num < 10 ? "0" + num : num;
-    }
-
-    function signature() {
-        var now = new Date();
-        return "<p>" +
-            "<img width=\"24\" height=\"24\" class=\"gts-avatar\" alt=\"avatar\" src=\"http://cageme.herokuapp.com/24/24?" +
-            cageSeed + "\">" +
-            "<a href=\"/~zmalltalker\">Marius Mathiesen</a>" +
-            zeroPad(now.getHours()) + ":" + zeroPad(now.getMinutes()) +
-            ". <a href=\"#\">Edit comment</a></p>";
-    }
-
     function setPreview(preview) {
         target.style.display = preview ? "block" : "none";
         target.getElementsByTagName("div")[0].innerHTML = preview;

data/vendor/ui/js/src/components/ref-selector.js

@@ -59,7 +59,7 @@ this.gts.refSelector = (function (e) {
             href: "#",
             className: "dropdown-toggle",
             innerHTML: "<span class=\"caret\"></span> <em>" +
-                type + ":</em> " + (currentRef && currentRef[0] || current)
+                type + ":</em> " + ((currentRef && currentRef[0]) || current)
         });
     }
 
@@ -82,9 +82,10 @@ this.gts.refSelector = (function (e) {
     }
 
     function refItems(label, refs, urlTemplate) {
-        var initial = [e.li({ className: "dropdown-label" }, [e.strong(label)])];
+        var initial = [e.li({className: "dropdown-label"}, [e.strong(label)])];
         return cull.reduce(function (elements, ref) {
-            elements.push(e.li(e.a({ href: tpl(urlTemplate, ref[1]) }, ref[0])));
+            var url = tpl(urlTemplate, ref[1]);
+            elements.push(e.li(e.a({ href: url }, ref[0])));
             return elements;
         }, initial, refs.sort());
     }

data/vendor/ui/js/src/components/tree-history.js

@@ -102,7 +102,8 @@ this.gts.treeHistory = (function (c, d) {
     }
 
     function getTreeIndent(cells) {
-        for (var i = 0, l = cells.length; i < l; ++i) {
+        var i, l;
+        for (i = 0, l = cells.length; i < l; ++i) {
             if (dome.cn.has("gts-name", cells[i])) {
                 return i;
             }
@@ -112,7 +113,7 @@ this.gts.treeHistory = (function (c, d) {
     }
 
     function fileName(element) {
-        return (element && dome.text(element) || "").trim();
+        return ((element && dome.text(element)) || "").trim();
     }
 
     th.annotateRow = function (tree, row) {

data/vendor/ui/js/src/components/url.js

@@ -1,4 +1,5 @@
 /*global cull*/
+/*jslint maxlen: 100*/
 // The global, shared Gitorious namespace
 this.gts = this.gts || {};
 
@@ -53,7 +54,7 @@ this.gts.url = (function () {
     function currentRef(url) {
         var regexp = /(blame|blob|tree|history|raw|source|readme)\//;
         var refPath = url.split(regexp)[2];
-        return refPath && refPath.split(":")[0] || null;
+        return (refPath && refPath.split(":")[0]) || null;
     }
 
     return {

data/vendor/ui/js/src/gitorious.js

@@ -1,29 +1,34 @@
 /*global gts, reqwest, cull*/
 
-this.gts.loadRefs = function (url) {
-    return reqwest({ url: url, type: "json" });
-};
-
-function refUrlTpl(url, ref) {
-    return gts.url.templatize(url, { ref: ref });
-}
-
 // Environment variables
 gts.app.env("url", window.location.href);
 gts.app.env("redirect", function (url) { window.location = url; });
 
-if ("onpopstate" in window) {
+if (window.hasOwnProperty("onpopstate")) {
     window.onpopstate = function (event) {
         gts.app.env("url", window.location.href);
     };
 }
 
 // Data
+gts.app.data("ref-url-template", function (url, ref) {
+    return gts.url.templatize(url, { ref: ref });
+}, {
+    depends: ["url", "current-ref"],
+    serializeArgs: function (url, ref) { return [url.split("#")[0], ref]; }
+});
+
+gts.app.data("repository-refs", function (url) {
+    return reqwest({ url: url, type: "json" });
+}, { depends: ["repository-refs-url"] });
+
 gts.app.data("current-ref", gts.url.currentRef, { depends: ["url"] });
-gts.app.data("ref-url-template", refUrlTpl, { depends: ["url", "current-ref"] });
-gts.app.data("repository-refs", gts.loadRefs, { depends: ["repository-refs-url"] });
-gts.app.data("user-repo-view-state", gts.userRepoViewState, { depends: ["user-repository-path"] });
-gts.app.data("current-user", cull.prop("user"), { depends: ["user-repo-view-state"] });
+gts.app.data("user-repo-view-state", gts.userRepoViewState, {
+    depends: ["user-repository-path"]
+});
+gts.app.data("current-user", cull.prop("user"), {
+    depends: ["user-repo-view-state"]
+});
 gts.app.data("blob-region", gts.blob.regionFromUrl, { depends: ["url"] });
 
 // Features
@@ -64,8 +69,9 @@ gts.app.feature("highlight-region", gts.blob.highlightRegion, {
     depends: ["blob-region"]
 });
 
-gts.app.feature("highlight-line-mouseover", gts.blob.highlightLineOnFocus, {
-    elements: ["gts-lines"]
+gts.app.feature("track-blob-focus", gts.blob.trackFocus, {
+    elements: ["gts-lines"],
+    depends: ["redirect"]
 });
 
 gts.app.feature("live-markdown-preview", gts.liveMarkdownPreview, {

data/vendor/ui/js/src/logger.js

@@ -1,4 +1,4 @@
-/*global gts, cull, dome*/
+/*global cull, dome, console, gts*/
 function uinitLogger(app, level) {
     if (typeof level === "string") {
         level = uinitLogger.levels.indexOf((level || "info").toLowerCase());
@@ -20,23 +20,29 @@ function uinitLogger(app, level) {
         app.on("loading", function (feature) {
             console.log("[Loading:", feature.name + "]");
         });
+
+        app.on("reloading", function (feature) {
+            console.log("[Re-loading:", feature.name + "]");
+        });
     }
 
     if (level <= uinitLogger.INFO) {
         app.on("pending", function (feature) {
-            var reason, waitingFor = cull.map(cull.prop("name"), cull.select(function (f) {
+            var name = cull.prop("name");
+            var reason, pending = cull.map(name, cull.select(function (f) {
                 return !f.loaded;
             }, feature.dependencies()));
 
-            if (waitingFor.length > 0) {
+            if (pending.length > 0) {
                 reason = "Waiting for ";
-                reason += waitingFor.length === 1 ? "dependency" : "dependencies";
-                reason += " [" + waitingFor.join(", ") + "]";
+                reason += pending.length === 1 ? "dependency" : "dependencies";
+                reason += " [" + pending.join(", ") + "]";
             }
 
             if (!reason && feature.elements) {
                 if (dome.byClass(feature.elements).length === 0) {
-                    reason = "No matching elements for selector ." + feature.elements;
+                    reason = "No matching elements for selector ." +
+                        feature.elements;
                 }
             }
 
@@ -48,6 +54,13 @@ function uinitLogger(app, level) {
         });
     }
 
+    if (level <= uinitLogger.INFO) {
+        app.on("skip", function (feature) {
+            console.log("[Skip:", feature.name + "]",
+                        "Reload triggered, but input was unchanged");
+        });
+    }
+
     if (level <= uinitLogger.INFO) {
         app.on("loaded", function (feature, result) {
             console.log("[Load:", feature.name + "] =>", result);

data/vendor/ui/js/test/components/abbrev-test.js

@@ -1,3 +1,4 @@
+/*global buster, assert, gts*/
 buster.testCase("Abbrev", {
     "returns short enough string": function () {
         assert.equals("Some string", gts.abbrev("Some string", 30));

data/vendor/ui/js/test/components/blob-test.js

@@ -0,0 +1,90 @@
+/*global buster, assert, refute, jQuery, dome, gts*/
+
+buster.testCase("Blob", {
+    setUp: function () {
+        this.el = dome.el("ol", [
+            dome.el("li", { className: "L0" }, "First line"),
+            dome.el("li", { className: "L1" }, "Second line"),
+            dome.el("li", { className: "L2" }, "Third line"),
+            dome.el("li", { className: "L3" }, "Fourth line")
+        ]);
+    },
+
+    "regionFromUrl": {
+        "extracts single line number": function () {
+            var region = gts.blob.regionFromUrl("/some/url#l1");
+            assert.equals(region, [1, 1]);
+        },
+
+        "extracts region": function () {
+            var region = gts.blob.regionFromUrl("/some/url#l1-10");
+            assert.equals(region, [1, 10]);
+        },
+
+        "extracts ordered region": function () {
+            var region = gts.blob.regionFromUrl("/some/url#l29-8");
+            assert.equals(region, [8, 29]);
+        },
+
+        "matches URL case-insensitively": function () {
+            var region = gts.blob.regionFromUrl("/some/url#L9");
+            assert.equals(region, [9, 9]);
+        }
+    },
+
+    "highlightRegion": {
+        "highlights first line": function () {
+            gts.blob.highlightRegion(this.el, [1, 1]);
+            assert.className(this.el.childNodes[0], "region");
+            refute.className(this.el.childNodes[1], "region");
+            refute.className(this.el.childNodes[2], "region");
+            refute.className(this.el.childNodes[3], "region");
+        },
+
+        "highlights region": function () {
+            gts.blob.highlightRegion(this.el, [2, 4]);
+            refute.className(this.el.childNodes[0], "region");
+            assert.className(this.el.childNodes[1], "region");
+            assert.className(this.el.childNodes[2], "region");
+            assert.className(this.el.childNodes[3], "region");
+        },
+
+        "un-highlights elements as region changes": function () {
+            gts.blob.highlightRegion(this.el, [2, 4]);
+            gts.blob.highlightRegion(this.el, [1, 2]);
+            assert.className(this.el.childNodes[0], "region");
+            assert.className(this.el.childNodes[1], "region");
+            refute.className(this.el.childNodes[2], "region");
+            refute.className(this.el.childNodes[3], "region");
+        }
+    },
+
+    "trackFocus": {
+        setUp: function () {
+            // Required for event triggering to work
+            document.body.appendChild(this.el);
+            this.redirect = this.spy();
+            gts.blob.trackFocus(this.el, this.redirect);
+            var lines = this.el.getElementsByTagName("li");
+            this.trigger = function (lineNum) {
+                var line = jQuery(lines[lineNum]);
+                line.trigger.apply(line, [].slice.call(arguments, 1));
+            };
+        },
+
+        "selects first line as region": function () {
+            this.trigger(0, "click");
+            assert.className(this.el.childNodes[0], "region");
+            assert.calledOnceWith(this.redirect, "#L1");
+        },
+
+        "selects discrete lines with multiple clicks": function () {
+            this.trigger(0, "click");
+            assert.className(this.el.childNodes[0], "region");
+
+            this.trigger(1, "click");
+            refute.className(this.el.childNodes[0], "region");
+            assert.className(this.el.childNodes[1], "region");
+        }
+    }
+});

data/vendor/ui/js/test/components/clone-url-selection-test.js

@@ -0,0 +1,25 @@
+/*global buster, assert, jQuery, gts*/
+
+buster.testCase("Clone URL selection", {
+    setUp: function () {
+        /*:DOC element = <div class="btn-group gts-repo-urls">
+            <a class="btn gts-repo-url" href="git://gitorious.org/gitorious/mainline.git">Git</a>
+            <a class="btn gts-repo-url" href="http://git.gitorious.org/gitorious/mainline.git">HTTP</a>
+            <a class="active btn gts-repo-url" href="git@gitorious.org:gitorious/mainline.git">SSH</a>
+            <input class="span4 gts-current-repo-url gts-select-onfocus" type="url" value="git@gitorious.org:gitorious/mainline.git">
+            <button data-toggle="collapse" data-target="#repo-url-help" class="gts-repo-url-help btn">?</button>
+          </div>*/
+        this.input = this.element.getElementsByTagName("input")[0];
+        document.body.appendChild(this.element);
+        var buttons = this.element.getElementsByTagName("a");
+        this.click = function (num) {
+            jQuery(buttons[num]).trigger("click");
+        };
+    },
+
+    "// copies href to input on click": "Click triggering currently not working"
+    /*function () {
+        this.click(0);
+        assert.equals(this.input.value, "git://gitorious.org/gitorious/mainline.git");
+    }*/
+});

data/vendor/ui/js/test/components/commit-linker-test.js

@@ -1,41 +1,46 @@
+/*global buster, assert, refute, jQuery, gts*/
 buster.testCase("Commit linker", {
+    setUp: function () {
+        this.el = document.createElement("div");
+        // Required for even triggering to work properly
+        document.body.appendChild(this.el);
+    },
+
     "triggers handler for gts-commit-oid link": function () {
-        var callback = this.spy();
-        var el = document.createElement("div");
-        el.innerHTML = "<span class=\"gts-commit-oid\" data-gts-commit-oid=\"master\">master</span>";
+        var cb = this.spy();
+        this.el.innerHTML = "<span class=\"gts-commit-oid\" " +
+            "data-gts-commit-oid=\"master\">master</span>";
 
-        gts.commitLinker(el, "/gitorious/mainline/commit/#{oid}", callback);
-        jQuery(el.firstChild).trigger("click");
+        gts.commitLinker(this.el, "/gitorious/mainline/commit/#{oid}", cb);
+        jQuery(this.el.firstChild).trigger("click");
 
-        assert.calledOnceWith(callback, "/gitorious/mainline/commit/master");
+        assert.calledOnceWith(cb, "/gitorious/mainline/commit/master");
     },
 
     "does not trigger handler for regular link": function () {
-        var callback = this.spy();
-        var el = document.createElement("div");
-        el.innerHTML = "<span>master</span>";
+        var cb = this.spy();
+        this.el.innerHTML = "<span>master</span>";
 
-        gts.commitLinker(el, "/gitorious/mainline/commit/#{oid}", callback);
-        jQuery(el.firstChild).trigger("click");
+        gts.commitLinker(this.el, "/gitorious/mainline/commit/#{oid}", cb);
+        jQuery(this.el.firstChild).trigger("click");
 
-        refute.called(callback);
+        refute.called(cb);
     },
 
     "triggers handler for link added later": function () {
-        var callback = this.spy();
-        var el = document.createElement("div");
+        var cb = this.spy();
 
-        gts.commitLinker(el, "/gitorious/mainline/commit/#{oid}", callback);
-        el.innerHTML = "<span class=\"gts-commit-oid\" data-gts-commit-oid=\"master\">master</span>";
-        jQuery(el.firstChild).trigger("click");
+        gts.commitLinker(this.el, "/gitorious/mainline/commit/#{oid}", cb);
+        this.el.innerHTML = "<span class=\"gts-commit-oid\" " +
+            "data-gts-commit-oid=\"master\">master</span>";
+        jQuery(this.el.firstChild).trigger("click");
 
-        assert.calledOnce(callback);
+        assert.calledOnce(cb);
     },
 
     "adds class name to root element": function () {
-        var el = document.createElement("div");
-        gts.commitLinker(el, "/gitorious/mainline/commit/#{oid}");
+        gts.commitLinker(this.el, "/gitorious/mainline/commit/#{oid}");
 
-        assert.className(el, "gts-commit-linker");
+        assert.className(this.el, "gts-commit-linker");
     }
 });

data/vendor/ui/js/test/components/live-markdown-preview-test.js

@@ -0,0 +1,37 @@
+/*global buster, assert, dome, gts*/
+
+buster.testCase("Live markdown preview", {
+    setUp: function () {
+        var el = dome.el("div", [
+            dome.el("textarea"),
+            dome.el("div", { id: "target" }, [dome.el("div")])
+        ]);
+
+        document.body.appendChild(el);
+        this.textarea = el.firstChild;
+        this.textarea.setAttribute("data-gts-preview-target", "target");
+        this.target = el.lastChild.firstChild;
+        this.clock = this.useFakeTimers();
+    },
+
+    "renders markdown as html in div": function () {
+        gts.liveMarkdownPreview(this.textarea);
+        this.textarea.innerHTML = "*hey*";
+
+        this.clock.tick(50);
+
+        assert.match(this.target.innerHTML, "<em>hey</em>");
+    },
+
+    "updates rendered html": function () {
+        gts.liveMarkdownPreview(this.textarea);
+        this.textarea.innerHTML = "*hey*";
+        this.clock.tick(50);
+
+        this.textarea.innerHTML = "# OH!";
+        this.clock.tick(50);
+
+        refute.match(this.target.innerHTML, "<em>hey</em>");
+        assert.match(this.target.innerHTML, /<h1.*>OH!<\/h1>/);
+    }
+});