[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-540-g6ac05e3

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

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  6ac05e3530827615f677f9c0e1d867e559a0fcb6 (commit)
      from  5e90418e40a63670acb5fd2c9ed7fc9c7d7af693 (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 6ac05e3530827615f677f9c0e1d867e559a0fcb6
Author: Jacek Jendrzej <cra...@go...>
Date:   Mon May 4 18:39:01 2015 +0200

    Y_VLC.js fix VLC detection without var plugin.version (linux)
    
    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 4263c41..42aab06 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
@@ -52,6 +52,7 @@ CyVLC.prototype = {
 		}
 		else if (navigator.plugins && (navigator.plugins.length > 0)) {
 				var numPlugins = navigator.plugins.length;
+				var plug_version = "0.0.0";
 				for(var i = 0; i < numPlugins; i++) {
 					var plugin = navigator.plugins[i];
 					var numTypes = plugin.length;
@@ -60,12 +61,32 @@ CyVLC.prototype = {
 						var mimetype = plugin[j];
 						if (mimetype) {
 							if (mimetype.type.indexOf("application/x-vlc-plugin") != -1) {
-								return plugin.version;
+								if(plugin.version != 0){
+									plug_version = plugin.version;
+									break;
+								}
+								else
+								{
+									var Suche = /(PLUGIN)/gi;
+									var Ergebnis = Suche.test(plugin.description);
+									if (Ergebnis == true){
+										var ex = /^.*[pP]lugin [\"]*([^ \"]*)[\"]*.*$/;
+										var ve = ex.exec(plugin.description);
+									}else{
+										var ex = /^.*[vV]ersion [\"]*([^ \"]*)[\"]*.*$/;
+										var ve = ex.exec(plugin.description);
+									}
+									var Suche = /([0-9])/g;
+									var Ergebnis = Suche.test(ve);
+									if (Ergebnis == true)
+										plug_version = ve[1];
+									break;
+								}
 							}
 						}
 					}
 				}
-				return "0.0.0";
+				return plug_version;
 		}
 		else
 			return "0.0.0";
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 2b0225b..646463b 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.25
-date=03.05.2015
+version=2.8.2.26
+date=04.05.2015
 type=Release
 info=Tuxbox

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

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


-- 
Tuxbox-GIT: apps