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

reencode url to remove version

Browse source
This commit is contained in:
Stewart Allen 2020-06-01 23:23:47 -04:00
commit f9aa9a6832
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/kiri-init.js
View file

@ -1448,16 +1448,6 @@ var gs_kiri_init = exports;
layerMoves: UC.newBoolean(LANG.la_move, onLayerToggle, {modes:GCODE}) layerMoves: UC.newBoolean(LANG.la_move, onLayerToggle, {modes:GCODE})
}); });
if (!lang_set) {
// for english only, add underlined labels for hotkeys
UI.setupDevices.innerHTML = "D<u>e</u>vices";
UI.setupTools.innerHTML = "T<u>o</u>ols";
UI.modeArrange.innerHTML = "<u>A</u>rrange";
UI.modeSlice.innerHTML = "<u>S</u>lice";
UI.modePreview.innerHTML = "<u>P</u>review";
UI.modeExport.innerHTML = "E<u>x</u>port";
}
// populate language drop-down // populate language drop-down
let lp = $('langpop'); let lp = $('langpop');
let elp = DOC.createElement("div"); let elp = DOC.createElement("div");

14
js/kiri.js
View file

@ -65,6 +65,9 @@ self.kiri.copyright = exports.COPYRIGHT;
if (SETUP.rm) renderMode = parseInt(SETUP.rm[0]); if (SETUP.rm) renderMode = parseInt(SETUP.rm[0]);
DBUG.enable(); DBUG.enable();
// remove version, preserve other settings
WIN.history.replaceState({},'','/kiri/' + encodeOpt(SETUP) + LOC.hash);
// add show() to catalog for API // add show() to catalog for API
CATALOG.show = showCatalog; CATALOG.show = showCatalog;
@ -404,6 +407,7 @@ self.kiri.copyright = exports.COPYRIGHT;
let opt = {}, kv, kva; let opt = {}, kv, kva;
// handle kiri legacy and proper url encoding better // handle kiri legacy and proper url encoding better
ov.replace(/&/g,',').split(',').forEach(function(el) { ov.replace(/&/g,',').split(',').forEach(function(el) {
el = el.replace(/=/g,':');
kv = decodeURIComponent(el).split(':'); kv = decodeURIComponent(el).split(':');
if (kv.length === 2) { if (kv.length === 2) {
kva = opt[kv[0]] = opt[kv[0]] || []; kva = opt[kv[0]] = opt[kv[0]] || [];
@ -413,6 +417,16 @@ self.kiri.copyright = exports.COPYRIGHT;
return opt; return opt;
} }
function encodeOpt(opt) {
let out = [];
Object.keys(opt).forEach(key => {
if (key === 'ver') return;
let val = opt[key];
out.push(encodeURIComponent(key) + "=" + encodeURIComponent(val));
});
return out.length ? '?' + out.join('&') : '';
}
function ajax(url, fn, rt, po, hd) { function ajax(url, fn, rt, po, hd) {
return new MOTO.Ajax(fn, rt).request(url, po, hd); return new MOTO.Ajax(fn, rt).request(url, po, hd);
} }

12
web/kiri/lang/en.js
View file

@ -99,12 +99,12 @@ kiri.lang['en-us'] = {
// VIEW // VIEW
vu_menu: "view", vu_menu: "view",
vu_home: "home", vu_home: "Home",
vu_rset: "reset", vu_rset: "Reset",
vu_sptp: "top", vu_sptp: "Top",
vu_spfr: "front", vu_spfr: "Front",
vu_splt: "left", vu_splt: "Left",
vu_sprt: "right", vu_sprt: "Right",
// WORKSPACE // WORKSPACE
ws_menu: "workspace", ws_menu: "workspace",