More attempts to clean-up and reduce spurious alerts
This commit is contained in:
parent
7aa689c745
commit
c20fe69872
11 changed files with 95 additions and 68 deletions
|
|
@ -666,16 +666,16 @@ this.id))&&this.D.Ef)for(b=0;b<e.length;b++)d=e[b],d.wa=this.D.wa,d.Zb=this.D.Zb
|
|||
new Te(this,"1.35.1"),this.L.load()?b=null:delete this.L));!b&&this.A&&(b=Uu(this))&&(this.H=!0);if(b){var f=this;Ea(b,null,!0,function(a,b,c){c?(f.J=null,f.H=!1,f.wa("Unable to load machine state from server (error "+c+(b?": "+ua(b):"")+")")):(f.K=b,f.X=!0);pb(f)})}else pb(this);this.ia.power||(this.M=!0);!c&&this.M&&Vu(this,this.af)}else r("Unable to find CPU component")}ba(Qu,t);
|
||||
function Ru(a,b){if(!b){var c;if("object"==typeof resources&&(c=resources.parms))try{b=eval("("+c+")")}catch(d){r(d.message+" ("+c+")")}}a.I=b}function Pc(a,b,c){var d=La(b);void 0===d&&a.I&&(d=a.I[b]);void 0===d&&c&&(d=c[b]);void 0===d&&"object"==typeof resources&&resources[b]&&(d=b);return d}function Vu(a,b,c){for(var d=bb(a.id),e=0;e<=d.length;e++){var f=e<d.length?d[e]:a;if(!ob(f)){ob(f,function(){Vu(a,b,c)});return}}b.call(a,c)}
|
||||
function Wu(a,b){var c=new Te(a,"1.35.1",Xu);if(c.load()&&Yu(c)){var d=c.get(Zu),e=b?b.get(Zu):"unknown";d!=e&&(a.wa("Machine state may be out-of-date\n("+d+" vs. "+e+")\nCheck your browser's local storage limits"),b||c.clear())}}k=Qu.prototype;
|
||||
k.af=function(a){void 0===a&&(a=this.A||(this.K?$u:Su));if(!this.C){this.C++;var b=!1,c=!1;this.W=!1;var d=this.L||new Te(this,"1.35.1");if(a==av)b=!0;else if(a>Su){if(d.load(this.K)){this.F=new Te(this,"1.35.1",bv);this.F.load()&&(a!=$u&&cv(this,d)&&(a=dv),ev(this.F));this.F.set(Zu,wa());fv(this.F);var e=this.A&&!this.H;if(a==$u||ab("Click OK to restore the previous PCx86 machine state, or CANCEL to reset the machine.")){if(c=Yu(d)){var f=d.get("code"),g=d.get("data");f&&("ok"==f?d.load(g):("error"==
|
||||
f&&"no machine state"!=g?(this.wa("Error: "+g),"unable to verify user"==g&&(Ja(gv,""),this.B=null)):this.Zb(f+": "+g),ev(d),d.load()?(c=Yu(d),e=!0):c=!1))}e&&Wu(this,c?d:null)}else a==dv&&d.clear()}else Wu(this);delete this.K;delete this.L}e=bb(this.id);for(f=0;f<e.length;f++)g=e[f],g!==this&&g!=this.U&&(c=hv(this,g,d,b,c));b=[d,a,c];a!=av?Vu(this,this.mi,b):this.mi(b)}};
|
||||
k.af=function(a){void 0===a&&(a=this.A||(this.K?$u:Su));if(!this.C){this.C++;var b=!1,c=!1;this.W=!1;var d=this.L||new Te(this,"1.35.1");if(a==av)b=!0;else if(a>Su){if(d.load(this.K)){this.F=new Te(this,"1.35.1",bv);this.F.load()&&(a!=$u&&cv(this,d)&&(a=dv),ev(this.F));this.F.set(Zu,wa());fv(this.F);var e=this.A&&!this.H;if(a==$u||ab("Click OK to restore the previous PCx86 machine state.")){if(c=Yu(d)){var f=d.get("code"),g=d.get("data");f&&("ok"==f?d.load(g):("error"==f&&"no machine state"!=g?(this.wa("Error: "+
|
||||
g),"unable to verify user"==g&&(Ja(gv,""),this.B=null)):this.Zb(f+": "+g),ev(d),d.load()?(c=Yu(d),e=!0):c=!1))}e&&Wu(this,c?d:null)}else a==dv&&d.clear()}else Wu(this);delete this.K;delete this.L}e=bb(this.id);for(f=0;f<e.length;f++)g=e[f],g!==this&&g!=this.U&&(c=hv(this,g,d,b,c));b=[d,a,c];a!=av?Vu(this,this.mi,b):this.mi(b)}};
|
||||
function hv(a,b,c,d,e){if(!b.aa.Pb){b.aa.Pb=!0;if(b.Ob){var f=null;e&&((f=c.get(b.id))||(f=c.get(b.id.replace(/-[0-9]+\./i,"."))));"string"===typeof f&&(f=null);!b.Ob(f,d)&&f&&(b.wa("Unable to restore hardware state")&&(a.V&&!a.X?(c.clear(),a.A=Su,window&&window.location.reload()):a.W=!0),b.Ob(null),e=!1)}if(!d&&b.vi)for(a=b.vi.split("|"),c=0;c<a.length;c++)b.status(a[c])}return e}
|
||||
k.mi=function(a){var b=a[0],c=0>a[1];a=a[2];this.ea=!0;this.aa.Pb=!0;var d=this.ia.power;d&&(d.textContent="Shutdown");this.U&&(hv(this,this.U,b,c,a),this.U.Fe());this.W&&(cv(this,b),b.clear());!c&&this.F&&(this.F.clear(),delete this.F);this.C=0};
|
||||
function cv(a,b){if(!a.aa.hf){if(ab("There may be a problem with your PCx86 machine.\n\nTo help us diagnose it, click OK to send this PCx86 machine state to http://www.pcjs.org.")){var c=a.B||"";b=b.toString();var d={app:"PCx86",ver:"1.35.1"};d.url=a.ca;d.user=c;d.type="bug";d.data=b;Ea("http://www.pcjs.org/api/v1/report",d,!0)}return!0}return!1}
|
||||
function iv(a,b,c){var d,e="none";if(a.C)return null;a.C--;var f=new Te(a,"1.35.1"),g=new Te(a,"1.35.1",Xu),h=wa();g.set(Zu,h);f.set(Zu,h);f.set(jv,"1.35.1");f.set(kv,window?window.location.href:null);f.set(lv,window?window.navigator.userAgent:"");a.U&&a.U.Nb&&(c&&Tc(a.U),d=a.U.Nb(b,c),"object"===typeof d&&f.set(a.U.id,d),c&&(a.U.aa.Pb=!1,!1===d&&(e=null)));for(var h=bb(a.id),l=0;l<h.length;l++){var m=h[l];m.aa.Pb&&(m.Nb&&(d=m.Nb(b,c),"object"===typeof d&&f.set(m.id,d)),c&&(m.aa.Pb=!1,!1===d&&(e=
|
||||
null)))}e&&(c?(h=d=!1,b?(a.B&&mv(a,a.B,f.toString()),fv(g)&&fv(f)||(e=null,d=h=!0)):a.A&&(d=!0,h=a.A==nv),d&&f.clear(h)):e=f.toString());c&&(a.aa.Pb=!1,b=a.ia.power)&&(b.textContent="Power");a.C=0;return e}k.reset=function(){this.ma&&this.ma.reset&&this.ma.reset();for(var a=bb(this.id),b=0;b<a.length;b++){var c=a[b];c!==this&&c!==this.ma&&c.reset&&c.reset()}};k.start=function(a,b){for(var c=bb(this.id),d=0;d<c.length;d++){var e=c[d];"CPU"!=e.type&&e!==this&&e.start&&e.start(a,b)}};
|
||||
k.stop=function(a,b){for(var c=bb(this.id),d=0;d<c.length;d++){var e=c[d];"CPU"!=e.type&&e!==this&&e.stop&&e.stop(a,b)}};
|
||||
k.wb=function(a,b,c){var d=this;switch(b){case "power":return this.ia[b]=c,c.onclick=function(){d.C||(d.aa.Pb?iv(d,!1,!0):Vu(d,d.af))},!0;case "reset":return this.ia[b]=c,c.onclick=function(){if(d.aa.Pb&&!d.C)if(d.A&&!d.J){var a=d.aa.hf||ab("Click OK to save changes to this PCx86 machine.\n\nWARNING: If you CANCEL, all disk changes will be discarded.");iv(d,a,!0);!a&&d.V?window&&window.location.reload():(a||(d.O=!0),d.af(Su),d.O=!1)}else d.reset(),d.U&&d.U.Fe()},!0;case "save":if(ra(Fa(),"pcjs.org"))c.parentNode.removeChild(c);
|
||||
else return this.ia[b]=c,c.onclick=function(){var a=Tu(d,!0);if(a){var b=!!(d.A&&!d.J||d.V),c=iv(d,b);b?mv(d,a,c):d.wa("Resume disabled, machine state not saved")}},!0}return!1};
|
||||
k.wb=function(a,b,c){var d=this;switch(b){case "power":return this.ia[b]=c,c.onclick=function(){d.C||(d.aa.Pb?iv(d,!1,!0):Vu(d,d.af))},!0;case "reset":return this.ia[b]=c,c.onclick=function(){if(d.aa.Pb&&!d.C)if(d.A&&!d.J){var a=d.aa.hf||!ab("Click OK to reset this PCx86 machine and discard all disk modifications.");iv(d,a,!0);!a&&d.V?window&&window.location.reload():(a||(d.O=!0),d.af(Su),d.O=!1)}else d.reset(),d.U&&d.U.Fe()},!0;case "save":if(ra(Fa(),"pcjs.org"))c.parentNode.removeChild(c);else return this.ia[b]=
|
||||
c,c.onclick=function(){var a=Tu(d,!0);if(a){var b=!!(d.A&&!d.J||d.V),c=iv(d,b);b?mv(d,a,c):d.wa("Resume disabled, machine state not saved")}},!0}return!1};
|
||||
function Tu(a,b){var c=a.B;c||((c=Ia(gv),void 0!==c)?!c&&b&&(b=null,window&&(b=window.prompt("Saving machine states on the pcjs.org server is currently unsupported.\n\nIf you're running your own server, enter your user ID below.","")),c=b)&&((c=ov(a,c))||a.wa("The user ID is invalid.")):b&&a.wa("Browser local storage is not available"));return c}
|
||||
function ov(a,b){a.B=null;b=Ea(Fa()+"/api/v1/user?req=verify&user="+b);var c=b[1];if(!b[0]&&c)try{b=eval("("+c+")"),b.code&&"ok"==b.code&&(Ja(gv,b.data),a.B=b.data)}catch(d){r(d.message+" ("+c+")")}return a.B}function Uu(a){var b=null;a.B&&(b=Fa()+"/api/v1/user?req=load&user="+a.B+"&state="+pv(a,"1.35.1"));return b}
|
||||
function mv(a,b,c){if(c){var d={req:"store"};d.user=b;d.state=pv(a,"1.35.1");d.data=c;b=Ea(Fa()+"/api/v1/user",d);d=b[0];if(b[1]){if(d){var e=d.indexOf("\n");0<e&&(d=d.substr(0,e));d.indexOf("Error: ")||(d=d.substr(7))}d='{"code":'+b[1]+',"data":"'+d+'"}'}b=JSON.parse(d);b&&"ok"==b.code?a.wa("Machine state saved to server"):c&&(c=b&&b.data||"unable to save machine state",c="error"==b.code?"Error: "+c:"Error "+b.code+": "+c,a.wa(c),Ja(gv,""),a.B=null)}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue