diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-06-22 18:00:23 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-06-22 18:00:23 +0100 |
| commit | 388872949ed0de4cf036e546fafb3f4b4bd04fee (patch) | |
| tree | 2fcefc5c8f2398166b8e7003033fe160cb3325fc /view/js/main.js | |
| parent | b47ff712deafdb8617599b0af4403b9563c9be93 (diff) | |
| parent | 301c7cdb89b13c4fc7c502795f121e13c1f9441d (diff) | |
| download | volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.tar.gz volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.tar.bz2 volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/view/js/main.js b/view/js/main.js index ac457f5ea..f43ae4d1b 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -112,8 +112,9 @@ return true; } - - + function viewsrc(id) { + $.colorbox({href: 'viewsrc/' + id }); + } function qCommentInsert(obj,id) { var tmpStr = $("#comment-edit-text-" + id).val(); @@ -196,17 +197,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 +590,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 +599,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 +638,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 */ |