Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Web UI: main() refactoring (patch by skybon @ GH-9)

Browse Source 
Less jQuery, more Web API. Moved main() away from common.
This commit is contained in:
Mike Gelfand
2016-04-12 19:03:01 +00:00
parent e04add39ad
commit 66285a525b
5 changed files with 144 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/index.html
View File

@@ -23,6 +23,7 @@
<![endif]--> <![endif]-->
<script type="text/javascript" src="./javascript/jquery/jquery.transmenu.min.js"></script> <script type="text/javascript" src="./javascript/jquery/jquery.transmenu.min.js"></script>
<script type="text/javascript" src="./javascript/jquery/json2.min.js"></script> <script type="text/javascript" src="./javascript/jquery/json2.min.js"></script>
<script type="text/javascript" src="./javascript/polyfill.js"></script>
<script type="text/javascript" src="./javascript/common.js"></script> <script type="text/javascript" src="./javascript/common.js"></script>
<script type="text/javascript" src="./javascript/inspector.js"></script> <script type="text/javascript" src="./javascript/inspector.js"></script>
<script type="text/javascript" src="./javascript/prefs-dialog.js"></script> <script type="text/javascript" src="./javascript/prefs-dialog.js"></script>
@@ -34,6 +35,7 @@
<script type="text/javascript" src="./javascript/dialog.js"></script> <script type="text/javascript" src="./javascript/dialog.js"></script>
<script type="text/javascript" src="./javascript/formatter.js"></script> <script type="text/javascript" src="./javascript/formatter.js"></script>
<script type="text/javascript" src="./javascript/notifications.js"></script> <script type="text/javascript" src="./javascript/notifications.js"></script>
<script type="text/javascript" src="./javascript/main.js"></script>
<title>Transmission Web Interface</title> <title>Transmission Web Interface</title>
</head> </head>
<body id="transmission_body"> <body id="transmission_body">

2
web/javascript/Makefile.am
View File

@@ -6,7 +6,9 @@ dist_data_DATA = \
file-row.js \ file-row.js \
formatter.js \ formatter.js \
inspector.js \ inspector.js \
main.js \
notifications.js \ notifications.js \
polyfill.js \
prefs-dialog.js \ prefs-dialog.js \
remote.js \ remote.js \
torrent.js \ torrent.js \

65
web/javascript/common.js
View File

@@ -1,5 +1,5 @@
/** /**
* Copyright © Dave Perrett and Malcolm Jarvis * Copyright © Dave Perrett, Malcolm Jarvis and Artem Vorotnikov
* *
* This file is licensed under the GPLv2. * This file is licensed under the GPLv2.
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -10,18 +10,6 @@ var transmission,
isMobileDevice = RegExp("(iPhone|iPod|Android)").test(navigator.userAgent), isMobileDevice = RegExp("(iPhone|iPod|Android)").test(navigator.userAgent),
scroll_timeout; scroll_timeout;
if (!Array.indexOf) {
Array.prototype.indexOf = function (obj) {
var i, len;
for (i = 0, len = this.length; i < len; i++) {
if (this[i] == obj) {
return i;
};
};
return -1;
};
};
// http://forum.jquery.com/topic/combining-ui-dialog-and-tabs // http://forum.jquery.com/topic/combining-ui-dialog-and-tabs
$.fn.tabbedDialog = function (dialog_opts) { $.fn.tabbedDialog = function (dialog_opts) {
this.tabs({ this.tabs({
@@ -44,57 +32,6 @@ $.fn.tabbedDialog = function (dialog_opts) {
tabul.addClass('ui-dialog-titlebar'); tabul.addClass('ui-dialog-titlebar');
} }
$(document).ready(function () {
// IE8 and below don’t support ES5 Date.now()
if (!Date.now) {
Date.now = function () {
return +new Date();
};
};
// IE specific fixes here
if ($.browser.msie) {
try {
document.execCommand("BackgroundImageCache", false, true);
} catch (err) {};
$('.dialog_container').css('height', $(window).height() + 'px');
};
if ($.browser.safari) {
// Move search field's margin down for the styled input
$('#torrent_search').css('margin-top', 3);
};
if (isMobileDevice) {
window.onload = function () {
setTimeout(function () {
window.scrollTo(0, 1);
}, 500);
};
window.onorientationchange = function () {
setTimeout(function () {
window.scrollTo(0, 1);
}, 100);
};
if (window.navigator.standalone) {
// Fix min height for isMobileDevice when run in full screen mode from home screen
// so the footer appears in the right place
$('body div#torrent_container').css('min-height', '338px');
};
$("label[for=torrent_upload_url]").text("URL: ");
} else {
// Fix for non-Safari-3 browsers: dark borders to replace shadows.
$('div.dialog_container div.dialog_window').css('border', '1px solid #777');
};
// Initialise the dialog controller
dialog = new Dialog();
// Initialise the main Transmission controller
transmission = new Transmission();
});
/** /**
* Checks to see if the content actually changed before poking the DOM. * Checks to see if the content actually changed before poking the DOM.
*/ */

