diff options
| author | friendica <info@friendica.com> | 2014-06-18 15:53:26 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-18 15:53:26 -0700 |
| commit | 80d84206ed9744ce033942d0379a97834a33b11c (patch) | |
| tree | c96f1e3f2e7705e48005bb18e0d8f8eca78c621b | |
| parent | 476675e2117d169549573523101b33e8a9cd8f3d (diff) | |
| download | volse-hubzilla-80d84206ed9744ce033942d0379a97834a33b11c.tar.gz volse-hubzilla-80d84206ed9744ce033942d0379a97834a33b11c.tar.bz2 volse-hubzilla-80d84206ed9744ce033942d0379a97834a33b11c.zip | |
now we should be able to remove the function check. Revert if live updates or page loads go weird. I've tested, but it went weird on me last time I tried this a week or so ago so I'm crossing fingers.
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/js/main.js | 34 |
2 files changed, 8 insertions, 28 deletions
diff --git a/version.inc b/version.inc index 1b79e011f..a50c5902c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-06-17.709 +2014-06-18.710 diff --git a/view/js/main.js b/view/js/main.js index ac457f5ea..e2a265a1c 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -196,17 +196,6 @@ msie = false; // $.browser.msie ; - /* setup tooltips *//* - $("a,.tt").each(function(){ - var e = $(this); - var pos="bottom"; - if (e.hasClass("tttop")) pos="top"; - if (e.hasClass("ttbottom")) pos="bottom"; - if (e.hasClass("ttleft")) pos="left"; - if (e.hasClass("ttright")) pos="right"; - e.tipTip({defaultPosition: pos, edgeOffset: 8}); - });*/ - var e = document.getElementById('content-complete'); if(e) pageHasMoreContent = false; @@ -600,7 +589,7 @@ function updateConvItems(mode,data) { var update_url; - if(typeof buildCmd == 'function') { +// if(typeof buildCmd == 'function') { if(scroll_next) { bParam_page = next_page; page_load = true; @@ -609,12 +598,12 @@ function updateConvItems(mode,data) { bParam_page = 1; } update_url = buildCmd(); - } - else { - page_load = false; - var udargs = ((page_load) ? '/load' : ''); - update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); - } +// } +// else { +// page_load = false; +// var udargs = ((page_load) ? '/load' : ''); +// update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); +// } if(page_load) $("#page-spinner").spin('small'); @@ -648,15 +637,6 @@ function updateConvItems(mode,data) { } - - function imgbright(node) { -// $(node).removeClass("drophide").addClass("drop"); - } - - function imgdull(node) { -// $(node).removeClass("drop").addClass("drophide"); - } - function notify_popup_loader(notifyType) { /* notifications template */ |