RPJosh
/
nc-gpxedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #49 allow val script in main page csp

merge-requests/12/merge
Julien Veyssier 2019-03-07 20:43:28 +01:00
parent 94b10725ab
commit fddde5c697
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/pagecontroller.php
View File

@ -175,7 +175,7 @@ class PageController extends Controller {
->addAllowedChildSrcDomain('*') ->addAllowedChildSrcDomain('*')
->addAllowedObjectDomain('*') ->addAllowedObjectDomain('*')
->addAllowedScriptDomain('*') ->addAllowedScriptDomain('*')
//->allowEvalScript('*') ->allowEvalScript(true)
->addAllowedConnectDomain('*'); ->addAllowedConnectDomain('*');
$response->setContentSecurityPolicy($csp); $response->setContentSecurityPolicy($csp);
return $response; return $response;

3
js/gpxedit.js
View File

@ -985,6 +985,7 @@
e = e || window.event; e = e || window.event;
var kc = e.keyCode; var kc = e.keyCode;
//console.log(kc); //console.log(kc);
//console.log(e.key);
if (kc === 161 || kc === 223) { if (kc === 161 || kc === 223) {
e.preventDefault(); e.preventDefault();
@ -994,7 +995,7 @@
e.preventDefault(); e.preventDefault();
$('#sidebar').toggleClass('collapsed'); $('#sidebar').toggleClass('collapsed');
} }
if (kc === 46) { if (e.key === 'Delete') {
if (gpxedit.hovermiddlemarker) { if (gpxedit.hovermiddlemarker) {
gpxedit.hovermiddlemarker.fire('cut', gpxedit.hovermiddlemarker); gpxedit.hovermiddlemarker.fire('cut', gpxedit.hovermiddlemarker);
} }