From cf5af14e69ed70e3c3d2fd21082f3bc4ab205ecc Mon Sep 17 00:00:00 2001 From: rottencandy Date: Wed, 19 Jun 2019 23:26:38 +0530 Subject: [PATCH] Fix file control button resume/pause and cancel buttons on file transfers fixed and now work as expected. --- webui-src/app/downloads.js | 8 ++++---- webui-src/app/login.js | 2 +- webui-src/app/main.js | 31 ++++++++++++++++--------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/webui-src/app/downloads.js b/webui-src/app/downloads.js index ce015eb..b4de585 100644 --- a/webui-src/app/downloads.js +++ b/webui-src/app/downloads.js @@ -75,21 +75,21 @@ function fileAction(hash, action) { let json_params = {hash, flags : 0}; switch (action) { case 'cancel': - req_action = '/rsFiles/FileCancel'; + action_header = '/rsFiles/FileCancel'; break; case 'pause': - req_action = '/rsFiles/FileControl'; + action_header = '/rsFiles/FileControl'; json_params.flags = RS_FILE_CTRL_PAUSE; break; case 'resume': - req_action = '/rsFiles/FileControl'; + action_header = '/rsFiles/FileControl'; json_params.flags = RS_FILE_CTRL_START; break; case 'force_check': - req_action = '/rsFiles/FileControl'; + action_header = '/rsFiles/FileControl'; json_params.flags = RS_FILE_CTRL_FORCE_CHECK; break; diff --git a/webui-src/app/login.js b/webui-src/app/login.js index c354049..8507697 100644 --- a/webui-src/app/login.js +++ b/webui-src/app/login.js @@ -4,7 +4,7 @@ var rs = require('rswebui'); let onSuccessCallback = function() {}; function renderLoginPage(callback) { - // Cannot use mount because vDOM will not let any other mount overrides + // Cannot use mount because vDOM will not let any other component overrides m.render(document.getElementById('main'), m(loginComponent)); onSuccessCallback = callback; } diff --git a/webui-src/app/main.js b/webui-src/app/main.js index 4c3676a..d23b41f 100644 --- a/webui-src/app/main.js +++ b/webui-src/app/main.js @@ -5,24 +5,25 @@ let login = require('login'); login.renderLoginPage(onSuccess); function onSuccess() { - let home = require('home'); - let dl = require('downloads'); + let home = require('home'); + let dl = require('downloads'); - renderMainStructure(); - m.route(document.getElementById('tab-section'), '/home', { - '/home': home.component, - '/downloads': dl.component, - }); + renderMainStructure(); + m.route(document.getElementById('tab-section'), '/home', { + '/home' : home.component, + '/downloads' : dl.component, + }); } function renderMainStructure() { - m.render(document.getElementById('main'), [ - m('nav.tab-container', - [ - m('a.tab-header[href=/home]', {oncreate: m.route.link}, 'Home'), - m('a.tab-header[href=/downloads]', {oncreate: m.route.link}, 'Downloads'), - ]), - m('div', {id: 'tab-section'}) - ]); + m.render(document.getElementById('main'), [ + m('nav.tab-container', + [ + m('a.tab-header[href=/home]', {oncreate : m.route.link}, 'Home'), + m('a.tab-header[href=/downloads]', {oncreate : m.route.link}, + 'Downloads'), + ]), + m('div', {id : 'tab-section'}) + ]); }