Skip to content

K
kityminder-core
Commit 211403ac authored by Akikonata's avatar Akikonata
Browse files
Options

resolved code error

parent 02961137
Expand all Show whitespace changes
Inline Side-by-side
Showing with 227 additions and 220 deletions
Gruntfile.js
View file @ 211403ac
......@@ -61,31 +61,29 @@ module.exports = function ( grunt ) {
options: {
banner: banner
},
files: (function(){
files: ( function () {
var files = {};
files[distPath + 'kityminder.all.js'] = distPath + 'kityminder.all.min.js';
files[ distPath + 'kityminder.all.js' ] = distPath + 'kityminder.all.min.js';
return files;
})()
} )()
}
},
copy: {
dir: {
files: [
{
files: [ {
src: [ 'dialogs/**', 'lang/**', 'lib/**', 'social/**', 'themes/**' ],
dest: distPath
}
]
} ]
}
},
replace: {
online: {
src: distPath+'index.html',
src: distPath + 'index.html',
overwrite: true,
replacements: [ {
from: /1234567890/ig,
to: '1234567890'
}]
} ]
}
},
......@@ -123,8 +121,8 @@ module.exports = function ( grunt ) {
/* [Build plugin & task ] ------------------------------------*/
grunt.loadNpmTasks( 'grunt-contrib-concat' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-text-replace');
grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-text-replace' );
// Build task(s).
grunt.registerTask( 'default', [ 'concat', 'uglify', 'copy', 'replace' ] );
......
src/adapter/saveto.js
View file @ 211403ac
......@@ -70,7 +70,7 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
if ( typeof ( data ) == 'string' ) {
var url = 'data:text/plain; utf-8,' + encodeURIComponent( data );
if ( ie_ver() > 0 ) {
console.log( p.fileExtension );
//console.log( p.fileExtension );
if ( p.fileExtension === '.km' ) {
doSave( 'application/x-javascript', data, me.getMinderTitle() );
} else if ( p.fileExtension === '.svg' ) {
......
src/module/editor.receiver.js
View file @ 211403ac
This diff is collapsed.
src/module/history.js
View file @ 211403ac
......@@ -58,8 +58,8 @@ KityMinder.registerModule( "HistoryModule", function () {
this.km.initStyle();
this.update();
this.km.fire('restoreScene');
this.km.fire('contentChange');
this.km.fire( 'restoreScene' );
this.km.fire( 'contentChange' );
},
getScene: function () {
return new Scene( this.km.getRoot() )
......@@ -95,8 +95,18 @@ KityMinder.registerModule( "HistoryModule", function () {
this.historyManager = new HistoryManager( this );
var keys = {
/*Shift*/ 16:1, /*Ctrl*/ 17:1, /*Alt*/ 18:1,/*Command*/91:1,
37:1, 38:1, 39:1, 40:1
/*Shift*/
16: 1,
/*Ctrl*/
17: 1,
/*Alt*/
18: 1,
/*Command*/
91: 1,
37: 1,
38: 1,
39: 1,
40: 1
},
keycont = 0,
lastKeyCode,
......@@ -104,7 +114,7 @@ KityMinder.registerModule( "HistoryModule", function () {
return {
defaultOptions: {
maxUndoCount: 20,
maxInputCount:20
maxInputCount: 20
},
"commands": {
"undo": kity.createClass( "UndoCommand", {
......@@ -143,38 +153,39 @@ KityMinder.registerModule( "HistoryModule", function () {
},
"events": {
"saveScene": function ( e ) {
debugger;
this.historyManager.saveScene();
},
"renderNode":function(e){
"renderNode": function ( e ) {
var node = e.node;
if(node.isHighlight()){
km.select(node);
if ( node.isHighlight() ) {
km.select( node );
}
},
"keydown":function(e){
"keydown": function ( e ) {
var orgEvt = e.originEvent;
var keyCode = orgEvt.keyCode || orgEvt.which;
if (!keys[keyCode] && !orgEvt.ctrlKey && !orgEvt.metaKey && !orgEvt.shiftKey && !orgEvt.altKey) {
if ( !keys[ keyCode ] && !orgEvt.ctrlKey && !orgEvt.metaKey && !orgEvt.shiftKey && !orgEvt.altKey ) {
if (km.historyManager.list.length == 0) {
if ( km.historyManager.list.length == 0 ) {
km.historyManager.saveScene();
}
clearTimeout(saveSceneTimer);
clearTimeout( saveSceneTimer );
saveSceneTimer = setTimeout(function(){
saveSceneTimer = setTimeout( function () {
km.historyManager.saveScene();
},200);
}, 200 );
lastKeyCode = keyCode;
keycont++;
if (keycont >= km.getOptions('maxInputCount') ) {
if ( keycont >= km.getOptions( 'maxInputCount' ) ) {
km.historyManager.saveScene()
}
}
},
"import":function(){
"import": function () {
this.historyManager.reset()
}
}
......
src/module/layout.default.js
View file @ 211403ac
......@@ -394,16 +394,16 @@ KityMinder.registerModule( "LayoutDefault", function () {
}
};
var showNodeInView = function( node ){
var showNodeInView = function ( node ) {
var padding = 5;
var viewport = minder.getPaper().getViewPort();
var offset = node.getRenderContainer().getRenderBox( minder.getRenderContainer() );
var tmpX = viewport.center.x * 2 - (offset.x + offset.width);
var tmpY = viewport.center.y * 2 - (offset.y + offset.height);
var tmpX = viewport.center.x * 2 - ( offset.x + offset.width );
var tmpY = viewport.center.y * 2 - ( offset.y + offset.height );
var dx = offset.x < 0 ? -offset.x : Math.min(tmpX, 0);
var dy = offset.y < 0 ? -offset.y : Math.min(tmpY, 0);
var dx = offset.x < 0 ? -offset.x : Math.min( tmpX, 0 );
var dy = offset.y < 0 ? -offset.y : Math.min( tmpY, 0 );
km.getRenderContainer().fxTranslate( dx, dy, 100, "easeOutQuint" );
};
......@@ -585,7 +585,7 @@ KityMinder.registerModule( "LayoutDefault", function () {
updateConnectAndshIcon( set[ i ] );
}
if( focus ){
if ( focus ) {
showNodeInView( node );
}
},
......
src/module/layout.js
View file @ 211403ac
......@@ -107,7 +107,7 @@ KityMinder.registerModule( "LayoutModule", function () {
execute: function ( km, node, focus, silbling ) {
var parent = km.getSelectedNode();
if( !parent ){
if ( !parent ) {
return null;
}
......@@ -134,7 +134,7 @@ KityMinder.registerModule( "LayoutModule", function () {
base: Command,
execute: function ( km, node, focus ) {
var selectedNode = km.getSelectedNode();
if( !selectedNode ){
if ( !selectedNode ) {
return null;
}
......@@ -163,7 +163,7 @@ KityMinder.registerModule( "LayoutModule", function () {
base: Command,
execute: function ( km ) {
if( km.getRoot().children.length == 0 ){
if ( km.getRoot().children.length == 0 ) {
return;
}
......
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