Merge pull request #33 from dryabov/master

improve profile popup (hide empty fields, fix scrollbar issue)

css/profile.css

@@ -231,6 +231,9 @@
     margin-left: -300px;
 
 }
+.profile-modal .modal-header, .profile-modal .profile-card {
+    z-index: 1;
+}
 .profile-modal .modal-content
 {
     padding: 3px;
@@ -250,9 +253,10 @@
     text-align: center;
 }
 #msngrswr {
-    position: absolute;
-    left: 10px;
+    display: none;
+    margin-left: 10px;
     margin-top: 10px;
+    height: 40px;
 }
 #toxbtnwr, #bmbtnwr {
     float: left;
@@ -315,7 +319,6 @@
 {
     display: inline-block;
     margin-left: -4px;
-    margin-top: 40px;
     border-bottom: 0;
 }
 button.follow:hover {
@@ -349,9 +352,13 @@ button.follow:hover {
 }
 .profile-modal .postboard-posts
 {
-    display: block;
-    height: 90%;
+    position: absolute;
+    top: 0;
+    height: 100%;
+    box-sizing: border-box;
+    border-top: 292px solid transparent;
     overflow: auto;
+    z-index: 0;
 }
 .profile-modal .profile-card-main
 {
@@ -401,4 +408,17 @@ h2.profile-screen-name {
 
 .profile-modal .modal-buttons {
    display: none;
+}
+
+.profile-modal h1.profile-name,
+.profile-modal h2.profile-screen-name,
+.profile-modal span.profile-location,
+.profile-modal a.profile-url {
+    display: block;
+}
+
+.profile-modal span.profile-location:empty,
+.profile-modal a.profile-url:empty,
+.profile-modal a.profile-bio:empty {
+    display: none;
 }

home.html

@@ -435,12 +435,8 @@
             <div class="profile-card-main">
               <img class="profile-card-photo" src="img/grayed_avatar_placeholder_24.png"/>
               <h1 class="profile-name"></h1>
-              <div>
-                <h2 class="profile-screen-name">@<b></b></h2>
-              </div>
-              <div>
-                <span class="profile-location"></span>
-              </div>
+              <h2 class="profile-screen-name">@<b></b></h2>
+              <span class="profile-location"></span>
               <a class="profile-url" rel="nofollow" target="_blank"></a>
               <div class="profile-bio"></div>
               <div id="msngrswr">

js/interface_common.js

@@ -119,13 +119,18 @@ function openProfileModal(e)
             unfollow(username);
         });
     };
-    //hed//fix .modal-content height in profile modal
-    if($('.modal-blackout').hasClass('profile-modal')){
-        $mc = $('.modal-content');
-        $mch = parseInt($('.modal-content').css('height'));
-        $pch = parseInt($('.profile-card').css('height'));
-        $mc.css('height', $mch - ($pch + Math.floor($mch/50)));
-    }
+    $mc = $('.modal-content');
+//    $mch = parseInt($('.modal-content').css('height'));//
+//    $pch = parseInt($('.profile-card').css('height'));//
+//    $mc.css('height', $mch - ($pch + Math.floor($mch/50)));//hed//fix .modal-content height
+
+    $mc.off('profileloaded');
+    $mc.on('profileloaded', function() {
+        var viewHeader = $mc.find(".postboard > h2");
+        var h = viewHeader.offset().top + viewHeader.outerHeight() - $mc.parent().offset().top + 5;
+        $mc.find(".postboard-posts").css('border-top', parseInt(h, 10) + "px solid transparent");
+    });
+    $mc.trigger('profileloaded');
 }
 
 function newHashtagModal(hashtag) {

js/twister_io.js

@@ -196,6 +196,9 @@ function getProfileResource( username, resource, item, cbFunc, cbArg ){
                        if( args.cbFunc )
                            args.cbFunc(args.cbArg, null);
                    }
+                   if (item) {
+                       item.trigger('profileloaded');
+                   }
                }, {username:username,item:item,cbFunc:cbFunc,cbArg:cbArg});
     }
 }
@@ -225,11 +228,8 @@ function getTox( username, item ){
         item.empty();
         if(text) {
             item.attr('href', 'tox:'+text);
-            
-            setTimeout(function(){
-              $('#toxbtnwr').show()
-              $('.tox-ctc').attr('data', text);
-            }, 0);
+            item.next().attr('data', text);
+            item.parent().show().parent().show();
         }
     }, item);
 }
@@ -240,10 +240,8 @@ function getBitmessage( username, item ){
         item.empty();
         if(text) {
             item.attr('href', 'bitmsg:'+text+'?action=add&label='+username);
-            setTimeout(function(){
-              $('#bmbtnwr').show();
-              $('.bitmessage-ctc').attr('data', text);
-            }, 0);
+            item.next().attr('data', text);
+            item.parent().show().parent().show();
         }
     }, item);
 }