Skip to content

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

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

parents 80650cdc 65f8f3ae
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
src/module/view.js
View file @ d18c8279
...@@ -97,7 +97,7 @@ KityMinder.registerModule( 'View', function () { ...@@ -97,7 +97,7 @@ KityMinder.registerModule( 'View', function () {
queryState: function ( minder ) { queryState: function ( minder ) {
return minder._viewDragger.isEnabled() ? 1 : 0; return minder._viewDragger.isEnabled() ? 1 : 0;
}, },
enableReadOnly : false enableReadOnly: false
} ); } );
var CameraCommand = kity.createClass( "CameraCommand", { var CameraCommand = kity.createClass( "CameraCommand", {
...@@ -110,7 +110,7 @@ KityMinder.registerModule( 'View', function () { ...@@ -110,7 +110,7 @@ KityMinder.registerModule( 'View', function () {
km.getRenderContainer().fxTranslate( dx, dy, 1000, "easeOutQuint" ); km.getRenderContainer().fxTranslate( dx, dy, 1000, "easeOutQuint" );
this.setContentChanged( false ); this.setContentChanged( false );
}, },
enableReadOnly : false enableReadOnly: false
} ); } );
return { return {
...@@ -153,9 +153,10 @@ KityMinder.registerModule( 'View', function () { ...@@ -153,9 +153,10 @@ KityMinder.registerModule( 'View', function () {
e.preventDefault(); e.preventDefault();
}, },
'normal.dblclick readonly.dblclick': function ( e ) { 'normal.dblclick readonly.dblclick': function ( e ) {
if ( e.getTargetNode() ) return; if ( e.kityEvent.targetShape instanceof kity.Paper ) {
this.execCommand( 'camera', this.getRoot() ); this.execCommand( 'camera', this.getRoot() );
} }
} }
}
}; };
} ); } );
\ 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