Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / main.js

diff --git a/include/main.js b/include/main.js
index 3b6528ee9502abb6cb138e168f3683bde3aba7aa..1b5553161c5ad4a958c37a3d3795cf9f7b84266c 100644 (file)
--- a/include/main.js
+++ b/include/main.js
@@ -16,21 +16,7 @@
       document.getElementById(theID).style.display = "none" 
   }
 
-       function commentOpen(obj,id) {
-               if(obj.value == 'Comment') {
-                       obj.value = '';
-                       obj.className = "comment-edit-text-full";
-                       openMenu("comment-edit-submit-wrapper-" + id);
-               }
-       }
-       function commentClose(obj,id) {
-               if(obj.value == '') {
-                       obj.value = 'Comment';
-                       obj.className="comment-edit-text-empty";
-                       closeMenu("comment-edit-submit-wrapper-" + id);
-               }
-       }
-
+       
        var src = null;
        var prev = null;
        var livetime = null;
@@ -38,12 +24,12 @@
        var stopped = false;
        var timer = null;
        var pr = 0;
+       var liking = 0;
 
        $(document).ready(function() {
                $.ajaxSetup({cache: false});
                msie = $.browser.msie ;
                NavUpdate(); 
-               sparkler();
                // Allow folks to stop the ajax page updates with the pause/break key
                $(document).keypress(function(event) {
                        if(event.keyCode == '19') {
@@ -60,24 +46,22 @@
                });                                     
        });
 
-       var spark = false;
-       function sparkler() {
-               if(spark) { 
-                       $('.sparkle').css({cursor: 'pointer'});
-                       spark = false;
-               }
-               else {
-                       $('.sparkle').css({cursor: 'crosshair'});
-                       spark = true;
-               }
-               setTimeout(sparkler,500);
-       }
-       
-
        function NavUpdate() {
 
                if($('#live-network').length) { src = 'network'; liveUpdate(); }
                if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
+               if($('#live-display').length) { 
+                       if(liking) {
+                               liking = 0;
+                               window.location.href=window.location.href 
+                       }
+               }
+               if($('#live-photos').length)  { 
+                       if(liking) {
+                               liking = 0;
+                               window.location.href=window.location.href 
+                       }
+               }
 
                if(! stopped) {
                        $.get("ping",function(data) {
@@ -137,10 +121,6 @@
 
        }
 
-       function confirmDelete() { 
-               return confirm("Delete this item?");
-       }
-
        function imgbright(node) {
                $(node).attr("src",$(node).attr("src").replace('hide','show'));
                $(node).css('width',24);
@@ -153,9 +133,9 @@
                $(node).css('height',16);
        }
 
-       // Since ajax is asynchronous, we will give a few seconds for
-       // the first ajax call (setting like/dislike), then run the
-       // updater to pick up any changes and display on the page.
+       // Since our ajax calls are asynchronous, we will give a few 
+       // seconds for the first ajax call (setting like/dislike), then 
+       // run the updater to pick up any changes and display on the page.
        // The updater will turn any rotators off when it's done. 
        // This function will have returned long before any of these
        // events have completed and therefore there won't be any
@@ -168,4 +148,50 @@
                $.get('like/' + ident.toString() + '?verb=' + verb );
                if(timer) clearTimeout(timer);
                timer = setTimeout(NavUpdate,3000);
+               liking = 1;
        }
+
+       function getPosition(e) {
+               var cursor = {x:0, y:0};
+               if ( e.pageX || e.pageY  ) {
+                       cursor.x = e.pageX;
+                       cursor.y = e.pageY;
+               }
+               else {
+                       if( e.clientX || e.clientY ) {
+                               cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
+                               cursor.y = e.clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
+                       }
+                       else {
+                               if( e.x || e.y ) {
+                                       cursor.x = e.x;
+                                       cursor.y = e.y;
+                               }
+                       }
+               }
+               return cursor;
+       }
+
+       var lockvisible = false;
+
+       function lockview(event,id) {
+               event = event || window.event;
+               cursor = getPosition(event);
+               if(lockvisible) {
+                       lockviewhide();
+               }
+               else {
+                       lockvisible = true;
+                       $.get('lockview/' + id, function(data) {
+                               $('#panel').html(data);
+                               $('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
+                               $('#panel').show();
+                       });
+               }
+       }
+
+       function lockviewhide() {
+               lockvisible = false;
+               $('#panel').hide();
+       }
+