Commit a811bc78 authored by Akikonata's avatar Akikonata

Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

Conflicts:
	minder_module/module.default.test.js
parents 3e646f89 d0c4d013
{
"indent_with_tabs": false,
"preserve_newlines": true,
"max_preserve_newlines": 4,
"space_in_paren": true,
"jslint_happy": true,
"brace_style": "collapse",
"keep_array_indentation": false,
"keep_function_indentation": false,
"eval_code": false,
"unescape_strings": false,
"break_chained_methods": false,
"e4x": false,
"wrap_line_length": 0
}
\ No newline at end of file
var mindermoduleDefaultTest = function() {
console.log("test loaded");
var mindermoduleDefaultTest = function () {
console.log( "test loaded" );
var stroredData = "stored";
return {
"commands": {
//todo:command字典,name-action 键值对模式编写
"testCommand": kity.createClass("testCommand", {
"testCommand": kity.createClass( "testCommand", {
base: Command,
"execute": function(km, arg1, arg2, arg3) {
console.log(arg1, arg2, arg3);
"execute": function ( km, arg1, arg2, arg3 ) {
console.log( arg1, arg2, arg3 );
}
})
} )
},
"events": {
//todo:事件响应函数绑定列表,事件名-响应函数 键值对模式编写
"click": function(e) {
window.alert("hahaha");
"click": function ( e ) {
window.alert( "hahaha" );
},
"keydown keyup": function(e) {
window.alert("key");
"keydown keyup": function ( e ) {
window.alert( "key" );
},
"beforecommand": function(e) {
console.log("precommand:", e);
"beforecommand": function ( e ) {
console.log( "precommand:", e );
e.cancel();
},
"command": function(e) {
console.log("command exec!", e);
"command": function ( e ) {
console.log( "command exec!", e );
}
}
};
......
This diff is collapsed.
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