diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page index 5ee35eb7a..221129a76 100644 --- a/plugins/dynamix/ArrayOperation.page +++ b/plugins/dynamix/ArrayOperation.page @@ -1,7 +1,7 @@ Menu="Main:5" Title="Array Operation" Tag="snowflake-o" -Nchan="device_list,disk_load" +Nchan="device_list,disk_load,parity_list" --- 0) $('#line'+k).html(v);});} - timers.parityStatus = setTimeout(parityStatus,3000); - if (!data && $('#cancelButton').length>0 && $('#cancelButton').val()=="_(Cancel)_") { - $('#cancelButton').val('Done').prop('onclick',null).off('click').click(function(){refresh();}); - $('#cancelText').html(''); - $('#line4').html("_(completed)_"); - } - }); -} function stopArray(form) { $(form).append(''); devices.stop(); @@ -232,7 +221,6 @@ function shutdown_now(form,cmd) { function toggleApply(checked) { $('input[name="#apply"]').prop('disabled',!checked); } -parityStatus(); $('.tabs').append(ctrl); if ($.cookie('tab')=='tab0') $('i.toggle').hide(); @@ -283,7 +271,20 @@ devices.on('connect', function(e) { }); +var parityStatus = new NchanSubscriber('/sub/parity'); +parityStatus.on('message', function(data) { + $.each(data.split(';'),function(k,v) {if ($('#line'+k).length>0) $('#line'+k).html(v);}); + if (!data && $('#cancelButton').length>0 && $('#cancelButton').val()=="_(Cancel)_") { + $('#cancelButton').val('Done').prop('onclick',null).off('click').click(function(){refresh();}); + $('#cancelText').html(''); + $('#line4').html("_(completed)_"); + } +}); + devices.start(); + +parityStatus.start(); + $(function(){ var form = document.arrayOps; if (form.input !== undefined) selectInput(form); diff --git a/plugins/dynamix/include/ParityList.php b/plugins/dynamix/include/ParityList.php deleted file mode 100644 index 52ccfa72c..000000000 --- a/plugins/dynamix/include/ParityList.php +++ /dev/null @@ -1,63 +0,0 @@ - -