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

fix ophint dom conflict

Browse source
This commit is contained in:
Stewart Allen 2021-01-06 09:54:34 -05:00
commit d4b65b8a99
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri/export.js
View file

@ -457,7 +457,7 @@
if (API.const.OCTO) { if (API.const.OCTO) {
$('ophost').style.display = 'none'; $('ophost').style.display = 'none';
$('opapik').style.display = 'none'; $('opapik').style.display = 'none';
$('ophint').style.display = 'none'; $('oph1nt').style.display = 'none';
$('send-to-gridhost').style.display = 'none'; $('send-to-gridhost').style.display = 'none';
} }
octo_host.value = SDB['octo-host'] || ''; octo_host.value = SDB['octo-host'] || '';

2
src/mode/cam/client.js
View file

@ -254,7 +254,7 @@
if (!(isCamMode && oplist)) return; if (!(isCamMode && oplist)) return;
let mark = Date.now(); let mark = Date.now();
let html = []; let html = [];
$('ophint').style.display = oplist.length === 0 ? 'flex' : 'none'; $('ophint').style.display = oplist.length === 0 ? '' : 'none';
let bind = {}; let bind = {};
let scale = API.view.unit_scale(); let scale = API.view.unit_scale();
oplist.forEach((rec,i) => { oplist.forEach((rec,i) => {

2
web/kiri/output-gcode.html
View file

@ -31,7 +31,7 @@
</div> </div>
<button id="print-octoprint">send</button> <button id="print-octoprint">send</button>
</div> </div>
<div id="ophint"><label class="hint"><a href="http://docs.octoprint.org/en/master/api/general.html?highlight=cors#cross-origin-requests" target="_help">CORS support</a> must be enabled in API settings</label></div> <div id="oph1nt"><label class="hint"><a href="http://docs.octoprint.org/en/master/api/general.html?highlight=cors#cross-origin-requests" target="_help">CORS support</a> must be enabled in API settings</label></div>
</div> </div>
<div id="send-to-hosthead" class="header"><label>grid:host</label></div> <div id="send-to-hosthead" class="header"><label>grid:host</label></div>