Update samples with meta viewport; version up

[profile/ivi/sdk/web-sample-build.git] / samples / web / Sample / Tizen / Web App / MediaPlayer / project / js / player.js

diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/player.js b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/player.js
index d6867b7..3675222 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/player.js
+++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/player.js
@@ -107,56 +107,48 @@ MediaPlayer.prototype.emptyTimeouts = function()
 
 MediaPlayer.prototype.makeListBar = function(icon, i, artistTextObj, trackTextObj)
 {
-       var lightColor = "";
-       var canvasW = mediaListItemW;
-       var canvasH = mediaListItemH * 0.95 ;
+       var lightColor = (i+1)%2 !== 0 ? "lightColor " : "";
+       var nightColor = nightMode ? "night" : "";
+       var canvasW = Math.floor(mediaListItemW);
+       var canvasH = Math.floor(mediaListItemH * 0.95) ;
 
-       if ((i+1)%2 !== 0)
-       {
-               lightColor = "lightColor ";
-       }
-
-       if (nightMode)
-       {
-               this.mediaListItems.append("<li id=" + this.type + "ListItem" + i + " style='width:" + mediaListItemW + "px;" + " height:" +  mediaListItemH + "px;" +
-                       " margin-bottom: 10px' ><a href='#' class='" + lightColor + "night' >" +
-                       "<canvas id=" + this.type + "CanvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>" +
-                       "</a></li>"
-               );
-        }
-       else
-       {
-               this.mediaListItems.append("<li id=" + this.type + "ListItem" + i + " style='width:" + mediaListItemW + "px;" + " height:" +  mediaListItemH + "px;" +
-                       " margin-bottom: 10px' ><a href='#' class='" + lightColor + "night' >" +
-                       "<canvas id=" + this.type + "CanvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>" +
-                       "</a></li>"
-               );
-       }
+       this.mediaListItems.append("<li id=" + this.type + "ListItem" + i + " style='width:" + mediaListItemW + "px;" + " height:" +  mediaListItemH + "px;" +
+               " margin-bottom: 10px' ><a href='#' class='" + lightColor + nightColor + "' >" +
+               "<canvas id=" + this.type + "CanvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>" +
+               "</a></li>"
+       );
 
        try
        {
                var currentCanvas = document.getElementById(this.type + "CanvasNum" + i);
                var currentCTX = currentCanvas.getContext("2d");
 
-               this.content[i].ctx = currentCTX;
-
-               currentCTX.drawImage(icon, 0, 0, canvasH, canvasH );
-               var artistText = new TextObject(currentCTX,artistTextObj);
-               var trackText = new TextObject(currentCTX,trackTextObj);
-               var mediaTextTemp1 = screenOrientation === "portrait" ? mediaTextTemplate2 : mediaTextTemplate2Landscape;
-               var mediaTextTemp2 = screenOrientation === "portrait" ? mediaTextTemplate3 : mediaTextTemplate3Landscape;
-               var trackTextTemp = screenOrientation === "portrait" ? trackTextTemplate : trackTextTemplateLandscape;
-
-               trackText.applyTemplate(mediaTextTemp1);
-               trackText.drawObj();
-               trackText.applyTemplate(mediaTextTemp2);
-               trackText.drawObj();
-               artistText.applyTemplate(trackTextTemp);
-               artistText.drawObj();
+               if (currentCanvas && currentCTX)
+               {
+                       this.content[i].ctx = currentCTX;
+
+                       currentCTX.drawImage(icon, 0, 0, canvasH, canvasH );
+                       var artistText = new TextObject(currentCTX,artistTextObj);
+                       var trackText = new TextObject(currentCTX,trackTextObj);
+                       var trackTextTemp1 = screenOrientation === "portrait" ? mediaTextTemplate2 : mediaTextTemplate2Landscape;
+                       var trackTextTemp2 = screenOrientation === "portrait" ? mediaTextTemplate3 : mediaTextTemplate3Landscape;
+                       var artistTextTemp = screenOrientation === "portrait" ? trackTextTemplate : trackTextTemplateLandscape;
+
+                       trackText.applyTemplate(trackTextTemp1);
+                       trackText.drawObj();
+                       trackText.applyTemplate(trackTextTemp2);
+                       trackText.drawObj();
+                       artistText.applyTemplate(artistTextTemp);
+                       artistText.drawObj();
+               }
+               else
+                       console.log("MediaPlayer: Failed to draw media item for index " + i );
        }
        catch(err)
        {
            console.log("MediaPlayer: drawImage failed for " + this.type + " - reason -> " + err);
+           console.log("Source below");
+           console.log("Src = " + icon.src);
        }
 }