52
web/javascript/main.js Normal file
View File

@@ -0,0 +1,52 @@
/**
* Copyright © Dave Perrett, Malcolm Jarvis and Artem Vorotnikov
*
* This file is licensed under the GPLv2.
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
function main() {
// IE specific fixes here
if (jQuery.browser.msie) {
try {
document.execCommand("BackgroundImageCache", false, true);
} catch (err) {};
};
if (jQuery.browser.safari) {
// Move search field's margin down for the styled input
document.getElementById("torrent_search").style["margin-top"] = 3;
};
if (isMobileDevice) {
window.onload = function () {
setTimeout(function () {
window.scrollTo(0, 1);
}, 500);
};
window.onorientationchange = function () {
setTimeout(function () {
window.scrollTo(0, 1);
}, 100);
};
if (window.navigator.standalone) {
// Fix min height for isMobileDevice when run in full screen mode from home screen
// so the footer appears in the right place
document.getElementById("torrent_container").style["min-height"] = "338px";
};
document.querySelector("label[for=torrent_upload_url]").textContent("URL: ");
} else {
// Fix for non-Safari-3 browsers: dark borders to replace shadows.
Array.from(document.getElementsByClassName("dialog_window")).forEach(function (e) {
e.style["border"] = "1px solid #777";
});
};
// Initialise the dialog controller
dialog = new Dialog();
// Initialise the main Transmission controller
transmission = new Transmission();
};
document.addEventListener("DOMContentLoaded", main);

87
web/javascript/polyfill.js Normal file
View File

@@ -0,0 +1,87 @@
/**
* Copyright © Dave Perrett, Malcolm Jarvis and Artem Vorotnikov
*
* This file is licensed under the GPLv2.
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
if (!Array.from) {
Array.from = (function () {
var toStr = Object.prototype.toString;
var isCallable = function (fn) {
return typeof fn === 'function' || toStr.call(fn) === '[object Function]';
};
var toInteger = function (value) {
var number = Number(value);
if (isNaN(number)) {
return 0;
}
if (number === 0 || !isFinite(number)) {
return number;
}
return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number));
};
var maxSafeInteger = Math.pow(2, 53) - 1;
var toLength = function (value) {
var len = toInteger(value);
return Math.min(Math.max(len, 0), maxSafeInteger);
};
// The length property of the from method is 1.
return function from(arrayLike /*, mapFn, thisArg */ ) {
// 1. Let C be the this value.
var C = this;
// 2. Let items be ToObject(arrayLike).
var items = Object(arrayLike);
// 3. ReturnIfAbrupt(items).
if (arrayLike == null) {
throw new TypeError("Array.from requires an array-like object - not null or undefined");
}
// 4. If mapfn is undefined, then let mapping be false.
var mapFn = arguments.length > 1 ? arguments[1] : void undefined;
var T;
if (typeof mapFn !== 'undefined') {
// 5. else
// 5. a If IsCallable(mapfn) is false, throw a TypeError exception.
if (!isCallable(mapFn)) {
throw new TypeError('Array.from: when provided, the second argument must be a function');
}
// 5. b. If thisArg was supplied, let T be thisArg; else let T be undefined.
if (arguments.length > 2) {
T = arguments[2];
}
}
// 10. Let lenValue be Get(items, "length").
// 11. Let len be ToLength(lenValue).
var len = toLength(items.length);
// 13. If IsConstructor(C) is true, then
// 13. a. Let A be the result of calling the [[Construct]] internal method of C with an argument list containing the single item len.
// 14. a. Else, Let A be ArrayCreate(len).
var A = isCallable(C) ? Object(new C(len)) : new Array(len);
// 16. Let k be 0.
var k = 0;
// 17. Repeat, while k < len… (also steps a - h)
var kValue;
while (k < len) {
kValue = items[k];
if (mapFn) {
A[k] = typeof T === 'undefined' ? mapFn(kValue, k) : mapFn.call(T, kValue, k);
} else {
A[k] = kValue;
}
k += 1;
}
// 18. Let putStatus be Put(A, "length", len, true).
A.length = len;
// 20. Return A.
return A;
};
}());
}