Browse Source

Get rid of a Web UI hack for Safari since it seems useless now.

adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
79cb430878
  1. 129
      src/webui/scripts/client.js

129
src/webui/scripts/client.js

@ -9,10 +9,10 @@
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -22,116 +22,6 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
// Debug
//alert(navigator.userAgent);
// From http://www.quirksmode.org/js/detect.html
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;
}
},
dataBrowser: [
{
string: navigator.userAgent,
subString: "Chrome",
identity: "Chrome"
},
{
string: navigator.userAgent,
subString: "Epiphany",
identity: "Epiphany"
},
{
string: navigator.userAgent,
subString: "Arora",
identity: "Arora"
},
{
string: navigator.userAgent,
subString: "midori",
identity: "Midori"
},
{
string: navigator.userAgent,
subString: "OmniWeb",
versionSearch: "OmniWeb/",
identity: "OmniWeb"
},
{
string: navigator.vendor,
subString: "Apple",
identity: "Safari",
versionSearch: "Version"
},
{
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"
}
]
};
BrowserDetect.init();
myTable = new dynamicTable(); myTable = new dynamicTable();
ajaxfn = function(){}; ajaxfn = function(){};
setSortedColumn = function(index){ setSortedColumn = function(index){
@ -139,7 +29,7 @@ setSortedColumn = function(index){
}; };
window.addEvent('load', function(){ window.addEvent('load', function(){
var saveColumnSizes = function() { var saveColumnSizes = function() {
var filters_width = $('Filters').getSize().x; var filters_width = $('Filters').getSize().x;
var properties_height = $('propertiesPanel').getSize().y; var properties_height = $('propertiesPanel').getSize().y;
@ -147,7 +37,7 @@ window.addEvent('load', function(){
Cookie.write('filters_width', filters_width); Cookie.write('filters_width', filters_width);
Cookie.write('properties_height', properties_height); Cookie.write('properties_height', properties_height);
} }
/*MochaUI.Desktop = new MochaUI.Desktop(); /*MochaUI.Desktop = new MochaUI.Desktop();
MochaUI.Desktop.desktop.setStyles({ MochaUI.Desktop.desktop.setStyles({
'background': '#fff', 'background': '#fff',
@ -169,7 +59,7 @@ window.addEvent('load', function(){
}); });
new MochaUI.Column({ new MochaUI.Column({
id: 'mainColumn', id: 'mainColumn',
placement: 'main', placement: 'main',
width: null, width: null,
resizeLimit: [100, 300] resizeLimit: [100, 300]
}); });
@ -188,7 +78,7 @@ window.addEvent('load', function(){
var r=0; var r=0;
var waiting=false; var waiting=false;
var waitingTrInfo = false; var waitingTrInfo = false;
var stateToImg = function(state){ var stateToImg = function(state){
if(state == "pausedUP" || state == "pausedDL") { if(state == "pausedUP" || state == "pausedDL") {
state = "paused"; state = "paused";
@ -229,7 +119,7 @@ window.addEvent('load', function(){
}; };
$('DlInfos').addEvent('click', globalDownloadLimitFN); $('DlInfos').addEvent('click', globalDownloadLimitFN);
$('UpInfos').addEvent('click', globalUploadLimitFN); $('UpInfos').addEvent('click', globalUploadLimitFN);
var ajaxfn = function(){ var ajaxfn = function(){
var queueing_enabled = false; var queueing_enabled = false;
var url = 'json/torrents'; var url = 'json/torrents';
@ -332,10 +222,7 @@ window.addEvent('load', function(){
height: prop_h height: prop_h
}); });
//ajaxfn(); //ajaxfn();
if(BrowserDetect.browser != "Safari") { loadTransferInfo();
// Safari has trouble with this
loadTransferInfo();
}
setFilter = function(f) { setFilter = function(f) {
// Visually Select the right filter // Visually Select the right filter

Loading…
Cancel
Save