clipped text is now handled by text-overflow css property

diff --git a/package.json b/package.json
index a7e55a55fa7f923be33d36906af99f3833441ef1..073ca66c9c09b15f094840db5951dbbb51e62e4f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -21,5 +21,5 @@
     "start": "app.js"
   },
   "subdomain": "binb",
-  "version": "0.3.3-17"
+  "version": "0.3.3-18"
 }
\ No newline at end of file

diff --git a/public/static/css/style.css b/public/static/css/style.css
index e44efa4bc8b97fe54ef501a7d3532d7a74cb6e83..ac8e655f300281f7c4337ccf2f50c1d1ff680eaf 100644 (file)
--- a/public/static/css/style.css
+++ b/public/static/css/style.css
@@ -646,6 +646,14 @@ form .clearfix {
 #tracks .info {
     margin-right: 15px;
 }
+#tracks .artist, #tracks .title {
+    white-space: nowrap;
+    max-width: 270px;
+    overflow: hidden;
+    -o-text-overflow: ellipsis;
+    -ms-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+}
 #tracks .artist {
     margin-top: 1px;
     font-size: 14px;
@@ -660,7 +668,7 @@ form .clearfix {
     display: block;
     width: 44px;
     height: 15px;
-    margin-top: 12px;
+    margin-top: 13px;
     background-position: 0 -248px;
 }
 #tracks a:hover {

diff --git a/public/static/js/room.js b/public/static/js/room.js
index 861cccdf604c15ce633943569f419700b2f4770b..ecaf93402695e48435d62858c0378d4395ff41c2 100644 (file)
--- a/public/static/js/room.js
+++ b/public/static/js/room.js
@@ -113,19 +113,14 @@
         }
         cassetteAnimation(Date.now()+5000, false);
 
-        var html = '<li class="bordered"><img class="artwork" src="'+data.artworkUrl+'"/>';
-        html += '<div class="info"><div class="artist">'+data.artistName+'</div>';
-
-        var titleattr = ''
-            , trackname = data.trackName
+        var artistName = data.artistName.replace(/"/g, '&quot;')
+            , trackName = data.trackName.replace(/"/g, '&quot;')
             , attrs = ''
             , rp = '';
 
-        if (data.trackName.length > 40) {
-            titleattr = data.trackName.replace(/"/g, '&quot;');
-            trackname = data.trackName.substring(0, 37) + '...';
-        }
-        html += '<div class="title" title="'+titleattr+'">'+trackname+'</div></div>';
+        var html = '<li class="bordered"><img class="artwork" src="'+data.artworkUrl+'"/>';
+        html += '<div class="info"><div class="artist" title="'+artistName+'">'+artistName+'</div>';
+        html += '<div class="title" title="'+trackName+'">'+trackName+'</div></div>';
 
         if (roundpoints > 0) {
             rp = '+'+roundpoints;