Merge lp:~robru/unity-webapps-deezer/packaging-fixups into lp:unity-webapps-deezer

[Robert Bruce Park]

Minor packaging fixes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3
http://jenkins.qa.ubuntu.com/job/unity-webapps-deezer-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-deezer-saucy-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-deezer-saucy-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-deezer-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robru/unity-webapps-deezer/packaging-fixups]

4. By Robert Bruce Park on 2013-06-17

Replace const with var.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4
http://jenkins.qa.ubuntu.com/job/unity-webapps-deezer-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-deezer-saucy-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-deezer-saucy-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-deezer-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robru/unity-webapps-deezer/packaging-fixups]

5. By Robert Bruce Park on 2013-06-18

Appease jslint.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Deezer.user.js'
--- Deezer.user.js	2013-05-16 19:02:04 +0000
+++ Deezer.user.js	2013-06-18 00:14:26 +0000
@@ -4,7 +4,7 @@
 // ==/UserScript==
 
 // This placeholder gets munged with real data at build time.
-const WebappsGettextDict = JSON.parse(unescape(
+var WebappsGettextDict = JSON.parse(unescape(
     "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"
 ));
 
@@ -12,25 +12,25 @@
 window.Unity = Unity;
 var trackInfo;
 
-if ( typeof unsafeWindow === "undefined") {
-    unsafeWindow = evalInPageContext( function () {
+if (typeof unsafeWindow === "undefined") {
+    unsafeWindow = evalInPageContext(function () {
         return window;
     });
 }
 unsafeWindow.Unity = window.Unity;
 
 function log(txt) {
-    if(typeof(console) !== 'undefined' && typeof(console.log) != 'undefined') {
+    if (typeof (console) !== 'undefined' && typeof (console.log) !== 'undefined') {
         console.log(txt);
     }
 }
 
 function isCorrectPage() {
     var i, ids = ['h_previous', 'h_next', 'h_play'];
-    if(!unsafeWindow.dzPlayer) {
-      log("deezer not valid. unsafeWindow");
+    if (!unsafeWindow.dzPlayer) {
+        log("deezer not valid. unsafeWindow");
 
-      return false;
+        return false;
     }
     for (i = 0; i < ids.length; i++) {
         if (!document.getElementById(ids[i])) {
@@ -52,7 +52,7 @@
         artist = unsafeWindow.dzPlayer.artistName;
         title = unsafeWindow.dzPlayer.songTitle;
         album = unsafeWindow.dzPlayer.albumTitle;
-        artLocation = unsafeWindow.SETTING_DOMAIN_IMG + '/cover/' + ((typeof (unsafeWindow.dzPlayer) == 'undefined') ? '' : unsafeWindow.dzPlayer.cover) + '/315x315-000000-80-0-0.jpg';
+        artLocation = unsafeWindow.SETTING_DOMAIN_IMG + '/cover/' + ((typeof (unsafeWindow.dzPlayer) === 'undefined') ? '' : unsafeWindow.dzPlayer.cover) + '/315x315-000000-80-0-0.jpg';
     } catch (x) {
         log(x);
     }
@@ -67,16 +67,16 @@
 
 }
 
-function refreshInfos () {
+function refreshInfos() {
 
     //track info
     var oldTrackInfo;
-    if(trackInfo) {
+    if (trackInfo) {
         oldTrackInfo = trackInfo;
     }
     trackInfo = getTrackInfo();
-    if(oldTrackInfo) {
-        if (oldTrackInfo.artist != trackInfo.artist || oldTrackInfo.title != trackInfo.title) {
+    if (oldTrackInfo) {
+        if (oldTrackInfo.artist !== trackInfo.artist || oldTrackInfo.title !== trackInfo.title) {
             Unity.Notification.showNotification(trackInfo.title, trackInfo.artist, trackInfo.artLocation);
         }
     }
@@ -97,8 +97,7 @@
     Unity.Launcher.setCount(unsafeWindow.dzPlayer.getNbSongs() - unsafeWindow.dzPlayer.getNumSong());
     if (unsafeWindow.dzPlayer.isPlaying()) {
         Unity.Launcher.setProgress(unsafeWindow.dzPlayer.getPosition() /  unsafeWindow.dzPlayer.getDuration());
-    }
-    else {
+    } else {
         Unity.Launcher.clearProgress();
     }
 
@@ -118,26 +117,27 @@
 // }
 
 function playAlbumCallback(id) {
-    return wrapCallback(function() {
+    return wrapCallback(function () {
         unsafeWindow.dzPlayer.playAlbum(id);
     });
 }
 
 function playPlaylistCallback(id) {
-    return wrapCallback(function() {
+    return wrapCallback(function () {
         unsafeWindow.dzPlayer.playPlaylist(id);
     });
 }
 
 function populateUserInfos() {
-
-        log("populating user infos");
-
     //put favorite album in the HUD
     var datas = unsafeWindow.userData.data.FAVORITES_ALBUMS.data;
-
-    for (var i = datas.length - 1; i >= 0; i--) {
-        var current = datas[i];
+    var current;
+    var i;
+
+    log("populating user infos");
+
+    for (i = datas.length - 1; i >= 0; i--) {
+        current = datas[i];
         Unity.addAction("/Album/Play/" + current.ALB_TITLE + " - " + current.ART_NAME,
             playAlbumCallback(current.ALB_ID));
         log("added");
@@ -147,39 +147,31 @@
 
     //playlist favorite (not actual user playlist)
     datas = unsafeWindow.userData.data.FAVORITES_PLAYLISTS.data;
-    for (var i = datas.length - 1; i >= 0; i--) {
-        var current = datas[i];
+    for (i = datas.length - 1; i >= 0; i--) {
+        current = datas[i];
         Unity.addAction("/Playlist/Play/" + current.TITLE,
             playPlaylistCallback(current.PLAYLIST_ID));
     }
-
-    //view
 }
 
 function selfTest() {
-
-        if(!unsafeWindow.dzPlayer) {
-                reportTestState('FAILED: dzPlayer is null');
-        }
-        if(!unsafeWindow.userData) {
-                reportTestState('FAILED: userData is null');
-        }
-
-        reportTestState('PASS SELF TEST');
-
+    if (!unsafeWindow.dzPlayer) {
+        reportTestState('FAILED: dzPlayer is null');
+    }
+    if (!unsafeWindow.userData) {
+        reportTestState('FAILED: userData is null');
+    }
+
+    reportTestState('PASS SELF TEST');
 }
 
 function musicPlayerSetup() {
-
     log("start init deezer");
 
-
     Unity.MediaPlayer.init("Deezer");
 
-
     if (!isCorrectPage()) {
-
-            return;
+        return;
     }
 
     setInterval(wrapCallback(function retry() {
@@ -191,13 +183,12 @@
     }), 1000);
 
 
-    Unity.MediaPlayer.onPlayPause(wrapCallback(function() {
+    Unity.MediaPlayer.onPlayPause(wrapCallback(function () {
         if (!unsafeWindow.dzPlayer.isPlaying()) {
-                unsafeWindow.playercontrol.doAction('play');
-                //I don't like the little delay before the button updates.
-                Unity.MediaPlayer.setPlaybackState(Unity.MediaPlayer.PlaybackState.PLAYING);
-            }
-        else {
+            unsafeWindow.playercontrol.doAction('play');
+            //I don't like the little delay before the button updates.
+            Unity.MediaPlayer.setPlaybackState(Unity.MediaPlayer.PlaybackState.PLAYING);
+        } else {
             unsafeWindow.playercontrol.doAction('pause');
             Unity.MediaPlayer.setPlaybackState(Unity.MediaPlayer.PlaybackState.PAUSED);
         }
@@ -220,8 +211,10 @@
 
 }
 
-Unity.init({ name: "Deezer",
-   domain: 'deezer.com',
-   homepage: 'http://deezer.com',
-   iconUrl: "icon://unity-webapps-deezer",
-   onInit: musicPlayerSetup });
+Unity.init({
+    name: "Deezer",
+    domain: 'deezer.com',
+    homepage: 'http://deezer.com',
+    iconUrl: "icon://unity-webapps-deezer",
+    onInit: musicPlayerSetup
+});

=== modified file 'debian/control'
--- debian/control	2013-05-16 19:02:04 +0000
+++ debian/control	2013-06-18 00:14:26 +0000
@@ -1,17 +1,21 @@
 Source: unity-webapps-deezer
 Section: web
-Priority: extra
+Priority: optional
 Standards-Version: 3.9.4
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>=9),
                unity-webapps-dev (>=2.4.16),
 Homepage: https://deezer.com/
+# If you aren't a member of ~webapps but need to upload packaging changes,
+# just go ahead.  ~webapps will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~webapps/unity-webapps-deezer/trunk
 
 Package: unity-webapps-deezer
 Architecture: all
 Section: web
-Priority: extra
-Depends: unity-webapps-common, xdg-utils, ${misc:Depends}
+Depends: unity-webapps-common,
+         xdg-utils,
+         ${misc:Depends},
 XB-Ubuntu-Webapps-Includes: https://*.deezer.com/*
 XB-Ubuntu-Webapps-Name: Deezer
 XB-Ubuntu-Webapps-Domain: deezer.com

=== modified file 'debian/copyright'
--- debian/copyright	2013-05-16 19:02:04 +0000
+++ debian/copyright	2013-06-18 00:14:26 +0000
@@ -22,11 +22,6 @@
   The full text of the can be found in the file
   '/usr/share/common-licenses/GPL-3'.
 
-Files: debian/*
-Copyright: 2012 The friendly pkgme.net robot
-License: public-domain
- This automatically generated code which is free from copyright restrictions.
-
 
 Files: */*.png */*.svg
 Copyright: various