Skip to content

K
kityminder-core
Commit fd1779cc authored by campaign's avatar campaign
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 342ffba9 22e0fbeb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 66 deletions
demo/dev.html
View file @ fd1779cc
...@@ -10,15 +10,23 @@ ...@@ -10,15 +10,23 @@
<link href="../themes/default/_css/import.css" type="text/css" rel="stylesheet"> <link href="../themes/default/_css/import.css" type="text/css" rel="stylesheet">
<style> <style>
.km_receiver{ .km_receiver{
width:300px;height:300px; width:0;
height:0;
} }
.km-minderNode{ .km-minderNode{
cursor:default; cursor:default;
} }
.kmui-container {
height: 100%;
}
html, body, div {
margin: 0;
padding: 0;
}
</style> </style>
</head> </head>
<body > <body >
<div id="kityminder" style="height:1000px;width:100%" onselectstart="return false"> <div id="kityminder" style="height:100%;width:100%" onselectstart="return false">
</div> </div>
</body> </body>
<script> <script>
......
kity @ 1140e977
Subproject commit 1c5434e295dae9cad0f39248c9071ed99227cb33 Subproject commit 1140e977283ecc038ea444dd1186eb77c59510fb
src/module/layout.default.js
View file @ fd1779cc
This diff is collapsed.
src/module/layout.js
View file @ fd1779cc
...@@ -58,35 +58,28 @@ KityMinder.registerModule( "LayoutModule", function () { ...@@ -58,35 +58,28 @@ KityMinder.registerModule( "LayoutModule", function () {
} ); } );
kity.extendClass( MinderNode, { kity.extendClass( MinderNode, {
setLayout: function ( k, v ) { setLayout: function ( k, v ) {
if ( this.setData( 'layout' ) === undefined ) { if ( this._layout === undefined ) {
this.setData( 'layout', {} ); this._layout = {};
} }
var _pros = this.getLayout(); var _pros = this.getLayout();
Utils.extend( _pros, { Utils.extend( _pros, {
k: v k: v
} ); } );
this.setData( 'layout', _pros ); this._layout = _pros;
}, },
getLayout: function ( k ) { getLayout: function ( k ) {
if ( k === undefined ) { if ( k === undefined ) {
return this.getData( 'layout' ); return this._layout;
} }
return this.getData( 'layout' )[ k ]; return this._layout[ k ];
}, },
clearLayout: function () { clearLayout: function () {
this.setData( 'layout', {} ); this._layout = {};
},
setHide: function ( isHide ) {
this.setData( "hide", isHide );
},
isHide: function () {
return this.getData( "hide" );
} }
} ); } );
var switchLayout = function ( km, style ) { var switchLayout = function ( km, style ) {
var _root = km.getRoot(); var _root = km.getRoot();
_root.preTraverse( function ( n ) { _root.preTraverse( function ( n ) {
//n.clearLayout();
n.setPoint(); n.setPoint();
n.getBgRc().clear(); n.getBgRc().clear();
} ); } );
......
themes/default/_css/kityminder.css
View file @ fd1779cc
.kmui-container{ .kmui-container {
position: relative;
border: 1px solid #d4d4d4;
box-shadow: 2px 2px 5px #d3d6da;
background-color: #fff;
} }
.kmui-container .kmui-toolbar{ .kmui-container .kmui-toolbar{
position: relative;
width:auto;
border-bottom: 1px solid #e1e1e1;
box-shadow: 2px 2px 5px #d3d6da;
background-color: #fafafa; background-color: #fafafa;
z-index: 99999; z-index: 99999;
} }
.kmui-toolbar .kmui-btn-toolbar{ .kmui-toolbar .kmui-btn-toolbar{
position: relative;
padding: 5px; padding: 5px;
} }
.kmui-toolbar {
position: absolute;
left: 10px;
top: 10px;
border-radius: 4px;
}
.kmui-container .kmui-editor-body{ .kmui-container .kmui-editor-body{
background-color: #000000; background-color: #333;
line-height: 0;
overflow: hidden;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment