Skip to content

K
kityminder-core
Commit d8bc24f8 authored by techird's avatar techird
Browse files
Options

publish

parent 81d2f50f
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
dist/kityminder.all.js
View file @ d8bc24f8
...@@ -2773,12 +2773,14 @@ KityMinder.registerModule( "LayoutDefault", function () { ...@@ -2773,12 +2773,14 @@ KityMinder.registerModule( "LayoutDefault", function () {
if ( Layout.shicon ) Layout.shicon.remove(); if ( Layout.shicon ) Layout.shicon.remove();
} catch ( error ) {} } catch ( error ) {}
} }
//if ( _buffer[ 0 ].getData( "expand" ) !== false )
_buffer = _buffer.concat( _buffer[ 0 ].getChildren() ); _buffer = _buffer.concat( _buffer[ 0 ].getChildren() );
_buffer.shift(); _buffer.shift();
} }
if ( isExpand ) { if ( isExpand ) {
node.clearChildren(); node.clearChildren();
for ( var j = 0; j < _cleanbuffer.length; j++ ) { for ( var j = 0; j < _cleanbuffer.length; j++ ) {
//if ( _cleanbuffer[ j ].getData( "expand" ) !== false )
_cleanbuffer[ j ].clearChildren(); _cleanbuffer[ j ].clearChildren();
minder.appendChildNode( _cleanbuffer[ j ].getLayout().parent, _cleanbuffer[ j ] ); minder.appendChildNode( _cleanbuffer[ j ].getLayout().parent, _cleanbuffer[ j ] );
} }
...@@ -4537,6 +4539,7 @@ Minder.Receiver = kity.createClass('Receiver',{ ...@@ -4537,6 +4539,7 @@ Minder.Receiver = kity.createClass('Receiver',{
case keys.Tab: case keys.Tab:
this.selection.setHide(); this.selection.setHide();
this.clear().setTextEditStatus(false); this.clear().setTextEditStatus(false);
this.km.fire('contentchange');
this.km.setStatus('normal'); this.km.setStatus('normal');
e.preventDefault(); e.preventDefault();
break; break;
...@@ -7287,6 +7290,9 @@ KM.registerToolbarUI( 'switchlayout', function ( name ) { ...@@ -7287,6 +7290,9 @@ KM.registerToolbarUI( 'switchlayout', function ( name ) {
return null; return null;
} }
utils.each(options.items,function(i,item){
options.items[i] = me.getLang('layout')[item];
});
//实例化 //实例化
$combox = $.kmuibuttoncombobox( options ).css( 'zIndex', me.getOptions( 'zIndex' ) + 1 ); $combox = $.kmuibuttoncombobox( options ).css( 'zIndex', me.getOptions( 'zIndex' ) + 1 );
comboboxWidget = $combox.kmui(); comboboxWidget = $combox.kmui();
...@@ -7470,12 +7476,11 @@ KM.registerUI( 'contextmenu', function () { ...@@ -7470,12 +7476,11 @@ KM.registerUI( 'contextmenu', function () {
KM.registerToolbarUI( 'markers', function ( name ) { KM.registerToolbarUI( 'markers help', function ( name ) {
var me = this, var me = this,
currentRange, $dialog, currentRange, $dialog,
opt = { opt = {
width: 200,
title: this.getLang( 'tooltips' )[ name ] || '', title: this.getLang( 'tooltips' )[ name ] || '',
url: me.getOptions( 'KITYMINDER_HOME_URL' ) + 'dialogs/' + name + '/' + name + '.js', url: me.getOptions( 'KITYMINDER_HOME_URL' ) + 'dialogs/' + name + '/' + name + '.js',
}; };
......
dist/kityminder.all.min.js
View file @ d8bc24f8
This source diff could not be displayed because it is too large. You can view the blob instead.
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