+ 
Completed.
+
Completed.
+ Completed.
+ ');
+ if (status) // Request completed
+ {
+ $('#resultscomplete').slideDown('slow');
+ $('#resultsheader').slideUp('slow', function() {
+ $(this).empty();
+ });
+ }
+// $('#d_results').animate({
+// scrollTop: $('#d_results').scrollTop() + ('#d_results').height()
+// }, 'slow');
+}
+
+function chunked_request(placeholder, url, data)
+{
+ $('#resultsheader').html('
' + placeholder)
+ .slideDown('slow');
+ $('#resultscomplete').hide();
+ $('#results').empty();
+ $('#d_results').dialog('open');
+
+ $.ajax({
+ type: "GET",
+ url: url,
+ data: data,
+ xhrFields: {
+ onprogress: function(x) {
+ if (x.target)
+ loaddata(x.target.responseText);
+ }
+ },
+ progressInterval: 500,
+ success: function(data, status) {
+ loaddata(data, status);
+ },
+ error: function(_, _, e) {
+ if (window.console)
+ console.log("ajax error");
+ alert(e);
+ }
+ });
+}
+
$('#rundiag').on('click', function() {
var val = $('#diagsel').val();
if (val == '0')
val = $('#seq').val();
- $('#results')
- .html(' Running diagnostic ' +
- '' + val + '')
- .load('rundiag.jim', { diag: val }, function() {
- $('#results').wrapInner('');
- });
- $('#d_results').dialog('open');
+
+ chunked_request('Running diagnostic ' + val + '',
+ 'rundiag.jim', { diag: val });
});
$('#runfopkg').on('click', function() {
var pkg = $('#fopkg').val();
- $('#results')
- .html(' ' +
- 'Forcibly re-installing package ' + pkg + '')
- .load('/cgi-bin/opkg.jim', {
- cmd: 'install --force-reinstall ' + pkg
- }, function() {
- $('#results').wrapInner('');
- });
- $('#d_results').dialog('open');
+
+ chunked_request('Re-installing package ' + pkg + '',
+ '/cgi-bin/opkg.jim', { cmd: 'install --force-reinstall ' + pkg });
});
$('a.logclear').on('click', function(e) {
@@ -50,16 +84,9 @@ $('a.logclear').on('click', function(e) {
if (!confirm('Delete ' + file + '?'))
return;
- $('#results')
- .html(' Clearing log ' +
- '' + file + '')
- .load('/log/act.jim', {
- action: 'clear',
- file: file
- }, function() {
- $('#results').wrapInner('');
- });
- $('#d_results').dialog('open');
+
+ chunked_request('Clearing log ' + file + '',
+ '/log/act.jim', { action: 'clear', file: file });
});
$.getJSON('/diag/rpc.jim?act=getall', function(data) {
@@ -71,7 +98,6 @@ $.getJSON('/diag/rpc.jim?act=getall', function(data) {
});
});
-
$('#safe,#reset,#rma,#maint').on('click', function(e) {
e.preventDefault();
diff --git a/webif/html/pkg/index.jim b/webif/html/pkg/index.jim
index 2ad4de6..1dcd203 100755
--- a/webif/html/pkg/index.jim
+++ b/webif/html/pkg/index.jim
@@ -30,7 +30,7 @@ puts {
Processing request...
diff --git a/webif/html/pkg/script.js b/webif/html/pkg/script.js
index 2c9101c..105b5a1 100644
--- a/webif/html/pkg/script.js
+++ b/webif/html/pkg/script.js
@@ -1,169 +1,166 @@
-var opkg = '/cgi-bin/opkg.jim?cmd=';
+var opkg = '/cgi-bin/opkg.jim';
$(document).ready(function() {
- var busy = false;
- var tswitch = false;
- var stick = true;
+var busy = false;
+var tswitch = false;
+var stick = true;
- // Retrieve the stored selected tab from the hash portion of the URL.
- var curtab = ~~(window.location.hash.slice(1));
- if (curtab < 0 || curtab > 2)
- curtab = 0;
+// Retrieve the stored selected tab from the hash portion of the URL.
+var curtab = ~~(window.location.hash.slice(1));
+if (curtab < 0 || curtab > 2)
+ curtab = 0;
- $('#opkgupdate')
- .button()
- .click(function() { tswitch = 2; execopkg('update'); })
- .fadeIn('slow');
+$('#opkgupdate')
+ .button()
+ .click(function() { tswitch = 2; execopkg('update'); })
+ .fadeIn('slow');
- $('#opkgupgradeall')
- .button()
- .click(function() { tswitch = 2; execopkg('upgrade'); })
- .fadeIn('slow');
+$('#opkgupgradeall')
+ .button()
+ .click(function() { tswitch = 2; execopkg('upgrade'); })
+ .fadeIn('slow');
- $('#pkgtabs').tabs({
- active: curtab,
- create: function(event, ui) {
- $(ui.panel).html("" +
- "Loading data... Please wait...");
- busy = true;
- $('#pkgtabs').tabs('disable');
- },
- activate: function(event, ui) {
- window.location.hash = ui.newTab.index();
- if (busy)
- {
- alert('Please wait until the current ' +
- 'operation completes.');
- return false;
- }
- $(ui.newPanel).html("" +
- "Loading data... Please wait...");
- busy = true;
- $('#pkgtabs').tabs('disable');
- },
- load: function() {
- busy = false;
- setup_buttons();
- $('#pkgtabs').tabs('enable');
- },
- spinner: ' ' +
- 'Loading...'
- });
-
- var $dialog = $('#dialogue').dialog({
- title: "Package Management Results",
- modal: false, autoOpen: false,
- height: 500, width: 700,
- show: 'scale', hide: 'fade',
- draggable: true, resizable: true,
- buttons: { "Close":
- function() {$(this).dialog('close');}},
- close: function(e,u) {
- if (tswitch)
- {
- var curtab = $('#pkgtabs')
- .tabs('option', 'active');
- if (curtab != tswitch)
- $('#pkgtabs').tabs('option',
- 'active', tswitch);
- else
- {
- $('.ui-tabs-panel')
- .html("" +
- "Loading data... Please wait...");
- $('#pkgtabs').tabs('load', tswitch);
- }
- tswitch = false;
- $('button.va').enable();
- }
- else
- {
- var pkg = $('#dialogue').attr('pkg');
- $('tr[pkg="' + pkg + '"]')
- .disable()
- .find('button').removeClass('va');
- $('button.va').enable();
- }
- }
- });
-
- function loaddata(data, status)
- {
- if (window.console)
- {
- console.log('loaddata called, status=' + status);
- console.log('Data: ' + data);
- }
- if (status)
- {
- $('#dresults').text(data);
- $('#dspinner').hide('slow');
- $('#complete').show('slow');
- if (status == 'success' && !stick)
- $('#dialogue').dialog('close');
- //stick = false;
- }
- else
- $('#dresults').append(data);
- }
-
- function execopkg(arg, pkg)
- {
+$('#pkgtabs').tabs({
+ active: curtab,
+ create: function(event, ui) {
+ $(ui.panel).html("" +
+ "Loading data... Please wait...");
+ busy = true;
+ $('#pkgtabs').tabs('disable');
+ },
+ activate: function(event, ui) {
+ window.location.hash = ui.newTab.index();
if (busy)
{
alert('Please wait until the current ' +
'operation completes.');
- return;
+ return false;
}
+ $(ui.newPanel).html("" +
+ "Loading data... Please wait...");
busy = true;
- $('button.va').disable();
- $('#dspinner').show();
- $('#complete').hide();
- $('#dresults').empty();
- $('#dialogue').attr('pkg', pkg);
- $dialog.dialog('open');
-
- $.ajax({
- type: "GET",
- url: opkg + arg,
- progress: loaddata,
- progressInterval: 500,
- success: function(data, status) {
- loaddata(data, status);
- },
- error: function(_, _, e) {
- if (window.console)
- console.log("ajax error");
- alert(e);
- }
- });
+ $('#pkgtabs').tabs('disable');
+ },
+ load: function() {
busy = false;
- }
+ setup_buttons();
+ $('#pkgtabs').tabs('enable');
+ },
+ spinner: ' ' +
+ 'Loading...'
+});
- function setup_buttons()
+var $dialog = $('#dialogue').dialog({
+ title: "Package Management Results",
+ modal: false, autoOpen: false,
+ height: 500, width: 700,
+ show: 'scale', hide: 'fade',
+ draggable: true, resizable: true,
+ buttons: { "Close":
+ function() {$(this).dialog('close');}},
+ close: function(e,u) {
+ if (tswitch)
+ {
+ var curtab = $('#pkgtabs')
+ .tabs('option', 'active');
+ if (curtab != tswitch)
+ $('#pkgtabs').tabs('option',
+ 'active', tswitch);
+ else
+ {
+ $('.ui-tabs-panel')
+ .html("" +
+ "Loading data... Please wait...");
+ $('#pkgtabs').tabs('load', tswitch);
+ }
+ tswitch = false;
+ $('button.va').enable();
+ }
+ else
+ {
+ var pkg = $('#dialogue').attr('pkg');
+ $('tr[pkg="' + pkg + '"]')
+ .disable()
+ .find('button').removeClass('va');
+ $('button.va').enable();
+ }
+ }
+});
+
+function loaddata(data, status)
+{
+ $('#dresults').text(data).wrapInner('');
+ if (status) // Request completed
{
- $('button.remove, button.install, button.upgrade')
- .button()
- .click(function() {
- if ($(this).attr('action') == 'remove' &&
- !confirm('Please confirm removal of the ' +
- $(this).attr('id') + ' package.'))
- return;
-
- execopkg(encodeURIComponent($(this).attr('action') +
- ' ' + $(this).attr('id')),
- $(this).closest('tr').attr('pkg'));
- }).fadeIn('slow');
-
- $('a.depends').click(function(e) {
- e.preventDefault();
- var pkg = $(this).closest('tr').attr('pkg');
- stick = true;
- execopkg(encodeURIComponent('whatdepends ' + pkg),
- false);
- });
+ $('#dspinner').hide('slow');
+ $('#complete').show('slow');
+ if (status == 'success' && !stick)
+ $('#dialogue').dialog('close');
+ //stick = false;
}
+}
+
+function execopkg(arg, pkg)
+{
+ if (busy)
+ {
+ alert('Please wait until the current ' +
+ 'operation completes.');
+ return;
+ }
+ busy = true;
+ $('button.va').disable();
+ $('#dspinner').show();
+ $('#complete').hide();
+ $('#dresults').empty();
+ $('#dialogue').attr('pkg', pkg);
+ $dialog.dialog('open');
+
+ $.ajax({
+ type: "GET",
+ url: opkg,
+ data: { cmd: arg },
+ xhrFields: {
+ onprogress: function(x) {
+ if (x.target)
+ loaddata(x.target.responseText);
+ },
+ },
+ progressInterval: 500,
+ success: function(data, status) {
+ loaddata(data, status);
+ },
+ error: function(_, _, e) {
+ if (window.console)
+ console.log("ajax error");
+ alert(e);
+ }
+ });
+ busy = false;
+}
+
+function setup_buttons()
+{
+ $('button.remove, button.install, button.upgrade')
+ .button()
+ .click(function() {
+ if ($(this).attr('action') == 'remove' &&
+ !confirm('Please confirm removal of the ' +
+ $(this).attr('id') + ' package.'))
+ return;
+
+ execopkg($(this).attr('action') + ' ' + $(this).attr('id'),
+ $(this).closest('tr').attr('pkg'));
+ }).fadeIn('slow');
+
+ $('a.depends').click(function(e) {
+ e.preventDefault();
+ var pkg = $(this).closest('tr').attr('pkg');
+ stick = true;
+ execopkg('whatdepends ' + pkg, false);
+ });
+}
});
diff --git a/webif/lib/chunked b/webif/lib/chunked
index ff3427f..ff7da53 100755
--- a/webif/lib/chunked
+++ b/webif/lib/chunked
@@ -7,11 +7,12 @@ proc chunk {chk} {
proc chunk_pad {{len 256}} {
incr len
- chunk [string range [format "%${len}d" 0] 1 end-1]
+ chunk [string repeat " " $len]
}
proc start_chunked {{type "text/html"}} {
httpheader $type 0 "Transfer-Encoding: chunked\r\n"
+ #chunk_pad
}
proc end_chunked {} {