AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempt to fix focus in iframes

Browse source
This commit is contained in:
Stewart Allen 2020-03-15 20:17:14 -04:00
commit e468e2586d
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/kiri-init.js
View file

@ -207,6 +207,7 @@ var gs_kiri_init = exports;
wsFunc: UC.newGroup('function'), wsFunc: UC.newGroup('function'),
wsFuncTable: UC.newTableRow([ wsFuncTable: UC.newTableRow([
[ [
UI.load =
UC.newButton("Import", function() { API.event.import() }), UC.newButton("Import", function() { API.event.import() }),
UI.import = UI.import =
UC.newButton("+") UC.newButton("+")
@ -1577,11 +1578,13 @@ var gs_kiri_init = exports;
SPACE.view.setZoom(current.controller.reverseZoom, current.controller.zoomSpeed); SPACE.view.setZoom(current.controller.reverseZoom, current.controller.zoomSpeed);
SPACE.platform.setZOff(0.2); SPACE.platform.setZOff(0.2);
// restore UI state from settings
UI.showOrigin.checked = current.controller.showOrigin; UI.showOrigin.checked = current.controller.showOrigin;
UI.freeLayout.checked = current.controller.freeLayout; UI.freeLayout.checked = current.controller.freeLayout;
UI.autoLayout.checked = current.controller.autoLayout; UI.autoLayout.checked = current.controller.autoLayout;
UI.alignTop.checked = current.controller.alignTop; UI.alignTop.checked = current.controller.alignTop;
// load script extensions
if (SETUP.s) SETUP.s.forEach(function(lib) { if (SETUP.s) SETUP.s.forEach(function(lib) {
let scr = DOC.createElement('script'); let scr = DOC.createElement('script');
scr.setAttribute('async',true); scr.setAttribute('async',true);
@ -1590,6 +1593,7 @@ var gs_kiri_init = exports;
STATS.add('load_'+lib); STATS.add('load_'+lib);
}); });
// load CSS extensions
if (SETUP.ss) SETUP.ss.forEach(function(style) { if (SETUP.ss) SETUP.ss.forEach(function(style) {
let ss = DOC.createElement('link'); let ss = DOC.createElement('link');
ss.setAttribute("type", "text/css"); ss.setAttribute("type", "text/css");
@ -1598,12 +1602,13 @@ var gs_kiri_init = exports;
DOC.body.appendChild(ss); DOC.body.appendChild(ss);
}); });
// override stored settings
if (SETUP.v) SETUP.v.forEach(function(kv) { if (SETUP.v) SETUP.v.forEach(function(kv) {
kv = kv.split('='); kv = kv.split('=');
SDB.setItem(kv[0],kv[1]); SDB.setItem(kv[0],kv[1]);
}); });
// import octoprint settings from url // import octoprint settings
if (SETUP.ophost) { if (SETUP.ophost) {
let ohost = API.const.OCTO = { let ohost = API.const.OCTO = {
host: SETUP.ophost[0], host: SETUP.ophost[0],
@ -1614,10 +1619,10 @@ var gs_kiri_init = exports;
console.log({octoprint:ohost}); console.log({octoprint:ohost});
} }
// mode passed on url // optional set-and-lock mode (hides mode menu)
let SETMODE = SETUP.mode ? SETUP.mode[0] : null; let SETMODE = SETUP.mode ? SETUP.mode[0] : null;
// device name pass on url // optional set-and-lock device (hides device menu)
let DEVNAME = SETUP.dev ? SETUP.dev[0] : null; let DEVNAME = SETUP.dev ? SETUP.dev[0] : null;
API.mode.set(SETMODE || STARTMODE || current.mode, SETMODE); API.mode.set(SETMODE || STARTMODE || current.mode, SETMODE);

5
js/kiri.js
View file

@ -1713,8 +1713,7 @@ self.kiri.license = exports.LICENSE;
} }
function setFocus(el) { function setFocus(el) {
DOC.activeElement.blur(); el = [ el || UI.load, UI.import, UI.ctrlLeft, UI.container, UI.assets, UI.control, UI.modeFDM, UI.reverseZoom, UI.modelOpacity, DOC.body ];
el = [ el || DOC.body, UI.ctrlLeft, UI.container, UI.assets, UI.control, UI.modeFDM, UI.reverseZoom, UI.modelOpacity, DOC.body ];
for (var es, i=0; i<el.length; i++) { for (var es, i=0; i<el.length; i++) {
es = el[i]; es = el[i];
es.focus(); es.focus();
@ -1722,8 +1721,6 @@ self.kiri.license = exports.LICENSE;
break; break;
} }
} }
UI.ctrlLeft.focus();
UI.container.focus();
} }
function setViewMode(mode) { function setViewMode(mode) {