Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 27805a03a3ec2008e7363c9d0a84b655f4f210d3 (commit)
from 0b32b035b810f6d91b169ba77c1b6d1a34447ed6 (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 27805a03a3ec2008e7363c9d0a84b655f4f210d3
Author: GetAway <get...@t-...>
Date: Fri May 1 15:39:05 2015 +0200
yWeb: improve detection if IE up to IE11 and above
Version bump 2.8.2.23
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
index f59993b..3f29629 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
@@ -3,8 +3,19 @@
$Revision: 1.5 $
*/
var baselib_version="2.0.0";
-var agt=navigator.userAgent.toLowerCase();
-var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
+var tmp = document.documentMode, e, isIE;
+// Try to force this property to be a string.
+try{document.documentMode = "";}
+catch(e){ };
+// If document.documentMode is a number, then it is a read-only property, and so
+// we have IE 8+.
+// Otherwise, if conditional compilation works, then we have IE < 11.
+// Otherwise, we have a non-IE browser.
+isIE = typeof document.documentMode == "number" || new Function("return/*@cc_on!@*/!1")( );
+// Switch back the value to be unobtrusive for non-IE browsers.
+try{document.documentMode = tmp;}
+catch(e){ };
+
/*DHTML-Basics*/
function $yN(_obj_name)
{
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm
index 9ed5f52..712b376 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm
@@ -79,9 +79,7 @@ function doUpload()
<script language="JavaScript" type="text/javascript" >
//<![CDATA[
- var agt=navigator.userAgent.toLowerCase();
- var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
- if(is_ie)
+ if(isIE)
document.f.appendx.checked = true;
window.document.f.cmd.focus();
//]]>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Timer_Sync.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Timer_Sync.js
index 7600e19..9f1a818 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Timer_Sync.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Timer_Sync.js
@@ -109,8 +109,6 @@ function processReqChange()
}
else if (document.f.planer[1].checked == true)
{
- var agt=navigator.userAgent.toLowerCase();
- var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
var xml = g_req.responseXML;
var recProg_NodeList = xml.getElementsByTagName('item');
for(i=0;i<recProg_NodeList.length;i++)
@@ -119,7 +117,7 @@ function processReqChange()
var progName = getXMLNodeItemValue(recProg_Node, 'title');
var description = getXMLNodeItemValue(recProg_Node, 'description');
-//FF3?Probs if(is_ie)
+//FF3?Probs if(isIE)
{
var sDate = getXMLNodeItemValue(recProg_Node, 'dc:date');
var sender = getXMLNodeItemValue(recProg_Node, 'dc:subject');
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
index 6f308dd..5f93d47 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
@@ -29,14 +29,14 @@ CyVLC.prototype = {
this.c_masterid = masterid;
this.c_width = width;
this.c_height = height;
- if(!is_ie) {
+ if(!isIE) {
this.version_string = this._get_version();
this._generate_sub_versions();
this._determine_plugin_generation();
}
this.insert_control();
this.vlc = id(_id);
- if(is_ie) {
+ if(isIE) {
this.version_string = this._get_version();
this._generate_sub_versions();
this._determine_plugin_generation();
@@ -44,7 +44,7 @@ CyVLC.prototype = {
this.set_resolution(this.c_width, this.c_height);
},
_get_version : function() {
- if(is_ie)
+ if(isIE)
{
var vstr = this.vlc.VersionInfo;
var words = vstr.split(" ");
@@ -81,7 +81,7 @@ CyVLC.prototype = {
if(ve.length >4 && ve[4] !== "") this.version_level4 = ve[4];
},
_determine_plugin_generation : function() {
- if(is_ie)
+ if(isIE)
this.plugin = "ie1";
else
if(this.version_level1 <= 0 && this.version_level2 <= 8 && this.version_level3 <= 5)
@@ -222,7 +222,7 @@ CyVLC.prototype = {
insert_control : function()
{
var vlc_control_html = "";
- if(is_ie) {
+ if(isIE) {
vlc_control_html =
"<object classid=\"clsid:E23FE9C6-778E-49D4-B537-38FCDE4887D8\" " +
/* "<object classid=\"clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921\" " +*/
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index abd70c0..011d797 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.22
-date=18.04.2015
+version=2.8.2.23
+date=01.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js | 15 +++++++++++++--
.../neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm | 4 +---
.../daemons/nhttpd/web/Y_Tools_Timer_Sync.js | 4 +---
tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js | 10 +++++-----
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
5 files changed, 22 insertions(+), 15 deletions(-)
--
Tuxbox-GIT: apps
|
