From: Andrew Dolgov Date: Fri, 18 Dec 2009 08:59:40 +0000 (+0300) Subject: iui: less tweaks X-Git-Tag: 1.4.0~162 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=74357409fa7ba33f11fee41aa0af1de14830ce9d;p=tt-rss.git iui: less tweaks --- diff --git a/lib/iui/iui.js b/lib/iui/iui.js index d47cbddb..6b7b16b4 100644 --- a/lib/iui/iui.js +++ b/lib/iui/iui.js @@ -66,7 +66,7 @@ window.iui = } }, - showPageByHref: function(href, args, method, replace, cb, backwards) + showPageByHref: function(href, args, method, replace, cb, bw) { var req = new XMLHttpRequest(); req.onerror = function() @@ -85,7 +85,7 @@ window.iui = { var frag = document.createElement("div"); frag.innerHTML = req.responseText; - iui.insertPages(frag.childNodes, backwards); + iui.insertPages(frag.childNodes, bw); } if (cb) setTimeout(cb, 1000, true); @@ -106,7 +106,7 @@ window.iui = } }, - insertPages: function(nodes, backwards) + insertPages: function(nodes, bw) { var targetPage; for (var i = 0; i < nodes.length; ++i) @@ -131,7 +131,7 @@ window.iui = } if (targetPage) - iui.showPage(targetPage, backwards); + iui.showPage(targetPage, bw); }, getSelectedPage: function() @@ -203,9 +203,9 @@ addEventListener("click", function(event) iui.showPage($(link.hash.substr(1))); setTimeout(unselect, 500); } - if (link == $("backButton")) { + else if (link == $("backButton")) history.back(); - } else if (link.getAttribute("type") == "submit") + else if (link.getAttribute("type") == "submit") { var form = findParent(link, "form"); if (form.target == "_self") @@ -233,10 +233,8 @@ addEventListener("click", function(event) else if (!link.target) { link.setAttribute("selected", "progress"); - - var backwards = link.getAttribute("backwards"); - - iui.showPageByHref(link.href, null, null, null, unselect, backwards); + var bw = link.getAttribute("backwards"); + iui.showPageByHref(link.href, null, null, null, unselect, bw); } else return; @@ -363,8 +361,7 @@ function updatePage(page, fromPage) } else backButton.style.display = "none"; - } - + } var backButton = $("myBackButton"); if (backButton)