Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

This commit is contained in:
Uwe Steinmann 2016-08-31 16:13:31 +02:00
commit bf25274fc0
2 changed files with 1285 additions and 3 deletions

File diff suppressed because it is too large Load Diff

View File

@ -119,10 +119,14 @@ var cy = cytoscape({
'curve-style': 'bezier' 'curve-style': 'bezier'
} }
}] }]
<?php //if($renderdata) echo ",elements: ".$renderdata; ?> });
}
); cy.gridGuide({
discreteDrag: false,
guidelinesStyle: {
strokeStyle: "red"
}
});
function save_handler(evt) { function save_handler(evt) {
// console.log(JSON.stringify(cy.json().elements)); // console.log(JSON.stringify(cy.json().elements));
@ -313,6 +317,8 @@ $(document).ready(function() {
$this->htmlAddHeader( $this->htmlAddHeader(
'<script type="text/javascript" src="../styles/bootstrap/cytoscape/cytoscape.min.js"></script>'."\n"); '<script type="text/javascript" src="../styles/bootstrap/cytoscape/cytoscape.min.js"></script>'."\n");
$this->htmlAddHeader(
'<script type="text/javascript" src="../styles/bootstrap/cytoscape/cytoscape-grid-guide.js"></script>'."\n");
$this->htmlAddHeader(' $this->htmlAddHeader('
<style type="text/css"> <style type="text/css">
body {padding: 0px;} body {padding: 0px;}