|
From: <he...@hy...> - 2007-03-13 22:08:57
|
Author: heather Date: 2007-03-13 14:08:49 -0800 (Tue, 13 Mar 2007) New Revision: 3742 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3742 Modified: trunk/web/js/requests.js Log: moved a function that was failing and blocking other functions on the page Modified: trunk/web/js/requests.js =================================================================== --- trunk/web/js/requests.js 2007-03-13 22:08:16 UTC (rev 3741) +++ trunk/web/js/requests.js 2007-03-13 22:08:49 UTC (rev 3742) @@ -1,109 +1,4 @@ -var BrowserDetect = { - init: function () { - this.browser = this.searchString(this.dataBrowser) || "An unknown browser"; - this.version = this.searchVersion(navigator.userAgent) - || this.searchVersion(navigator.appVersion) - || "an unknown version"; - this.OS = this.searchString(this.dataOS) || "an unknown OS"; - }, - searchString: function (data) { - for (var i=0;i<data.length;i++) { - var dataString = data[i].string; - var dataProp = data[i].prop; - this.versionSearchString = data[i].versionSearch || data[i].identity; - if (dataString) { - if (dataString.indexOf(data[i].subString) != -1) - return data[i].identity; - } - else if (dataProp) - return data[i].identity; - } - }, - searchVersion: function (dataString) { - var index = dataString.indexOf(this.versionSearchString); - if (index == -1) return; - return parseFloat(dataString.substring(index+this.versionSearchString.length+1)); - }, - dataBrowser: [ - { string: navigator.userAgent, - subString: "OmniWeb", - versionSearch: "OmniWeb/", - identity: "OmniWeb" - }, - { - string: navigator.vendor, - subString: "Apple", - identity: "Safari" - }, - { - prop: window.opera, - identity: "Opera" - }, - { - string: navigator.vendor, - subString: "iCab", - identity: "iCab" - }, - { - string: navigator.vendor, - subString: "KDE", - identity: "Konqueror" - }, - { - string: navigator.userAgent, - subString: "Firefox", - identity: "Firefox" - }, - { - string: navigator.vendor, - subString: "Camino", - identity: "Camino" - }, - { // for newer Netscapes (6+) - string: navigator.userAgent, - subString: "Netscape", - identity: "Netscape" - }, - { - string: navigator.userAgent, - subString: "MSIE", - identity: "Explorer", - versionSearch: "MSIE" - }, - { - string: navigator.userAgent, - subString: "Gecko", - identity: "Mozilla", - versionSearch: "rv" - }, - { // for older Netscapes (4-) - string: navigator.userAgent, - subString: "Mozilla", - identity: "Netscape", - versionSearch: "Mozilla" - } - ], - dataOS : [ - { - string: navigator.platform, - subString: "Win", - identity: "Windows" - }, - { - string: navigator.platform, - subString: "Mac", - identity: "Mac" - }, - { - string: navigator.platform, - subString: "Linux", - identity: "Linux" - } - ] -}; -BrowserDetect.init(); - { Ajax.Responders.register({ onCreate: function() { @@ -129,7 +24,6 @@ var noProblemResources = $('noProblemResources'); $('modifiedProblemTime').innerHTML = 'Updated: ' + refreshTime(); - if (mList && mList.length > 0) { var tbody = problemTable.getElementsByTagName('tbody')[0]; @@ -225,6 +119,7 @@ function showRecentAlerts(originalRequest) { + var alertText = eval("(" + originalRequest.responseText + ")"); var aList = alertText.criticalAlerts; var token = alertText.token; @@ -368,6 +263,7 @@ } function showAvailSummary(originalRequest) { + var availText = eval("(" + originalRequest.responseText + ")"); var availList = availText.availSummary; var browseUrl = $('browseUrl').href; @@ -585,6 +481,7 @@ } function showFavoriteResponse(originalRequest) { + var faveText = eval('(' + originalRequest.responseText + ')'); var fList = faveText.favorites; var table = document.getElementById('favoriteTable'); @@ -720,13 +617,7 @@ } -function onchange_time(el) { - //alert(el+", value="+ el.options[el.selectedIndex].value ); - var index= el.options[el.selectedIndex].value; - //alert('Then wait: ' + (index / 60000) + ' minutes'); - } - function refreshTime() { var curDateTime = new Date() var curHour = curDateTime.getHours() @@ -769,3 +660,109 @@ } } + +var BrowserDetect = { + init: function () { + this.browser = this.searchString(this.dataBrowser) || "An unknown browser"; + this.version = this.searchVersion(navigator.userAgent) + || this.searchVersion(navigator.appVersion) + || "an unknown version"; + this.OS = this.searchString(this.dataOS) || "an unknown OS"; + }, + searchString: function (data) { + for (var i=0;i<data.length;i++) { + var dataString = data[i].string; + var dataProp = data[i].prop; + this.versionSearchString = data[i].versionSearch || data[i].identity; + if (dataString) { + if (dataString.indexOf(data[i].subString) != -1) + return data[i].identity; + } + else if (dataProp) + return data[i].identity; + } + }, + searchVersion: function (dataString) { + var index = dataString.indexOf(this.versionSearchString); + if (index == -1) return; + return parseFloat(dataString.substring(index+this.versionSearchString.length+1)); + }, + dataBrowser: [ + { string: navigator.userAgent, + subString: "OmniWeb", + versionSearch: "OmniWeb/", + identity: "OmniWeb" + }, + { + string: navigator.vendor, + subString: "Apple", + identity: "Safari" + }, + { + prop: window.opera, + identity: "Opera" + }, + { + string: navigator.vendor, + subString: "iCab", + identity: "iCab" + }, + { + string: navigator.vendor, + subString: "KDE", + identity: "Konqueror" + }, + { + string: navigator.userAgent, + subString: "Firefox", + identity: "Firefox" + }, + { + string: navigator.vendor, + subString: "Camino", + identity: "Camino" + }, + { // for newer Netscapes (6+) + string: navigator.userAgent, + subString: "Netscape", + identity: "Netscape" + }, + { + string: navigator.userAgent, + subString: "MSIE", + identity: "Explorer", + versionSearch: "MSIE" + }, + { + string: navigator.userAgent, + subString: "Gecko", + identity: "Mozilla", + versionSearch: "rv" + }, + { // for older Netscapes (4-) + string: navigator.userAgent, + subString: "Mozilla", + identity: "Netscape", + versionSearch: "Mozilla" + } + ], + dataOS : [ + { + string: navigator.platform, + subString: "Win", + identity: "Windows" + }, + { + string: navigator.platform, + subString: "Mac", + identity: "Mac" + }, + { + string: navigator.platform, + subString: "Linux", + identity: "Linux" + } + ] + +}; +BrowserDetect.init(); |