Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More alert suppression changes

Browse source
This commit is contained in:
Jeff Parsons 2017-06-22 16:34:04 -07:00 • committed by Jeff Parsons
commit d5ddde3e41
29 changed files with 662 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

262
docs/pcx86/examples/pcx86-dbg.js
View file

File diff suppressed because one or more lines are too long

298
docs/pcx86/examples/pcx86.js
View file

File diff suppressed because one or more lines are too long

5
modules/pcx86/lib/computer.js
View file

@ -680,8 +680,7 @@ class Computer extends Component {
*/
if (!component.powerUp(data, fRepower) && data) {
component.notice("Unable to restore hardware state");
if (component.notice("Unable to restore hardware state")) {
/*
* If this is a resume error for a machine that also has a predefined state
* AND we're not restoring from that state, then throw away the current state,
@ -702,6 +701,8 @@ class Computer extends Component {
*/
this.fRestoreError = true;
}
}
/*
* Any failure triggers an automatic to call powerUp() again, without any state,
* in the hopes that the component can recover by performing a reset.

6
modules/shared/lib/component.js
View file

@ -937,9 +937,11 @@ class Component {
* @param {string} s
* @param {boolean} [fPrintOnly]
* @param {string} [id]
* @return {boolean}
*/
this.notice = function noticePanel(s, fPrintOnly, id) {
this.println(s, this.idComponent);
return true;
};
}
return true;
@ -1060,6 +1062,7 @@ class Component {
* @param {string} s is the message text
* @param {boolean} [fPrintOnly]
* @param {string} [id] is the caller's ID, if any
* @return {boolean}
*/
notice(s, fPrintOnly, id)
{
@ -1070,10 +1073,11 @@ class Component {
var computer = Component.getComponentByType("Computer", this.id);
if (computer && computer.flags.unloading) {
console.log("ignoring notice during unload: " + s);
return;
return false;
}
}
Component.notice(s, fPrintOnly, id || this.type);
return true;
}
/**

7
versions/c1pjs/1.35.1/c1p-dbg.js
View file

File diff suppressed because one or more lines are too long

4
versions/c1pjs/1.35.1/c1p-dbg.map
View file

File diff suppressed because one or more lines are too long

6
versions/c1pjs/1.35.1/c1p-uncompiled.js
View file

@ -3006,9 +3006,11 @@ class Component {
* @param {string} s
* @param {boolean} [fPrintOnly]
* @param {string} [id]
* @return {boolean}
*/
this.notice = function noticePanel(s, fPrintOnly, id) {
this.println(s, this.idComponent);
return true;
};
}
return true;
@ -3129,6 +3131,7 @@ class Component {
* @param {string} s is the message text
* @param {boolean} [fPrintOnly]
* @param {string} [id] is the caller's ID, if any
* @return {boolean}
*/
notice(s, fPrintOnly, id)
{
@ -3139,10 +3142,11 @@ class Component {
var computer = Component.getComponentByType("Computer", this.id);
if (computer && computer.flags.unloading) {
console.log("ignoring notice during unload: " + s);
return;
return false;
}
}
Component.notice(s, fPrintOnly, id || this.type);
return true;
}
/**

4
versions/c1pjs/1.35.1/c1p.js
View file

File diff suppressed because one or more lines are too long

2
versions/c1pjs/1.35.1/c1p.map
View file

File diff suppressed because one or more lines are too long

4
versions/pc8080/1.35.1/pc8080-dbg.js
View file

File diff suppressed because one or more lines are too long

2
versions/pc8080/1.35.1/pc8080-dbg.map
View file

File diff suppressed because one or more lines are too long

6
versions/pc8080/1.35.1/pc8080-uncompiled.js
View file

@ -3296,9 +3296,11 @@ class Component {
* @param {string} s
* @param {boolean} [fPrintOnly]
* @param {string} [id]
* @return {boolean}
*/
this.notice = function noticePanel(s, fPrintOnly, id) {
this.println(s, this.idComponent);
return true;
};
}
return true;
@ -3419,6 +3421,7 @@ class Component {
* @param {string} s is the message text
* @param {boolean} [fPrintOnly]
* @param {string} [id] is the caller's ID, if any
* @return {boolean}
*/
notice(s, fPrintOnly, id)
{
@ -3429,10 +3432,11 @@ class Component {
var computer = Component.getComponentByType("Computer", this.id);
if (computer && computer.flags.unloading) {
console.log("ignoring notice during unload: " + s);
return;
return false;
}
}
Component.notice(s, fPrintOnly, id || this.type);
return true;
}
/**

6
versions/pc8080/1.35.1/pc8080.js
View file

File diff suppressed because one or more lines are too long

2
versions/pc8080/1.35.1/pc8080.map
View file

File diff suppressed because one or more lines are too long

262
versions/pcx86/1.35.1/pcx86-dbg.js
View file

File diff suppressed because one or more lines are too long

2
versions/pcx86/1.35.1/pcx86-dbg.map
View file

File diff suppressed because one or more lines are too long

13
versions/pcx86/1.35.1/pcx86-uncompiled.js
View file

@ -3524,9 +3524,11 @@ class Component {
* @param {string} s
* @param {boolean} [fPrintOnly]
* @param {string} [id]
* @return {boolean}
*/
this.notice = function noticePanel(s, fPrintOnly, id) {
this.println(s, this.idComponent);
return true;
};
}
return true;
@ -3647,6 +3649,7 @@ class Component {
* @param {string} s is the message text
* @param {boolean} [fPrintOnly]
* @param {string} [id] is the caller's ID, if any
* @return {boolean}
*/
notice(s, fPrintOnly, id)
{
@ -3657,10 +3660,11 @@ class Component {
var computer = Component.getComponentByType("Computer", this.id);
if (computer && computer.flags.unloading) {
console.log("ignoring notice during unload: " + s);
return;
return false;
}
}
Component.notice(s, fPrintOnly, id || this.type);
return true;
}
/**
@ -74352,8 +74356,7 @@ class Computer extends Component {
*/
if (!component.powerUp(data, fRepower) && data) {
component.notice("Unable to restore hardware state");
if (component.notice("Unable to restore hardware state")) {
/*
* If this is a resume error for a machine that also has a predefined state
* AND we're not restoring from that state, then throw away the current state,
@ -74374,6 +74377,8 @@ class Computer extends Component {
*/
this.fRestoreError = true;
}
}
/*
* Any failure triggers an automatic to call powerUp() again, without any state,
* in the hopes that the component can recover by performing a reset.
@ -75032,7 +75037,7 @@ class Computer extends Component {
* I used to bypass the prompt if this.resume == Computer.RESUME_AUTO, setting fSave to true automatically,
* but that gives the user no means of resetting a resumable machine that contains errors in its resume state.
*/
var fSave = (/* this.resume == Computer.RESUME_AUTO || */ Component.confirmUser("Click OK to save changes to this " + PCX86.APPNAME + " machine.\n\nWARNING: If you CANCEL, all disk changes will be discarded."));
var fSave = (/* this.resume == Computer.RESUME_AUTO || */ this.flags.unloading || Component.confirmUser("Click OK to save changes to this " + PCX86.APPNAME + " machine.\n\nWARNING: If you CANCEL, all disk changes will be discarded."));
this.powerOff(fSave, true);
/*
* Forcing the page to reload is an expedient option, but ugly. It's preferable to call powerOn()

298
versions/pcx86/1.35.1/pcx86.js
View file

File diff suppressed because one or more lines are too long

2
versions/pcx86/1.35.1/pcx86.map
View file

File diff suppressed because one or more lines are too long

4
versions/pdpjs/1.35.1/pdp10-dbg.js
View file

File diff suppressed because one or more lines are too long

2
versions/pdpjs/1.35.1/pdp10-dbg.map
View file

File diff suppressed because one or more lines are too long

6
versions/pdpjs/1.35.1/pdp10-uncompiled.js
View file

@ -3296,9 +3296,11 @@ class Component {
* @param {string} s
* @param {boolean} [fPrintOnly]
* @param {string} [id]
* @return {boolean}
*/
this.notice = function noticePanel(s, fPrintOnly, id) {
this.println(s, this.idComponent);
return true;
};
}
return true;
@ -3419,6 +3421,7 @@ class Component {
* @param {string} s is the message text
* @param {boolean} [fPrintOnly]
* @param {string} [id] is the caller's ID, if any
* @return {boolean}
*/
notice(s, fPrintOnly, id)
{
@ -3429,10 +3432,11 @@ class Component {
var computer = Component.getComponentByType("Computer", this.id);
if (computer && computer.flags.unloading) {
console.log("ignoring notice during unload: " + s);
return;
return false;
}
}
Component.notice(s, fPrintOnly, id || this.type);
return true;
}
/**

4
versions/pdpjs/1.35.1/pdp10.js
View file

File diff suppressed because one or more lines are too long

2
versions/pdpjs/1.35.1/pdp10.map
View file

File diff suppressed because one or more lines are too long

4
versions/pdpjs/1.35.1/pdp11-dbg.js
View file

File diff suppressed because one or more lines are too long

2
versions/pdpjs/1.35.1/pdp11-dbg.map
View file

File diff suppressed because one or more lines are too long

6
versions/pdpjs/1.35.1/pdp11-uncompiled.js
View file

@ -3524,9 +3524,11 @@ class Component {
* @param {string} s
* @param {boolean} [fPrintOnly]
* @param {string} [id]
* @return {boolean}
*/
this.notice = function noticePanel(s, fPrintOnly, id) {
this.println(s, this.idComponent);
return true;
};
}
return true;
@ -3647,6 +3649,7 @@ class Component {
* @param {string} s is the message text
* @param {boolean} [fPrintOnly]
* @param {string} [id] is the caller's ID, if any
* @return {boolean}
*/
notice(s, fPrintOnly, id)
{
@ -3657,10 +3660,11 @@ class Component {
var computer = Component.getComponentByType("Computer", this.id);
if (computer && computer.flags.unloading) {
console.log("ignoring notice during unload: " + s);
return;
return false;
}
}
Component.notice(s, fPrintOnly, id || this.type);
return true;
}
/**

6
versions/pdpjs/1.35.1/pdp11.js
View file

File diff suppressed because one or more lines are too long

2
versions/pdpjs/1.35.1/pdp11.map
View file

File diff suppressed because one or more lines are too long