refs #49 allow val script in main page csp
parent
94b10725ab
commit
fddde5c697
|
@ -157,14 +157,14 @@ class PageController extends Controller {
|
|||
|
||||
// PARAMS to view
|
||||
|
||||
require_once('tileservers.php');
|
||||
require_once('tileservers.php');
|
||||
$params = [
|
||||
'username'=>$this->userId,
|
||||
'basetileservers'=>$baseTileServers,
|
||||
'usertileservers'=>$tss,
|
||||
'useroverlayservers'=>$oss,
|
||||
'usertileserverswms'=>$tssw,
|
||||
'useroverlayserverswms'=>$ossw,
|
||||
'basetileservers'=>$baseTileServers,
|
||||
'usertileservers'=>$tss,
|
||||
'useroverlayservers'=>$oss,
|
||||
'usertileserverswms'=>$tssw,
|
||||
'useroverlayserverswms'=>$ossw,
|
||||
'extrasymbols'=>$extraSymbolList,
|
||||
'gpxedit_version'=>$this->appVersion
|
||||
];
|
||||
|
@ -175,7 +175,7 @@ class PageController extends Controller {
|
|||
->addAllowedChildSrcDomain('*')
|
||||
->addAllowedObjectDomain('*')
|
||||
->addAllowedScriptDomain('*')
|
||||
//->allowEvalScript('*')
|
||||
->allowEvalScript(true)
|
||||
->addAllowedConnectDomain('*');
|
||||
$response->setContentSecurityPolicy($csp);
|
||||
return $response;
|
||||
|
|
|
@ -985,6 +985,7 @@
|
|||
e = e || window.event;
|
||||
var kc = e.keyCode;
|
||||
//console.log(kc);
|
||||
//console.log(e.key);
|
||||
|
||||
if (kc === 161 || kc === 223) {
|
||||
e.preventDefault();
|
||||
|
@ -994,7 +995,7 @@
|
|||
e.preventDefault();
|
||||
$('#sidebar').toggleClass('collapsed');
|
||||
}
|
||||
if (kc === 46) {
|
||||
if (e.key === 'Delete') {
|
||||
if (gpxedit.hovermiddlemarker) {
|
||||
gpxedit.hovermiddlemarker.fire('cut', gpxedit.hovermiddlemarker);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue