From 54e835b623c8d523de0a5fcfdcff746033795e57 Mon Sep 17 00:00:00 2001 From: jcass Date: Thu, 4 Feb 2016 21:46:11 +0200 Subject: [PATCH 1/3] fix:Replace jquery.truncate.js with text-overflow: ellipses. --- README.rst | 6 +++++- mopidy_musicbox_webclient/static/css/webclient.css | 1 + mopidy_musicbox_webclient/static/index.html | 1 - mopidy_musicbox_webclient/static/js/gui.js | 2 -- mopidy_musicbox_webclient/static/mb.manifest | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index a0d7e0c..971be60 100644 --- a/README.rst +++ b/README.rst @@ -58,6 +58,11 @@ Project resources Changelog ========= +v2.1.1 (2016-02-04) +------------------- + +- Replace Javascript for truncating text with CSS equivalent for better reliability. + v2.1.0 (2016-02-04) ------------------- @@ -110,7 +115,6 @@ v2.1.0 (2016-02-04) - Remove support for defunct Grooveshark service. (Fixes: `#120 `_). - v2.0.0 (2015-03-26) ------------------- diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css index 777be12..f6c265a 100644 --- a/mopidy_musicbox_webclient/static/css/webclient.css +++ b/mopidy_musicbox_webclient/static/css/webclient.css @@ -470,6 +470,7 @@ a { white-space: nowrap; font-weight: bold; font-size: 14px; + text-overflow: ellipses; } #infoartist { diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html index 66339e4..f333c06 100644 --- a/mopidy_musicbox_webclient/static/index.html +++ b/mopidy_musicbox_webclient/static/index.html @@ -475,7 +475,6 @@ - diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index 18b8706..d4ab846 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -24,9 +24,7 @@ function resetSong() { function resizeMb() { $("#infoname").html(songdata.track.name); - $("#infoname").truncate(); $("#infoartist").html(artiststext); - $("#infoartist").truncate(); if ($(window).width() <= 960) { // $('#playlisttracksdiv').hide(); diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest index 4958f56..6782bae 100644 --- a/mopidy_musicbox_webclient/static/mb.manifest +++ b/mopidy_musicbox_webclient/static/mb.manifest @@ -1,6 +1,6 @@ CACHE MANIFEST -# 2016-02-4:v2 +# 2016-02-4:v4 NETWORK: * @@ -67,7 +67,6 @@ js/jquery.mobile.iscrollview-closure-min.js js/jquery.mobile.iscrollview-yui-min.js js/jquery.mobile.iscrollview.js js/jquery.touchwipe.min.js -js/jquery.truncate.min.js js/lastfm.api.cache.js js/lastfm.api.js js/lastfm.api.md5.js From ad4757d97984fa48fe1a31493e1efc1acc6884fe Mon Sep 17 00:00:00 2001 From: jcass Date: Thu, 4 Feb 2016 22:05:08 +0200 Subject: [PATCH 2/3] fix:Fix CSS typo. --- README.rst | 4 ++-- mopidy_musicbox_webclient/static/css/webclient.css | 3 ++- mopidy_musicbox_webclient/static/mb.manifest | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 971be60..28837e8 100644 --- a/README.rst +++ b/README.rst @@ -58,10 +58,10 @@ Project resources Changelog ========= -v2.1.1 (2016-02-04) +v2.1.1 (UNRELEASED) ------------------- -- Replace Javascript for truncating text with CSS equivalent for better reliability. +- Replace Javascript for truncating text with more reliable CSS equivalent. v2.1.0 (2016-02-04) ------------------- diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css index f6c265a..fb85e39 100644 --- a/mopidy_musicbox_webclient/static/css/webclient.css +++ b/mopidy_musicbox_webclient/static/css/webclient.css @@ -470,13 +470,14 @@ a { white-space: nowrap; font-weight: bold; font-size: 14px; - text-overflow: ellipses; + text-overflow: ellipsis; } #infoartist { overflow: hidden; font-size: 11px; white-space: nowrap; + text-overflow: ellipsis; } #infocover { diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest index 6782bae..72819ab 100644 --- a/mopidy_musicbox_webclient/static/mb.manifest +++ b/mopidy_musicbox_webclient/static/mb.manifest @@ -1,6 +1,6 @@ CACHE MANIFEST -# 2016-02-4:v4 +# 2016-02-4:v5 NETWORK: * From d7bd3736b21a8328adef1a7b922674d805c33952 Mon Sep 17 00:00:00 2001 From: jcass Date: Thu, 4 Feb 2016 22:06:13 +0200 Subject: [PATCH 3/3] docs:Update changelog. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 28837e8..94c8072 100644 --- a/README.rst +++ b/README.rst @@ -58,7 +58,7 @@ Project resources Changelog ========= -v2.1.1 (UNRELEASED) +v2.1.1 (2016-02-04) ------------------- - Replace Javascript for truncating text with more reliable CSS equivalent.