fixed missing semicolon warning; updated ruby dependencies

AntonioNav · Apr 10, 2014 · 3b343ed · 3b343ed
1 parent 2776420
commit 3b343ed
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 32 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,8 @@
 # Pull gems from RubyGems.
 source 'https://rubygems.org'
 
-gem 'sass', "3.3.0.rc.2"
-gem 'compass', "1.0.0.alpha.17"
-gem "compass-core", "1.0.0.alpha.16"
+gem 'sass', "~> 3.3"
+gem 'compass', "1.0.0.alpha.19"
+gem "compass-core", "1.0.0.alpha.19"
 gem 'breakpoint', "2.4.1"
-gem 'singularitygs', "1.2.0.rc.6"
+gem 'singularitygs', "~> 1.2"
diff --git a/buildchorus.sh b/buildchorus.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if ["$1" == ""]; then
+if [ "$1" == "" ]; then
   echo "Missing version number. I did nothing"
   exit 1
 fi

diff --git a/dist/chorus.js b/dist/chorus.js
@@ -14046,10 +14046,7 @@ $(document).ready(function(){
     var minutes = parseInt( totalSec / 60 ) % 60;
     var seconds = totalSec % 60;
 
-    // return a string with zeros only when we need em
-    return (hours > 0 ? hours + ":" : "") + //hours
-      (minutes > 0 ? (hours > 0 && minutes < 10 ? "0" + minutes : minutes) + ":" : (hours > 0 ? "00:" : "")) + //mins
-      (seconds  < 10 ? "0" + seconds : seconds); //seconds
+    return { hours: hours, minutes: minutes, seconds: seconds };
   };
 
 
@@ -17844,8 +17841,8 @@ app.audioStreaming = {
           };
 
           // time
-          $('.time-cur', $time).html(app.helpers.secToTime(Math.floor(pos)));
-          $('.time-total', $time).html(app.helpers.secToTime(Math.floor(dur)));
+          $('.time-cur', $time).html(app.helpers.formatTime(app.helpers.secToTime(Math.floor(pos))));
+          $('.time-total', $time).html(app.helpers.formatTime(app.helpers.secToTime(Math.floor(dur))));
 
           //update 100 times per song
           if(per != app.audioStreaming.lastPos){
@@ -23950,7 +23947,7 @@ app.playerStateView = Backbone.View.extend({
       cur = app.helpers.formatTime(data.player.time);
     } else if (data.activePlayer === 0){
       // Audio
-      dur = app.helpers.secToTime(parseInt(data.item.duration));
+      dur = app.helpers.formatTime(app.helpers.secToTime(parseInt(data.item.duration)));
       cur = app.helpers.formatTime(data.player.time);
       //cur = app.helpers.secToTime(Math.floor((parseInt(data.player.percentage) / 100) * parseInt(data.item.duration)));
     }
@@ -24323,7 +24320,7 @@ app.PlaylistItemView = Backbone.View.extend({
       model.artistString = (typeof model.artist != 'undefined' && typeof model.artist[0] != 'undefined' ? model.artist[0] : '');
 
       // build song vars
-      title = 'Track: ' + this.model.track + ' Duration: ' + app.helpers.secToTime(this.model.duration);
+      title = 'Track: ' + this.model.track + ' Duration: ' + app.helpers.formatTime(app.helpers.secToTime(this.model.duration));
       url = '#search/' + (model.albumArtistString !== '' ? model.albumArtistString : model.artistString);
       text = (model.artistString !== '' ? model.artistString : model.albumArtistString);
 

diff --git a/dist/chorus.min.js b/dist/chorus.min.js
diff --git a/dist/theme/css/styles.css b/dist/theme/css/styles.css
@@ -580,7 +580,7 @@ h4 {
 .loading-box {
   font-size: 30px;
   color: #6e7374;
-  background: #fafafa url('../images/loading-box-bg.jpg?1390099084') 0 bottom repeat-x;
+  background: #fafafa url('../images/loading-box-bg.jpg?1397051872') 0 bottom repeat-x;
   padding: 40px 10px 40px 10px;
   width: 70%;
   margin: 80px auto 0 auto;
@@ -695,7 +695,7 @@ input[type="text"] {
 }
 .ui-dialog .ui-dialog-titlebar-close:hover .ui-icon-closethick, .ui-dialog .ui-dialog-titlebar-close:focus .ui-icon-closethick,
 .ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick:hover {
-  background-image: url('../images/ui-icons_888888_256x240.png?1371898626');
+  background-image: url('../images/ui-icons_888888_256x240.png?1397051872');
 }
 .ui-dialog .ui-dialog-titlebar,
 .ui-dialog .form-text,
@@ -1216,7 +1216,7 @@ input[type="text"] {
   opacity: 0.5;
 }
 .entity-heading.loading {
-  background: #fafafa url('../images/loading-box-bg.jpg?1390099084') 0 bottom repeat-x;
+  background: #fafafa url('../images/loading-box-bg.jpg?1397051872') 0 bottom repeat-x;
   animation: wave 16s infinite linear;
   -webkit-animation: wave 16s infinite linear;
 }
@@ -1679,7 +1679,7 @@ body.fixed-header #search-box {
   color: #444;
 }
 #sidebar-first .file-lists li.loading {
-  background-image: url('../images/loader.gif?1387808230');
+  background-image: url('../images/loader.gif?1397051872');
   background-position: 98% 6px;
   background-repeat: no-repeat;
 }
@@ -2515,14 +2515,14 @@ body.notconnected #header #logo {
   border-bottom-color: #511e14 !important;
 }
 body.notconnected .track.playing-row {
-  background-image: url('../images/icons/row-pause.png?1378549596') !important;
+  background-image: url('../images/icons/row-pause.png?1397051872') !important;
 }
 body .player-play .fa-pause {
   display: none;
   margin-top: 3px;
 }
 body.paused .playing-row .song-tracknum, body.playing .playing-row .song-tracknum {
-  background: url('../images/row-playing.gif?1378547169') 50% 50% no-repeat;
+  background: url('../images/row-playing.gif?1397051872') 50% 50% no-repeat;
   text-indent: -999999px;
 }
 body.playing .player-play .fa-pause {
@@ -2545,10 +2545,10 @@ body.playing #progress-bar.ui-slider .ui-slider-range {
   border-top: 3px solid #f39c12;
 }
 body.paused .playing-row .song-tracknum {
-  background: url('../images/icons/row-pause.png?1378549596') 50% 50% no-repeat;
+  background: url('../images/icons/row-pause.png?1397051872') 50% 50% no-repeat;
 }
 body.paused ul.playlist .playing-row {
-  background-image: url('../images/icons/row-pause.png?1378549596');
+  background-image: url('../images/icons/row-pause.png?1397051872');
 }
 body.muted #footer .footer-right .actions-wrapper .fa-volume-up {
   display: block;
@@ -2591,7 +2591,7 @@ body.player-view-local.fixed-header #page-header {
   background: rgba(72, 78, 80, 0.97);
 }
 body.browser-playing .browser-playlist-song-list div.playlist-item.browser-playing-row {
-  background-image: url('../images/row-playing.gif?1378547169');
+  background-image: url('../images/row-playing.gif?1397051872');
 }
 body.browser-playing #browser-player-footer .footer-left .fa-play {
   display: none;
@@ -3505,7 +3505,7 @@ body.section-thumbsup .playlist-song-list li .song-actions-wrapper .btn.song-rem
   color: #6e7374;
 }
 .album-row .album-info {
-  background: url('../images/loading-box-bg.jpg?1390099084') 0 bottom repeat-x;
+  background: url('../images/loading-box-bg.jpg?1397051872') 0 bottom repeat-x;
   color: #6e7374;
   border-bottom: 3px solid #eee;
 }
@@ -4146,7 +4146,7 @@ body.section-thumbsup .playlist-song-list li .song-actions-wrapper .btn.song-rem
   transition: all 0.3s linear;
   height: 80px;
   background: #eeeff0;
-  background: url('../images/row-playing.gif?1378547169') 0px 0px no-repeat;
+  background: url('../images/row-playing.gif?1397051872') 0px 0px no-repeat;
   padding-right: 75px;
   background-color: #eeeeee;
 }

diff --git a/src/js/utils.js b/src/js/utils.js
@@ -252,7 +252,7 @@ $(document).ready(function(){
     var minutes = parseInt( totalSec / 60 ) % 60;
     var seconds = totalSec % 60;
 
-    return { hours: hours, minutes: minutes, seconds: seconds }
+    return { hours: hours, minutes: minutes, seconds: seconds };
   };
 
 

diff --git a/webinterface.chorus.0.3.3.zip → webinterface.chorus.0.3.4.zip b/webinterface.chorus.0.3.3.zip → webinterface.chorus.0.3.4.zip