From d0886f8db0492b7a33efcef66af7d7888c0ff410 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 12 Dec 2018 12:23:56 +0800 Subject: [PATCH] Reformat WebUI code --- .../www/private/installsearchplugin.html | 7 +- .../www/private/preferences_content.html | 6 +- src/webui/www/private/scripts/client.js | 24 +- src/webui/www/private/scripts/contextmenu.js | 2 +- src/webui/www/private/scripts/dynamicTable.js | 274 +++++++++--------- src/webui/www/private/search.html | 5 +- src/webui/www/private/searchplugins.html | 3 +- src/webui/www/private/transferlist.html | 2 +- 8 files changed, 163 insertions(+), 160 deletions(-) diff --git a/src/webui/www/private/installsearchplugin.html b/src/webui/www/private/installsearchplugin.html index 87f277657..7ea7b9d73 100644 --- a/src/webui/www/private/installsearchplugin.html +++ b/src/webui/www/private/installsearchplugin.html @@ -11,6 +11,7 @@ width: 100%; line-height: 2em; } +
@@ -20,7 +21,7 @@
-
+
@@ -32,7 +33,7 @@ var installSearchPluginKeyboardEvents = new Keyboard({ defaultEventType: 'keydown', events: { - 'enter': function (e) { + 'enter': function(e) { // accept enter key as a click new Event(e).stop(); @@ -59,7 +60,7 @@ data: { sources: path, }, - onRequest: function(){ + onRequest: function() { closeSearchWindow('installSearchPlugin'); } }).send(); diff --git a/src/webui/www/private/preferences_content.html b/src/webui/www/private/preferences_content.html index 13a70ac64..b4febe58c 100644 --- a/src/webui/www/private/preferences_content.html +++ b/src/webui/www/private/preferences_content.html @@ -86,7 +86,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js index 9eef90af1..9f5abaf27 100644 --- a/src/webui/www/private/scripts/client.js +++ b/src/webui/www/private/scripts/client.js @@ -644,20 +644,20 @@ window.addEvent('load', function() { var addSearchPanel = function() { new MochaUI.Panel({ - id : 'SearchPanel', - title : 'Search', - header : false, - padding : { - top : 0, - right : 0, - bottom : 0, - left : 0 + id: 'SearchPanel', + title: 'Search', + header: false, + padding: { + top: 0, + right: 0, + bottom: 0, + left: 0 }, - loadMethod : 'xhr', - contentURL : 'search.html', + loadMethod: 'xhr', + contentURL: 'search.html', content: '', - column : 'searchTabColumn', - height : null + column: 'searchTabColumn', + height: null }); }; diff --git a/src/webui/www/private/scripts/contextmenu.js b/src/webui/www/private/scripts/contextmenu.js index bbf9659be..b4a544ca2 100644 --- a/src/webui/www/private/scripts/contextmenu.js +++ b/src/webui/www/private/scripts/contextmenu.js @@ -406,7 +406,7 @@ var CategoriesFilterContextMenu = new Class({ var SearchPluginsTableContextMenu = new Class({ Extends: ContextMenu, - updateMenuItems: function () { + updateMenuItems: function() { var enabledColumnIndex = function(text) { var columns = $("searchPluginsTableFixedHeaderRow").getChildren("th"); for (var i = 0; i < columns.length; ++i) diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index ba98f7c66..60b02ebf9 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -1387,164 +1387,164 @@ var TorrentPeersTable = new Class({ }); var SearchResultsTable = new Class({ - Extends: DynamicTable, - - initColumns: function () { - this.newColumn('fileName', '', 'QBT_TR(Name)QBT_TR[CONTEXT=SearchResultsTable]', 500, true); - this.newColumn('fileSize', '', 'QBT_TR(Size)QBT_TR[CONTEXT=SearchResultsTable]', 100, true); - this.newColumn('nbSeeders', '', 'QBT_TR(Seeders)QBT_TR[CONTEXT=SearchResultsTable]', 100, true); - this.newColumn('nbLeechers', '', 'QBT_TR(Leechers)QBT_TR[CONTEXT=SearchResultsTable]', 100, true); - this.newColumn('siteUrl', '', 'QBT_TR(Search engine)QBT_TR[CONTEXT=SearchResultsTable]', 250, true); - - this.initColumnsFunctions(); - }, - - initColumnsFunctions: function () { - var displayText = function (td, row) { - var value = this.getRowValue(row); - td.set('html', escapeHtml(value)); - } - var displaySize = function(td, row) { - var size = this.getRowValue(row); - td.set('html', friendlyUnit(size, false)); - } - var displayNum = function (td, row) { - var value = escapeHtml(this.getRowValue(row)); - td.set('html', (value === "-1") ? "Unknown" : value); - } + Extends: DynamicTable, - this.columns['fileName'].updateTd = displayText; - this.columns['fileSize'].updateTd = displaySize; - this.columns['nbSeeders'].updateTd = displayNum; - this.columns['nbLeechers'].updateTd = displayNum; - this.columns['siteUrl'].updateTd = displayText; - }, - - getFilteredAndSortedRows: function () { - var containsAll = function(text, searchTerms) { - text = text.toLowerCase(); - for (var i = 0; i < searchTerms.length; ++i) { - if (text.indexOf(searchTerms[i].toLowerCase()) === -1) - return false; - } + initColumns: function() { + this.newColumn('fileName', '', 'QBT_TR(Name)QBT_TR[CONTEXT=SearchResultsTable]', 500, true); + this.newColumn('fileSize', '', 'QBT_TR(Size)QBT_TR[CONTEXT=SearchResultsTable]', 100, true); + this.newColumn('nbSeeders', '', 'QBT_TR(Seeders)QBT_TR[CONTEXT=SearchResultsTable]', 100, true); + this.newColumn('nbLeechers', '', 'QBT_TR(Leechers)QBT_TR[CONTEXT=SearchResultsTable]', 100, true); + this.newColumn('siteUrl', '', 'QBT_TR(Search engine)QBT_TR[CONTEXT=SearchResultsTable]', 250, true); - return true; - }; + this.initColumnsFunctions(); + }, - var getSizeFilters = function() { - var minSize = (searchSizeFilter.min > 0.00) ? (searchSizeFilter.min * Math.pow(1024, searchSizeFilter.minUnit)) : 0.00; - var maxSize = (searchSizeFilter.max > 0.00) ? (searchSizeFilter.max * Math.pow(1024, searchSizeFilter.maxUnit)) : 0.00; + initColumnsFunctions: function() { + var displayText = function(td, row) { + var value = this.getRowValue(row); + td.set('html', escapeHtml(value)); + } + var displaySize = function(td, row) { + var size = this.getRowValue(row); + td.set('html', friendlyUnit(size, false)); + } + var displayNum = function(td, row) { + var value = escapeHtml(this.getRowValue(row)); + td.set('html', (value === "-1") ? "Unknown" : value); + } - if ((minSize > maxSize) && (maxSize > 0.00)) { - var tmp = minSize; - minSize = maxSize; - maxSize = tmp; - } + this.columns['fileName'].updateTd = displayText; + this.columns['fileSize'].updateTd = displaySize; + this.columns['nbSeeders'].updateTd = displayNum; + this.columns['nbLeechers'].updateTd = displayNum; + this.columns['siteUrl'].updateTd = displayText; + }, - return { - min: minSize, - max: maxSize - } - }; + getFilteredAndSortedRows: function() { + var containsAll = function(text, searchTerms) { + text = text.toLowerCase(); + for (var i = 0; i < searchTerms.length; ++i) { + if (text.indexOf(searchTerms[i].toLowerCase()) === -1) + return false; + } - var getSeedsFilters = function() { - var minSeeds = (searchSeedsFilter.min > 0) ? searchSeedsFilter.min : 0; - var maxSeeds = (searchSeedsFilter.max > 0) ? searchSeedsFilter.max : 0; + return true; + }; - if ((minSeeds > maxSeeds) && (maxSeeds > 0)) { - var tmp = minSeeds; - minSeeds = maxSeeds; - maxSeeds = tmp; - } + var getSizeFilters = function() { + var minSize = (searchSizeFilter.min > 0.00) ? (searchSizeFilter.min * Math.pow(1024, searchSizeFilter.minUnit)) : 0.00; + var maxSize = (searchSizeFilter.max > 0.00) ? (searchSizeFilter.max * Math.pow(1024, searchSizeFilter.maxUnit)) : 0.00; - return { - min: minSeeds, - max: maxSeeds - } + if ((minSize > maxSize) && (maxSize > 0.00)) { + var tmp = minSize; + minSize = maxSize; + maxSize = tmp; } - var filteredRows = []; - var rows = this.rows.getValues(); - var searchTerms = searchPattern.toLowerCase().split(" "); - var filterTerms = searchFilterPattern.toLowerCase().split(" "); - var sizeFilters = getSizeFilters(); - var seedsFilters = getSeedsFilters(); - var searchInTorrentName = $('searchInTorrentName').get('value') === "names"; - - if (searchInTorrentName || filterTerms.length || (searchSizeFilter.min > 0.00) || (searchSizeFilter.max > 0.00)) { - for (var i = 0; i < rows.length; ++i) { - var row = rows[i]; - - if (searchInTorrentName && !containsAll(row.full_data.fileName, searchTerms)) continue; - if (filterTerms.length && !containsAll(row.full_data.fileName, filterTerms)) continue; - if ((sizeFilters.min > 0.00) && (row.full_data.fileSize < sizeFilters.min)) continue; - if ((sizeFilters.max > 0.00) && (row.full_data.fileSize > sizeFilters.max)) continue; - if ((seedsFilters.min > 0) && (row.full_data.nbSeeders < seedsFilters.min)) continue; - if ((seedsFilters.max > 0) && (row.full_data.nbSeeders > seedsFilters.max)) continue; - - filteredRows.push(row); - } - } - else { - filteredRows = rows; + return { + min: minSize, + max: maxSize } + }; - filteredRows.sort(function (row1, row2) { - var column = this.columns[this.sortedColumn]; - var res = column.compareRows(row1, row2); - if (this.reverseSort == '0') - return res; - else - return -res; - }.bind(this)); + var getSeedsFilters = function() { + var minSeeds = (searchSeedsFilter.min > 0) ? searchSeedsFilter.min : 0; + var maxSeeds = (searchSeedsFilter.max > 0) ? searchSeedsFilter.max : 0; - return filteredRows; - }, + if ((minSeeds > maxSeeds) && (maxSeeds > 0)) { + var tmp = minSeeds; + minSeeds = maxSeeds; + maxSeeds = tmp; + } - setupTr: function (tr) { - tr.addClass("searchTableRow"); + return { + min: minSeeds, + max: maxSeeds + } } - }); -var SearchPluginsTable = new Class({ - Extends: DynamicTable, + var filteredRows = []; + var rows = this.rows.getValues(); + var searchTerms = searchPattern.toLowerCase().split(" "); + var filterTerms = searchFilterPattern.toLowerCase().split(" "); + var sizeFilters = getSizeFilters(); + var seedsFilters = getSeedsFilters(); + var searchInTorrentName = $('searchInTorrentName').get('value') === "names"; + + if (searchInTorrentName || filterTerms.length || (searchSizeFilter.min > 0.00) || (searchSizeFilter.max > 0.00)) { + for (var i = 0; i < rows.length; ++i) { + var row = rows[i]; + + if (searchInTorrentName && !containsAll(row.full_data.fileName, searchTerms)) continue; + if (filterTerms.length && !containsAll(row.full_data.fileName, filterTerms)) continue; + if ((sizeFilters.min > 0.00) && (row.full_data.fileSize < sizeFilters.min)) continue; + if ((sizeFilters.max > 0.00) && (row.full_data.fileSize > sizeFilters.max)) continue; + if ((seedsFilters.min > 0) && (row.full_data.nbSeeders < seedsFilters.min)) continue; + if ((seedsFilters.max > 0) && (row.full_data.nbSeeders > seedsFilters.max)) continue; + + filteredRows.push(row); + } + } + else { + filteredRows = rows; + } - initColumns: function () { - this.newColumn('fullName', '', 'QBT_TR(Name)QBT_TR[CONTEXT=SearchPluginsTable]', 175, true); - this.newColumn('version', '', 'QBT_TR(Version)QBT_TR[CONTEXT=SearchPluginsTable]', 100, true); - this.newColumn('url', '', 'QBT_TR(Url)QBT_TR[CONTEXT=SearchPluginsTable]', 175, true); - this.newColumn('enabled', '', 'QBT_TR(Enabled)QBT_TR[CONTEXT=SearchPluginsTable]', 100, true); + filteredRows.sort(function(row1, row2) { + var column = this.columns[this.sortedColumn]; + var res = column.compareRows(row1, row2); + if (this.reverseSort == '0') + return res; + else + return -res; + }.bind(this)); - this.initColumnsFunctions(); - }, + return filteredRows; + }, - initColumnsFunctions: function () { - var displayText = function (td, row) { - var value = this.getRowValue(row); - td.set('html', escapeHtml(value)); - } + setupTr: function(tr) { + tr.addClass("searchTableRow"); + } +}); - this.columns['fullName'].updateTd = displayText; - this.columns['version'].updateTd = displayText; - this.columns['url'].updateTd = displayText; - this.columns['enabled'].updateTd = function(td, row) { - var value = this.getRowValue(row); - if (value) { - td.set('html', "Yes"); - td.getParent("tr").addClass("green"); - td.getParent("tr").removeClass("red"); - } - else { - td.set('html', "No"); - td.getParent("tr").addClass("red"); - td.getParent("tr").removeClass("green"); - } - }; - }, +var SearchPluginsTable = new Class({ + Extends: DynamicTable, - setupTr: function (tr) { - tr.addClass("searchPluginsTableRow"); + initColumns: function() { + this.newColumn('fullName', '', 'QBT_TR(Name)QBT_TR[CONTEXT=SearchPluginsTable]', 175, true); + this.newColumn('version', '', 'QBT_TR(Version)QBT_TR[CONTEXT=SearchPluginsTable]', 100, true); + this.newColumn('url', '', 'QBT_TR(Url)QBT_TR[CONTEXT=SearchPluginsTable]', 175, true); + this.newColumn('enabled', '', 'QBT_TR(Enabled)QBT_TR[CONTEXT=SearchPluginsTable]', 100, true); + + this.initColumnsFunctions(); + }, + + initColumnsFunctions: function() { + var displayText = function(td, row) { + var value = this.getRowValue(row); + td.set('html', escapeHtml(value)); } - }); + + this.columns['fullName'].updateTd = displayText; + this.columns['version'].updateTd = displayText; + this.columns['url'].updateTd = displayText; + this.columns['enabled'].updateTd = function(td, row) { + var value = this.getRowValue(row); + if (value) { + td.set('html', "Yes"); + td.getParent("tr").addClass("green"); + td.getParent("tr").removeClass("red"); + } + else { + td.set('html', "No"); + td.getParent("tr").addClass("red"); + td.getParent("tr").removeClass("green"); + } + }; + }, + + setupTr: function(tr) { + tr.addClass("searchPluginsTableRow"); + } +}); /*************************************************************/ diff --git a/src/webui/www/private/search.html b/src/webui/www/private/search.html index c7921e7f3..0821d5703 100644 --- a/src/webui/www/private/search.html +++ b/src/webui/www/private/search.html @@ -56,6 +56,7 @@ line-height: 1.5em; float: right; } +
@@ -201,7 +202,7 @@ var searchKeyboardEvents = new Keyboard({ defaultEventType: 'keydown', events: { - 'enter': function (e) { + 'enter': function(e) { // accept enter key as a click new Event(e).stop(); @@ -453,7 +454,7 @@ $('searchResultsTableContainer').style.display = "block"; // sort plugins alphabetically - var allPlugins = searchPlugins.sort(function(pluginA, pluginB){ + var allPlugins = searchPlugins.sort(function(pluginA, pluginB) { var a = pluginA.fullName.toLowerCase(); var b = pluginB.fullName.toLowerCase(); if (a < b) return -1; diff --git a/src/webui/www/private/searchplugins.html b/src/webui/www/private/searchplugins.html index 2c93410cd..b4a427723 100644 --- a/src/webui/www/private/searchplugins.html +++ b/src/webui/www/private/searchplugins.html @@ -38,6 +38,7 @@ #searchPlugins_content { height: 100%; } +
@@ -90,7 +91,7 @@ Enabled: enablePlugin, Uninstall: uninstallPlugin }, - offsets : calculateContextMenuOffsets() + offsets: calculateContextMenuOffsets() }); searchPluginsTable.setup('searchPluginsTableDiv', 'searchPluginsTableFixedHeaderDiv', searchPluginsTableContextMenu); updateSearchPluginsTable(); diff --git a/src/webui/www/private/transferlist.html b/src/webui/www/private/transferlist.html index 86345ffc3..25307ade8 100644 --- a/src/webui/www/private/transferlist.html +++ b/src/webui/www/private/transferlist.html @@ -63,7 +63,7 @@ UploadLimit: function(element, ref) { uploadLimitFN(); }, - ShareRatio : function (element, ref) { + ShareRatio: function(element, ref) { shareRatioFN(); },