basic video playback support using VideoJS

[friendica.git] / view / theme / frost-mobile / js / main.js

diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 5a15b081bd0cf51ad5286312c05f8295fb3ec20f..819b0019f91efa2bc8c27adf7cf866aeab380828 100644 (file)
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -132,9 +132,9 @@
                });
                
                // fancyboxes
-               /*$j("a.popupbox").fancybox({
-                       'transitionIn' : 'elastic',
-                       'transitionOut' : 'elastic'
+               /*$j("a.popupbox").colorbox({
+                       'inline' : true,
+                       'transition' : 'none'
                });*/
                
 
@@ -188,9 +188,9 @@
                                        nnm.append(html);
                                });
 
-                               $("img[data-src]", nnm).each(function(i, el){
+                               $j("img[data-src]", nnm).each(function(i, el){
                                        // Add src attribute for images with a data-src attribute
-                                       $(el).attr('src', $(el).data("src"));
+                                       $j(el).attr('src', $j(el).data("src"));
                                });
                        }
                        notif = eNotif.attr('count');
@@ -287,7 +287,7 @@
        }
 
        function liveUpdate() {
-               if((src == null) || (stopped) || (! profile_uid)) { $j('.like-rotator').hide(); return; }
+               if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $j('.like-rotator').hide(); return; }
                if(($j('.comment-edit-text-full').length) || (in_progress)) {
                        if(livetime) {
                                clearTimeout(livetime);
@@ -389,6 +389,9 @@
                        }
                        /* autocomplete @nicknames */
                        $j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+
+                       // setup videos, since VideoJS won't take care of any loaded via AJAX
+                       _V_.autoSetup();
                });
        }
 
@@ -407,13 +410,13 @@
                });
        }
 
-       function imgbright(node) {
+/*     function imgbright(node) {
                $j(node).removeClass("drophide").addClass("drop");
        }
 
        function imgdull(node) {
                $j(node).removeClass("drop").addClass("drophide");
-       }
+       }*/
 
        // Since our ajax calls are asynchronous, we will give a few 
        // seconds for the first ajax call (setting like/dislike), then 
@@ -456,19 +459,19 @@
 
        function getPosition(e) {
                var cursor = {x:0, y:0};
-               if ( e.touches[0].pageX || e.touches[0].pageY  ) {
-                       cursor.x = e.touches[0].pageX;
-                       cursor.y = e.touches[0].pageY;
+               if ( e.pageX || e.pageY  ) {
+                       cursor.x = e.pageX;
+                       cursor.y = e.pageY;
                }
                else {
-                       if( e.touches[0].clientX || e.touches[0].clientY ) {
-                               cursor.x = e.touches[0].clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
-                               cursor.y = e.touches[0].clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
+                       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.touches[0].x || e.touches[0].y ) {
-                                       cursor.touches[0].x = e.touches[0].x;
-                                       cursor.touches[0].y = e.touches[0].y;
+                               if( e.x || e.y ) {
+                                       cursor.x = e.x;
+                                       cursor.y = e.y;
                                }
                        }
                }
@@ -487,7 +490,7 @@
                        lockvisible = true;
                        $j.get('lockview/' + id, function(data) {
                                $j('#panel').html(data);
-                               $j('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
+                               $j('#panel').css({ 'left': 10 , 'top': cursor.y + 20});
                                $j('#panel').show();
                        });
                }
@@ -690,9 +693,9 @@ function setupFieldRichtext(){
                entity_encoding : "raw",
                add_unload_trigger : false,
                remove_linebreaks : false,
-               force_p_newlines : false,
-               force_br_newlines : true,
-               forced_root_block : '',
+               //force_p_newlines : false,
+               //force_br_newlines : true,
+               forced_root_block : 'div',
                convert_urls: false,
                content_css: baseurl+"/view/custom_tinymce.css",
                theme_advanced_path : false,