Skip to content

Commit

Permalink
new messic html tab page label when playing #125
Browse files Browse the repository at this point in the history 
final version 1.1.0 at poms
  • Loading branch information
@spheras
spheras committed Apr 2, 2016
1 parent 99f5e8e commit 0d90879
Show file tree
Hide file tree
Showing 27 changed files with 37 additions and 28 deletions.
2 changes: 1 addition & 1 deletion src/messic-assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-api-playlists/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-datamodel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-dlna/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-osgiservices/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-internationalization-ca/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-internationalization-en/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-internationalization-es/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-musicinfo-discogs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-musicinfo-duckduckgoimages/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-musicinfo-wikipedia/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-musicinfo-youtube/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-radio-icecast2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-tagwizard-audiotagger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-tagwizard-discogs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-plugin-tagwizard-freedb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-webapp-logics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-server-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions src/messic-server-webapp/src/main/webapp/js/jplayer.playlist.messic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,13 +536,13 @@

//messic change title
var mediaToPlay=this.playlist[this.current];
mainChangeTitle("messic - " + mediaToPlay.author + " - " + mediaToPlay.album + " - " + mediaToPlay.song );
mainChangeMessicTitle(mediaToPlay.author, mediaToPlay.album, mediaToPlay.song );
}
} else if (index === undefined) {
$(this.cssSelector.jPlayer).jPlayer("play");
//messic change title
var mediaToPlay=this.playlist[this.current];
mainChangeTitle("messic - " + mediaToPlay.author + " - " + mediaToPlay.album + " - " + mediaToPlay.song );
mainChangeMessicTitle(mediaToPlay.author, mediaToPlay.album, mediaToPlay.song );
}
},
pause: function () {
Expand Down
9 changes: 9 additions & 0 deletions src/messic-server-webapp/src/main/webapp/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ function addSong(titleA, authorSid, authorName, albumSid, albumName, songSid, so
/* clear the current playlist */
function clearPlaylist() {
playlist.remove();
mainChangeTitle("messic");
if (mainMessicRadio) {
mainMessicRadio.messicRadioRemovedSong(99999);
}
Expand Down Expand Up @@ -959,6 +960,14 @@ function mainPinPlaylist() {

}

/**
* function to change the title based on a song info
* the result will be messic » songname - authorname [albumname]
*/
function mainChangeMessicTitle(authorname, albumname, songname){
mainChangeTitle("messic » "+ songname + " - " + authorname + " ["+albumname+"]");
}

/**
* function to change the title
*/
Expand Down
2 changes: 1 addition & 1 deletion src/messic-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/messic-updater-bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
<version>1.1.0-rc.2</version>
<version>1.1.0</version>
<relativePath>../messic/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions src/messic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- example: 1.0.5-beta.40 -->
<!-- means: major version is 1, minor version is 0.. -->
<!-- there have been applied 5 patch, and this is the beta compiled 40. -->
<version>1.1.0-rc.2</version>
<version>1.1.0</version>

<groupId>org.messic</groupId>
<artifactId>messic</artifactId>
Expand All @@ -30,7 +30,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
<messic.version>1.1.0-rc.2</messic.version>
<messic.version>1.1.0</messic.version>
</properties>

<modules>
Expand Down

0 comments on commit 0d90879

Please sign in to comment.