[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-538-g2f432a9

[GetAway <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  2f432a983a24770deee688f607bddf97536b4e5b (commit)
      from  d1a86219bc9080bb60fab8492adc8793cf1c578c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f432a983a24770deee688f607bddf97536b4e5b
Author: GetAway <get...@t-...>
Date:   Sat May 2 15:54:21 2015 +0200

    yWeb:fix visibility of VLC in IE11
    
    format some code
    remove some unnecessary 'break;'
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
index 5f93d47..4263c41 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
@@ -142,9 +142,9 @@ CyVLC.prototype = {
 	},
 	is_playing : function() {
 		switch(this.plugin) {
-			case "ie1":	return this.vlc.Playing;break;
-			case "moz2":	return this.vlc.playlist.isPlaying;break;
-			default:	return this.vlc.isplaying();break;
+			case "ie1":	return this.vlc.Playing;
+			case "moz2":	return this.vlc.playlist.isPlaying;
+			default:	return this.vlc.isplaying();
 		}
 	},
 	toggle_fullscreen : function() {
@@ -162,9 +162,9 @@ CyVLC.prototype = {
 	},
 	get_volume : function() {
 		switch(this.plugin) {
-			case "ie1":	return this.vlc.volume;break;
-			case "moz2":	return this.vlc.audio.volume;break;
-			default:	return this.vlc.get_volume();break;
+			case "ie1":	return this.vlc.volume;
+			case "moz2":	return this.vlc.audio.volume;
+			default:	return this.vlc.get_volume();
 		}
 	},
 	set_volume_delta : function(delta) {
@@ -209,14 +209,14 @@ CyVLC.prototype = {
 	set_resolution : function (w,h) {
 		this.vlc.width		= w;
 		this.vlc.height		= h;
-		this.vlc.style.width 	= w;
-		this.vlc.style.height 	= h;
+		this.vlc.style.width 	= w+"px";
+		this.vlc.style.height 	= h+"px";
 	},
 	have_options : function() {
 		switch(this.plugin) {
 			case "ie1":
-			case "moz2":	return true;break;
-			default:	return false;break;
+			case "moz2":	return true;
+			default:	return false;
 		}
 	},
 	insert_control : function()
@@ -224,31 +224,32 @@ CyVLC.prototype = {
 		var vlc_control_html = "";
 		if(isIE) {
 			vlc_control_html =
-				"<object classid=\"clsid:E23FE9C6-778E-49D4-B537-38FCDE4887D8\" " +
-/*				"<object classid=\"clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921\" " +*/
-				
-					"width=\""+this.c_width+"\" height=\""+this.c_height+"\" id=\""+this.id+"\" events=\"True\">" +
-					"<param name='ShowDisplay' value='"+this.c_show_display+"' />" +
-					"<param name='Loop' value='"+this.c_loop+"' />" +
-					"<param name='AutoPlay' value='"+this.c_auto_play+"' />" +
-/*					"<param name=\"Visible\" value=\"-1\"/>" + */
-					"<param name='ShowDisplay' value='True'/>" +
-					"The VideoLan Client ActiveX is not installed.<br/>"+
-					"You need <a href='http://www.videolan.org' target='_blank'>VideoLan Client</a> V0.8.5 or higher.<br/>" +
-					"Install with Option ActiveX." +
-				"</object>";
+				"<object classid=\"clsid:E23FE9C6-778E-49D4-B537-38FCDE4887D8\""
+//				"<object classid=\"clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921\""
+				+ "width=\""  + this.c_width  + "\""
+				+ "height=\"" + this.c_height + "\""
+				+ "id=\""     + this.id       + "\" events=\"True\">"
+				+ "<param name=\"ShowDisplay\" value=\"" + this.c_show_display + "\" />"
+				+ "<param name=\"Loop\" value=\""        + this.c_loop         + "\" />"
+				+ "<param name=\"AutoPlay\" value=\""    + this.c_auto_play    + "\" />"
+				+ "The VideoLan Client ActiveX is not installed.<br />"
+				+ "You need <a href=\"http://www.videolan.org\" target=\"_blank\">VideoLan Client</a> V0.8.6 or higher.<br />"
+				+ "Install with Option ActiveX."
+				+ "</object>";
 		}
 		else {
-			vlc_control_html = "<embed type='application/x-vlc-plugin'";
+			vlc_control_html = "<embed type=\"application/x-vlc-plugin\""
 			if(this.plugin == "moz2")
 				vlc_control_html += "version=\"VideoLAN.VLCPlugin.2\"";
 			vlc_control_html +=
-				"id='"+this.id+"'"+
-				"autoplay='"+this.c_auto_play+"' loop='"+this.c_loop+"' width='"+this.c_width+"' height='"+this.c_height+"'" +
-				"target='' >" +
-				"</embed>";
+				"version=\"VideoLAN.VLCPlugin.2\""
+				+ "id=\""       + this.id          + "\""
+				+ "autoplay=\"" + this.c_auto_play + "\""
+				+ "autoloop=\"" + this.c_loop      + "\""
+				+ "width=\""    + this.c_width     + "\""
+				+ "height=\""   + this.c_height    + "\" >"
+				+ "</embed>";
 		}
 		obj_update(this.c_masterid,vlc_control_html);
-		this.vlc = id(this.id);
 	}
 };
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 011d797..58c57c3 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.2.23
-date=01.05.2015
+version=2.8.2.24
+date=02.05.2015
 type=Release
 info=Tuxbox

-----------------------------------------------------------------------

Summary of changes:
 tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js      |   59 +++++++++++-----------
 tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt |    4 +-
 2 files changed, 32 insertions(+), 31 deletions(-)


-- 
Tuxbox-GIT: apps