Skip to content

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

many changes 

commit 9b1102af
Author: techird <techird@qq.com>
Date:   Sun Feb 16 02:22:24 2014 +0800

    drag tree

commit 9d4d2d44
Author: techird <techird@qq.com>
Date:   Sat Feb 15 15:39:09 2014 +0800

    重构select

commit e40b0322
Merge: c9c91572 7c060bf0
Author: techird <techird@qq.com>
Date:   Fri Feb 14 17:43:36 2014 +0800

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

commit c9c91572
Author: techird <techird@qq.com>
Date:   Fri Feb 14 17:43:09 2014 +0800

    import

commit 7c060bf0
Merge: 6475e1bc 1566b267
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 17:13:58 2014 +0800

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

commit 6475e1bc
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 17:12:31 2014 +0800

    by zhanyi

commit 1566b267
Author: techird <techird@qq.com>
Date:   Fri Feb 14 17:08:57 2014 +0800

    dev

commit 22de9999
Merge: 02bf7378 bd296802
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 16:11:52 2014 +0800

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

commit bd296802
Author: techird <techird@qq.com>
Date:   Fri Feb 14 16:10:12 2014 +0800

    dev

commit 02bf7378
Merge: 1854c29d 677aeef7
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 16:09:16 2014 +0800

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

commit 677aeef7
Author: techird <techird@qq.com>
Date:   Fri Feb 14 16:02:06 2014 +0800

    ui

commit 1854c29d
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 16:01:50 2014 +0800

    by zhanyi

commit ff767e18
Merge: 7e559721 cd9a594f
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 14:17:10 2014 +0800

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

commit 7e559721
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 14:16:29 2014 +0800

    by zhanyi

commit cd9a594f
Author: techird <techird@qq.com>
Date:   Fri Feb 14 14:08:35 2014 +0800

    navigate bug fix

commit 02af05d8
Author: techird <techird@qq.com>
Date:   Fri Feb 14 13:59:44 2014 +0800

    arrange

commit a9274b38
Author: techird <techird@qq.com>
Date:   Fri Feb 14 13:33:35 2014 +0800

    ui optimize

commit 02111ec9
Author: techird <techird@qq.com>
Date:   Fri Feb 14 13:20:01 2014 +0800

    ui optimize

commit 26ada3ab
Author: techird <techird@qq.com>
Date:   Fri Feb 14 13:14:06 2014 +0800

    ui optimize

commit 9e0d0b69
Author: techird <techird@qq.com>
Date:   Fri Feb 14 12:47:53 2014 +0800

    save to

commit d66345b0
Author: techird <techird@qq.com>
Date:   Thu Feb 13 19:28:15 2014 +0800

    ui optimize

commit b5cbafb8
Author: techird <techird@qq.com>
Date:   Thu Feb 13 19:05:45 2014 +0800

    ui update

commit 49035271
Merge: a4b3a6f8 741c25b9
Author: techird <techird@qq.com>
Date:   Thu Feb 13 18:27:51 2014 +0800

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

commit a4b3a6f8
Author: techird <techird@qq.com>
Date:   Thu Feb 13 18:27:23 2014 +0800

    hand

commit 320552b4
Author: techird <techird@qq.com>
Date:   Thu Feb 13 18:25:57 2014 +0800

    ui optimize

commit 741c25b9
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 17:03:49 2014 +0800

    by zhanyi

commit 212a4e8c
Merge: 8d134143 60a0ff9e
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 16:29:08 2014 +0800

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

commit 8d134143
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 16:28:59 2014 +0800

    by zhanyi

commit 60a0ff9e
Author: techird <techird@qq.com>
Date:   Thu Feb 13 16:03:36 2014 +0800

    ui

commit 6cee6acf
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 15:41:20 2014 +0800

    by zhanyi

commit 1724ab59
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 14:15:58 2014 +0800

    by zhanyi

commit 7af2f5bd
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 14:11:05 2014 +0800

    by zhanyi

commit 1a36d361
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:50:44 2014 +0800

    by zhanyi

commit 5bef8d68
Merge: 781e8706 c4ca0884
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:47:10 2014 +0800

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

commit 781e8706
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:45:46 2014 +0800

    by zhanyi

commit 7d95683e
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:42:04 2014 +0800

    by zhanyi

commit c4ca0884
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 13:39:07 2014 +0800

    fixed bug

commit fd1779cc
Merge: 342ffba9 22e0fbeb
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:35:48 2014 +0800

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

commit 22e0fbeb
Merge: 560e8540 40452f1b
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 13:34:50 2014 +0800

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

commit 342ffba9
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:34:42 2014 +0800

    by zhanyi

commit 560e8540
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 13:34:23 2014 +0800

    deleted 'highlightnode'

commit 40452f1b
Author: techird <techird@qq.com>
Date:   Thu Feb 13 13:24:34 2014 +0800

    kity update

commit 3b84cf06
Author: techird <techird@qq.com>
Date:   Thu Feb 13 12:56:29 2014 +0800

    界面简单整理

commit b975fd1e
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 12:42:00 2014 +0800

    changed line style

commit 9ad9e96b
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 12:03:58 2014 +0800

    changed getData(layout) into getLayout()

commit edb81a8e
Merge: a9af083d 68fb69e2
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 11:27:46 2014 +0800

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

commit a9af083d
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 11:27:29 2014 +0800

    fixed bug

commit 68fb69e2
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 01:31:16 2014 +0800

    by zhanyi

commit d285ccb7
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 01:29:08 2014 +0800

    by zhanyi

commit 392d98e9
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 00:59:30 2014 +0800

    by zhanyi

commit 8872ad78
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 00:26:26 2014 +0800

    by zhanyi

commit ac797bf4
Merge: 82903074 dd6cc977
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 00:17:01 2014 +0800

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

commit 82903074
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 00:16:18 2014 +0800

    by zhanyi

commit dd6cc977
Author: techird <techird@qq.com>
Date:   Wed Feb 12 23:45:38 2014 +0800

    commit

commit bb44a06f
Author: techird <techird@qq.com>
Date:   Wed Feb 12 21:19:51 2014 +0800

    spec

commit 484331d1
Merge: 73e2d84d 9298a20b
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 20:25:32 2014 +0800

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

commit 73e2d84d
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 20:24:48 2014 +0800

    by zhanyi

commit 73d08e0c
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 20:24:30 2014 +0800

    by zhanyi

commit 9298a20b
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 20:15:27 2014 +0800

    fixed history bug

commit 016b3222
Merge: 14502fba d0f3ce2b
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 20:14:59 2014 +0800

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

commit a311d75d
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 20:14:59 2014 +0800

    fixed history bug

commit d0f3ce2b
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 20:12:58 2014 +0800

    fixed history bug

commit 5699f69c
Merge: 083a7f97 4d55616b
Author: techird <techird@qq.com>
Date:   Wed Feb 12 19:30:40 2014 +0800

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

commit 083a7f97
Author: techird <techird@qq.com>
Date:   Wed Feb 12 19:29:42 2014 +0800

    kity fix

commit 4d55616b
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 18:49:07 2014 +0800

    fixed contract

commit ece70219
Merge: 3f9f070f 9980f44d
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 18:30:49 2014 +0800

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

commit 3f9f070f
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 18:30:30 2014 +0800

    test

commit 9980f44d
Merge: d90f302b 60da728d
Author: techird <techird@qq.com>
Date:   Wed Feb 12 18:09:55 2014 +0800

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

    Conflicts:
    	demo/dev.html

commit d90f302b
Author: techird <techird@qq.com>
Date:   Wed Feb 12 18:08:53 2014 +0800

    导入导出功能

commit 14502fba
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 16:55:17 2014 +0800

    by zhanyi

commit 8e87eb5e
Merge: 4f2c9226 60da728d
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 16:13:59 2014 +0800

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

commit 60da728d
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 16:13:24 2014 +0800

    by zhanyi

commit 458f75ba
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 16:13:13 2014 +0800

    by zhanyi

commit 4f2c9226
Merge: 873f9122 01df8e56
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 16:12:55 2014 +0800

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

commit 873f9122
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 16:12:15 2014 +0800

    fixed bug

commit 01df8e56
Merge: 88eaa1ba d91df167
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 16:05:37 2014 +0800

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

commit d91df167
Merge: e4083e3a d3b81471
Author: techird <techird@qq.com>
Date:   Wed Feb 12 15:20:46 2014 +0800

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

    Conflicts:
    	src/core/node.js

commit e4083e3a
Author: techird <techird@qq.com>
Date:   Wed Feb 12 15:19:09 2014 +0800

    导入导出文档

commit 88eaa1ba
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 15:18:44 2014 +0800

    by zhanyi

commit d3b81471
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 14:56:32 2014 +0800

    added node expand and contract

commit 49b9cafa
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 13:58:06 2014 +0800

    test

commit edf896fe
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 13:38:13 2014 +0800

    框选删除

commit 47a399be
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 12:47:44 2014 +0800

    test

commit 596e8191
Author: techird <techird@qq.com>
Date:   Wed Feb 12 11:18:02 2014 +0800

    根据 jshint 修改格式

    1. 补充分号
    2. for 循环里赋值语句显示加上括号

commit 3d817a37
Author: techird <techird@qq.com>
Date:   Wed Feb 12 11:17:14 2014 +0800

    Kity更新

commit 245cbd4a
Author: techird <techird@qq.com>
Date:   Wed Feb 12 11:17:04 2014 +0800

    补充全局关键字

commit d6858fca
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 09:31:30 2014 +0800

    changed update

commit d17305ff
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 08:17:43 2014 +0800

    fixed select bug

commit 158f30b6
Merge: 92a78d6f 1fc93a5a
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 23:18:39 2014 +0800

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

commit 92a78d6f
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 23:18:13 2014 +0800

    added delete

commit 1fc93a5a
Merge: 7e201ace b4f2e3db
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 11 20:54:09 2014 +0800

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

    Conflicts:
    	src/module/editor.receiver.js

commit 7e201ace
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 11 18:54:04 2014 +0800

    by zhanyi

commit b4f2e3db
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 18:45:48 2014 +0800

    update layout

commit 4f1c2691
Merge: fbae7bf0 a30376a7
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 16:47:10 2014 +0800

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

commit a30376a7
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 11 16:46:27 2014 +0800

    by zhanyi

commit fbae7bf0
Merge: c91f9472 69cb9cc4
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 16:45:39 2014 +0800

    merge conflict

commit c91f9472
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 16:44:02 2014 +0800

    test

commit 47d3b6f5
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 16:42:52 2014 +0800

    重构

commit 69cb9cc4
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 11 15:32:27 2014 +0800

    by zhanyi

commit cbfcc958
Merge: d35bab8f 6b68f6ec
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:05:05 2014 +0800

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

commit d35bab8f
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:04:38 2014 +0800

    by zhanyi

commit beee354a
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:03:53 2014 +0800

    by zhanyi

commit fd752eb7
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:03:39 2014 +0800

    by zhanyi

commit b6fdbd8c
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:02:46 2014 +0800

    by zhanyi

commit a9bb28c3
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:02:31 2014 +0800

    by zhanyi

commit 6b68f6ec
Author: Akikonata <66875692@qq.com>
Date:   Mon Feb 10 12:43:20 2014 +0800

    fixed the bug of beforeRenderNode

commit 6438da2d
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 9 14:55:28 2014 +0800

    new style

commit fe1c871e
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 9 14:28:44 2014 +0800

    renamed style

commit 07b304fc
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 9 14:28:14 2014 +0800

    renamed style

commit 99cadfca
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 9 13:24:43 2014 +0800

    fixed green style bug

commit 0ba2c85e
Merge: dfcaf65b 1cf019b7
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 8 11:07:17 2014 +0800

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

commit dfcaf65b
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 8 11:03:37 2014 +0800

    fixed bug

commit 1cf019b7
Author: campaign <zhanyi1022@gmail.com>
Date:   Sat Feb 8 01:45:07 2014 +0800

    by zhanyi

commit 532153c8
Author: campaign <zhanyi1022@gmail.com>
Date:   Sat Feb 8 01:29:54 2014 +0800

    by zhanyi

commit f4caeabb
Author: campaign <zhanyi1022@gmail.com>
Date:   Sat Feb 8 01:06:49 2014 +0800

    by zhanyi

commit 8cf56d08
Merge: 970939ec 0537e3e0
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 7 21:48:21 2014 +0800

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

commit 0537e3e0
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 18:31:57 2014 +0800

    fixed bug

commit 73e6aaa7
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 17:52:42 2014 +0800

    changed structure

commit 970939ec
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 7 17:39:53 2014 +0800

    by zhanyi

commit ea78ac1d
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 17:24:31 2014 +0800

    added event

commit 7ee02295
Merge: e09fd163 b78aaca2
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 7 15:49:30 2014 +0800

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

commit e09fd163
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 7 15:45:49 2014 +0800

    by zhanyi

commit b78aaca2
Merge: a18615c0 95d27ab5
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 15:39:14 2014 +0800

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

commit a18615c0
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 15:38:03 2014 +0800

    test

commit b7a9e947
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 15:35:17 2014 +0800

    added node event

commit 95d27ab5
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 6 18:13:51 2014 +0800

    by zhanyi

commit dc2ad4be
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 16:26:08 2014 +0800

    by zhanyi

commit aeef6b0c
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 15:29:58 2014 +0800

    by zhanyi

commit 9a36e6be
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 14:38:12 2014 +0800

    by zhanyi

commit d16bcc7a
Merge: 408f2ed0 476dd4c3
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 14:35:11 2014 +0800

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

commit 476dd4c3
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 14:20:41 2014 +0800

    changed select

commit 408f2ed0
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 14:15:52 2014 +0800

    by zhanyi

commit c1eaf6c8
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 14:09:06 2014 +0800

    added node

commit b56076a1
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 14:07:48 2014 +0800

    added judge

commit ca15319e
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 13:58:50 2014 +0800

    by zhanyi

commit 5eb680c0
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 13:52:48 2014 +0800

    remove select

commit b89dda2b
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 13:29:39 2014 +0800

    select root

commit cf4ee9a0
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 17:18:40 2014 +0800

    by zhanyi

commit 0181e1e5
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 17:13:49 2014 +0800

    by zhanyi

commit 0df7b916
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 17:01:52 2014 +0800

    by zhanyi

commit 533ef8e4
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 16:19:49 2014 +0800

    by zhanyi

commit 0de26c44
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 16:00:58 2014 +0800

    by zhanyi

commit bdfe210e
Merge: 2cb35953 5da9a4aa
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:48:04 2014 +0800

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

commit 2cb35953
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:46:54 2014 +0800

    by zhanyi

commit 5da9a4aa
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 4 15:41:30 2014 +0800

    fixed bug

commit 7ee1cf20
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 4 15:35:48 2014 +0800

    added node move

commit 10f21447
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:07:57 2014 +0800

    by zhanyi

commit 282c3970
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:07:31 2014 +0800

    by zhanyi

commit b4238c81
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:04:25 2014 +0800

    by zhanyi

commit 30e37603
Merge: d5ae8599 7ae2c4e5
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:54:18 2014 +0800

    by zhanyi

commit d5ae8599
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:47:06 2014 +0800

    by zhanyi

commit 65a97743
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:46:56 2014 +0800

    by zhanyi

commit 7ae2c4e5
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 4 14:25:56 2014 +0800

    added updateLayout

commit b88195ef
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:25:20 2014 +0800

    by zhanyi

commit cb3b550b
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 4 14:18:32 2014 +0800

    test

commit ed8860bf
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:14:24 2014 +0800

    by zhanyi

commit 6a811fe9
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:12:18 2014 +0800

    by zhanyi

commit 37e682fb
Merge: 37f7f353 71d59ae0
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:03:20 2014 +0800

    by zhanyi

commit 37f7f353
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 13:59:34 2014 +0800

    添加编辑功能

commit 71d59ae0
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 2 04:18:01 2014 +0800

    added show and hide

commit 81416b00
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 2 04:12:00 2014 +0800

    added show and hide

commit 2e9e68b6
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 2 03:33:37 2014 +0800

    added shicon

commit c9d67aef
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 06:36:50 2014 +0800

    changed style

commit e48a1ef0
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 05:06:45 2014 +0800

    changed style

commit d5fa216f
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 05:03:57 2014 +0800

    changed style

commit 67ad6bd8
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 04:37:49 2014 +0800

    changed style

commit 3c8d48b1
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 04:07:37 2014 +0800

    changed shape

commit 2dd1b800
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 30 16:48:44 2014 +0800

    changed style

commit c075025f
Merge: c20aca36 a537a5ff
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 27 18:55:00 2014 +0800

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

commit c20aca36
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 27 18:54:48 2014 +0800

    test

commit 7eae9ddd
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 27 13:38:36 2014 +0800

    added new data

commit a537a5ff
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 20:10:46 2014 +0800

    by zhanyi

commit 40829511
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 20:06:48 2014 +0800

    by zhany

commit aba6baec
Merge: 54d0903c b96701df
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 20:01:55 2014 +0800

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

commit 54d0903c
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 20:01:40 2014 +0800

    by zhanyi

commit b96701df
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 17:50:51 2014 +0800

    added select

commit 40b114a2
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 17:21:40 2014 +0800

    fixed the bug of selecting nodes

commit 290f1339
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 15:32:09 2014 +0800

    fixed layout bug

commit 39b21a35
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 14:34:47 2014 +0800

    添加removeSelectedNodes方法

commit 2c4bd20a
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 14:30:42 2014 +0800

    修改了select功能

commit 1a6a1dce
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 13:37:39 2014 +0800

    utils 添加getNodeCommonAncestor

commit c8922806
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 13:24:46 2014 +0800

    added render node

commit 7b35e074
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 01:30:29 2014 +0800

    fixed bug

commit e9cd07b2
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 00:34:28 2014 +0800

    fixed bug

commit d2a737a2
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 00:25:50 2014 +0800

    fixed bug

commit bb8b03c0
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 23 19:31:02 2014 +0800

    added multiselect

commit 2bbb3cde
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 18:25:49 2014 +0800

    fixed bug

commit ebb2c77e
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 16:44:37 2014 +0800

    store

commit af02c5c1
Merge: 657e8a8d 02ac2067
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 22 16:27:38 2014 +0800

    by zhanyi

commit 02ac2067
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 15:57:21 2014 +0800

    changed funcs

commit 657e8a8d
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 22 15:25:13 2014 +0800

    添加setPoint,getPoint方法

commit ae46c37d
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 13:07:39 2014 +0800

    fixed the undo and redo

commit 5e59c39c
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 02:38:12 2014 +0800

    added select

commit 17d50f10
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 02:31:31 2014 +0800

    added connect

commit d1bcd5b0
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 02:26:05 2014 +0800

    added new layout style

commit 4911c516
Merge: 88144e55 1aa0b501
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Jan 21 01:31:43 2014 +0800

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

commit 88144e55
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Jan 21 01:29:48 2014 +0800

    用例

commit 1aa0b501
Merge: 1bf34614 c7c2b2a2
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 21 01:28:07 2014 +0800

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

commit c7c2b2a2
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Jan 21 01:25:26 2014 +0800

    属性深度复制

commit 1bf34614
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 21 01:09:10 2014 +0800

    changed layout

commit 6acbbdf4
Merge: a87ee4c9 7fcb5d76
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:58:41 2014 +0800

    fixed conflict

commit a87ee4c9
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:55:56 2014 +0800

    test

commit 7fcb5d76
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 23:53:23 2014 +0800

    添加快捷键

commit fefd5329
Merge: 7122ab68 b0fa6fb7
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:34:32 2014 +0800

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

commit 7122ab68
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:34:15 2014 +0800

    added updateLayout

commit b0fa6fb7
Merge: 341a9aaa 6c7e0de2
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 23:32:37 2014 +0800

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

commit 341a9aaa
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 23:32:06 2014 +0800

    修改了clone方法

commit 6c7e0de2
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:01:46 2014 +0800

    fixed layout bug

commit 1b82f700
Merge: cddde595 866f4d76
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 22:53:18 2014 +0800

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

commit cddde595
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 22:47:52 2014 +0800

    layout style switch

commit fcb507ae
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 18:26:01 2014 +0800

    updated layout

commit 866f4d76
Merge: 53e8d6ab e72b2f30
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:22:41 2014 +0800

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

commit 53e8d6ab
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:22:15 2014 +0800

    修改名字

commit 72c8338c
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:21:31 2014 +0800

    修改名字

commit afd2c66c
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:20:55 2014 +0800

    by zhanyi

commit e72b2f30
Merge: ef9ded65 ab550838
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 18:20:41 2014 +0800

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

commit ef9ded65
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 18:20:32 2014 +0800

    changed layout

commit ab550838
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:20:01 2014 +0800

    修改history

commit ca60958e
Merge: c4f5c210 ac919779
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 16:22:20 2014 +0800

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

commit c4f5c210
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 16:22:02 2014 +0800

    by zhanyi

commit ac919779
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 15:43:50 2014 +0800

    修改了layout相关的字段，样式切换的时候统一清空“layout字段”

commit a331169a
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 14:30:53 2014 +0800

    修改setData和修复getCommonAncestor

commit 14fba533
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 11:34:05 2014 +0800

    added delete and a new style

commit 7c798280
Merge: 22479859 d1bcc394
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 19:00:09 2014 +0800

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

commit 22479859
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 19:00:06 2014 +0800

    store

commit d1bcc394
Merge: 2622926a 7c7ac886
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 18:58:06 2014 +0800

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

commit 2622926a
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 18:54:03 2014 +0800

    by zhanyi

commit 552ab10f
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 18:53:39 2014 +0800

    添加editor

commit 7c7ac886
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 17:52:03 2014 +0800

    added node delete

commit 707f25e0
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 17:04:38 2014 +0800

    event.js添加preventDefault

commit fb4cc971
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 16:45:59 2014 +0800

    添加方向键

commit 8d5c3ca6
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 16:28:20 2014 +0800

    getSelectNodes默认

commit 60777228
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 16:28:10 2014 +0800

    enterkey/tabkey

commit b7b47ab0
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 16:09:48 2014 +0800

    added layoutstyle init

commit 4cf00f52
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 16:08:16 2014 +0800

    added layoutstyle init

commit 7bb40a8f
Merge: e4c96c31 d8902d2c
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 15:23:57 2014 +0800

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

commit d8902d2c
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 15:18:30 2014 +0800

    changed green style code

commit b89df8da
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 15:09:05 2014 +0800

    changed arrangement rule

commit 5768a7b8
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 14:35:11 2014 +0800

    changed switch style

commit e4c96c31
Merge: 0e874edc 424e8b4b
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 14:34:31 2014 +0800

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

commit 0e874edc
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 14:34:16 2014 +0800

    添加test case

commit 32e7742d
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 14:32:45 2014 +0800

    minder.node把svg的维护分理出去

commit 424e8b4b
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 13:53:33 2014 +0800

    added select

commit ba2e8cfd
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 13:24:07 2014 +0800

    added highlight

commit 63e5cf18
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 12:59:36 2014 +0800

    修正了select引用传错的问题

commit 94f12382
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 12:36:59 2014 +0800

    重构了layout相关的内容

commit bd842160
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 19:47:03 2014 +0800

    修改了mindernode的在画布上添加节点的方式

commit 0f1ab1e3
Author: yancend <dongyancen@baidu.com>
Date:   Wed Jan 15 18:52:24 2014 +0800

    [test]添加测试的index页面

commit 34298baa
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 17:25:27 2014 +0800

    添加getCommonAncestor/contains

commit 026e0336
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 15:46:46 2014 +0800

    添加了getSelectNode

commit 1af03e5a
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 15:28:12 2014 +0800

    修改了select的需求

commit fa45c9be
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 14:45:19 2014 +0800

    去掉了debugger

commit cd402957
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 14:02:29 2014 +0800

    修改了utils.argsToArray方法

commit 70ba4153
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 15 11:08:07 2014 +0800

    added 2 style

commit e1a9377f
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 15 10:59:41 2014 +0800

    changed layut file

commit c9b61560
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 14 13:59:52 2014 +0800

    changed argument getting method

commit 9631b740
Merge: e1c2854a 679bf01a
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 13 23:17:48 2014 +0800

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

    Conflicts:
    	src/core/minder.command.js
    	src/core/minder.module.js

commit e1c2854a
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 13 23:16:11 2014 +0800

    修改command机制

commit 679bf01a
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 13 20:22:06 2014 +0800

    added highlight

commit f965a887
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 13 20:08:51 2014 +0800

    dev

commit 0ea57ad4
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 13 20:08:31 2014 +0800

    dev

commit acb7dc6c
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 20:58:14 2014 +0800

    by zhanyi

commit b4f540a6
Merge: ee395869 89efd7bb
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 18:10:59 2014 +0800

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

    Conflicts:
    	demo/dev.html
    	src/core/minder.event.js
    	src/core/utils.js

commit ee395869
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 18:07:59 2014 +0800

    by zhanyi

commit 4d0c04b7
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 18:07:26 2014 +0800

    by zhanyi

commit bc07ea99
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 18:07:04 2014 +0800

    添加 editor模块

commit 89efd7bb
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 18:05:14 2014 +0800

    changed event modal

commit f759d12d
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 14:41:00 2014 +0800

    fixed updatenode bug

commit 64bd6a7c
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 14:33:45 2014 +0800

    fixed update bug

commit 4823c4c0
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 13:28:06 2014 +0800

    changed count

commit 80d3f563
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 13:23:55 2014 +0800

    added branch cut

commit 52b2c282
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 13:20:05 2014 +0800

    changed the analyze rule

commit 9be1c436
Author: techird <techird@qq.com>
Date:   Wed Jan 8 18:01:15 2014 +0800

    touch support

commit 7b0811c0
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 17:37:41 2014 +0800

    changed size

commit 67910f0b
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 17:20:32 2014 +0800

    added init

commit 0751ed0a
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 16:40:02 2014 +0800

    direct

commit 44acd200
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 16:09:35 2014 +0800

    changed delete

commit fa62f47c
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 16:04:11 2014 +0800

    changed add

commit 4debb929
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 16:01:47 2014 +0800

    changed add

commit 75a47977
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 15:07:06 2014 +0800

    changed node default style

commit 43d9ab52
Author: techird <techird@qq.com>
Date:   Wed Jan 8 14:59:01 2014 +0800

    dev

commit 4d335a41
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 14:47:13 2014 +0800

    added dec fund

commit e766a386
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 7 16:24:34 2014 +0800

    dev

commit 102f2f3c
Author: techird <techird@qq.com>
Date:   Tue Jan 7 16:24:16 2014 +0800

    Draggable

commit 0b2969f8
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 7 14:25:33 2014 +0800

    DEV

commit 095bff41
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 7 14:22:40 2014 +0800

    dev

commit 43c99b5b
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 7 12:28:54 2014 +0800

    minder graph

commit a0e1fc36
Author: techird <techird@qq.com>
Date:   Mon Jan 6 17:41:51 2014 +0800

    dev

commit bc465b0b
Author: techird <techird@qq.com>
Date:   Mon Jan 6 16:50:59 2014 +0800

    dev

commit ea53ce0d
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 16:17:33 2014 +0800

    added direction

commit 1cc974e2
Merge: a93ab56d 99d733da
Author: techird <techird@qq.com>
Date:   Mon Jan 6 16:12:31 2014 +0800

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

    Conflicts:
    	src/module/keyboard.js

commit a93ab56d
Author: techird <techird@qq.com>
Date:   Mon Jan 6 16:12:00 2014 +0800

    dev

commit 99d733da
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 16:10:59 2014 +0800

    dev

commit b463a316
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 16:00:11 2014 +0800

    dev

commit 06a3d4c5
Author: techird <techird@qq.com>
Date:   Mon Jan 6 15:56:09 2014 +0800

    dev

commit 56423a1f
Author: techird <techird@qq.com>
Date:   Mon Jan 6 15:54:25 2014 +0800

    dev

commit 6ea9d9cc
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:48:16 2014 +0800

    dev

commit 7bd268cf
Author: techird <techird@qq.com>
Date:   Mon Jan 6 15:41:53 2014 +0800

    dev

commit 36320190
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:40:38 2014 +0800

    dev

commit f4336c7c
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:37:30 2014 +0800

    changed nodeshape

commit cf53564a
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:31:49 2014 +0800

    dev

commit f3dcb826
Author: techird <techird@qq.com>
Date:   Mon Jan 6 15:12:31 2014 +0800

    dev

commit af01ed18
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:08:43 2014 +0800

    changed data structure

commit 4ccb9c9b
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:55:11 2014 +0800

    grammar error

commit f4fde756
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:52:15 2014 +0800

    changed x and y

commit 77cb3397
Author: techird <techird@qq.com>
Date:   Mon Jan 6 14:34:03 2014 +0800

    dev

commit 4db56975
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:28:34 2014 +0800

    added array support

commit 93c1993b
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:22:49 2014 +0800

    deleted extra node

commit 9f299f28
Author: techird <techird@qq.com>
Date:   Mon Jan 6 14:22:03 2014 +0800

    dev

commit a1ae07e1
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:21:03 2014 +0800

    dev

commit 072c2633
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:01:52 2014 +0800

    dev

commit 41be9143
Author: techird <techird@qq.com>
Date:   Mon Jan 6 13:59:49 2014 +0800

    dev

commit de89ff45
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:59:28 2014 +0800

    added string support

commit ce3a6504
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:42:27 2014 +0800

    deleted console log

commit 1becb150
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:40:46 2014 +0800

    deleted console log

commit 9003d6e6
Merge: 4b1bae5e 3256b32c
Author: techird <techird@qq.com>
Date:   Mon Jan 6 13:40:16 2014 +0800

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

    Conflicts:
    	src/module/keyboard.js

commit 4b1bae5e
Author: techird <techird@qq.com>
Date:   Mon Jan 6 13:38:07 2014 +0800

    dev

commit 3256b32c
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:35:22 2014 +0800

    dev

commit b097be73
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:26:29 2014 +0800

    added highlight

commit e37d42d1
Author: techird <techird@qq.com>
Date:   Mon Jan 6 11:01:09 2014 +0800

    dev

commit 1643230b
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 17:55:32 2014 +0800

    dev

commit 47715138
Author: techird <techird@qq.com>
Date:   Fri Jan 3 17:20:56 2014 +0800

    dev

commit 12061327
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 17:20:27 2014 +0800

    dev

commit 688bbc52
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 16:22:29 2014 +0800

    dev

commit 780aacca
Merge: 709549f5 236e6c64
Author: techird <techird@qq.com>
Date:   Fri Jan 3 16:01:53 2014 +0800

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

    Conflicts:
    	demo/dev.html
    	kity
    	src/core/minder.command.js

commit 709549f5
Author: techird <techird@qq.com>
Date:   Fri Jan 3 16:00:16 2014 +0800

    kity update

commit 3ea5ea8c
Author: techird <techird@qq.com>
Date:   Fri Jan 3 15:56:20 2014 +0800

    merge

commit 236e6c64
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 15:55:36 2014 +0800

    dev

commit e3f50f99
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 15:33:13 2014 +0800

    dev

commit 54585585
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 14:06:02 2014 +0800

    dev

commit 3f7ded0c
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 13:55:09 2014 +0800

    dev

commit c4682f0e
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 2 15:07:07 2014 +0800

    dev

commit cc0d2ac2
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 2 15:04:40 2014 +0800

    added node render

commit cf5a8805
Merge: 79fc4a40 634a95b7
Author: kitygraph <kitygraph@users.noreply.github.com>
Date:   Mon Dec 30 21:00:22 2013 -0800

    Merge pull request #1 from yancend/dev

    [test]添加测试框架

commit 79fc4a40
Author: techird <techird@qq.com>
Date:   Tue Dec 31 12:09:40 2013 +0800

    dev

commit 634a95b7
Author: yancend <dongyancen@baidu.com>
Date:   Mon Dec 30 19:45:57 2013 +0800

    [test]修改 import.php返回数据类型

commit 1d35b0dd
Author: yancend <dongyancen@baidu.com>
Date:   Mon Dec 30 18:21:47 2013 +0800

    [test]添加测试框架

commit 9a63150e
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:37:54 2013 +0800

    dev

commit a069550f
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:25:20 2013 +0800

    added _example define

commit 63464eb7
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:23:48 2013 +0800

    changed initial into init

commit f4ec4b92
Merge: ef57be43 19fbe3dc
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:15:12 2013 +0800

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

commit ef57be43
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:15:08 2013 +0800

    dev

commit 19fbe3dc
Merge: f7937942 2c1d1e6e
Author: techird <techird@qq.com>
Date:   Tue Dec 24 12:14:49 2013 +0800

    merge

commit f7937942
Author: techird <techird@qq.com>
Date:   Tue Dec 24 12:11:28 2013 +0800

    支持重载

commit 3d8f0323
Author: techird <techird@qq.com>
Date:   Tue Dec 24 12:11:17 2013 +0800

    添加resetEvents方法支持

commit 26c82350
Author: techird <techird@qq.com>
Date:   Tue Dec 24 12:10:59 2013 +0800

    命令锁逻辑修改

commit 2c1d1e6e
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:09:53 2013 +0800

    changed module

commit 2ea49a63
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 11:19:23 2013 +0800

    added sample code

commit e7d92d67
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 11:18:08 2013 +0800

    changed options

commit 6f39977b
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 11:16:24 2013 +0800

    changed example

commit c10c774d
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 11:11:57 2013 +0800

    added destroy and reset

commit 0c512f85
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 10:51:02 2013 +0800

    changed function calling

commit e1d7962a
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 10:35:30 2013 +0800

    added ','

commit c0597de1
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 18:32:02 2013 +0800

    _options

commit c54b4a66
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 18:31:29 2013 +0800

    _options

commit 9bb0158c
Author: techird <techird@qq.com>
Date:   Mon Dec 23 18:30:47 2013 +0800

    option

commit 72c028c2
Merge: 44ecd8c8 f3cc4c73
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 18:28:53 2013 +0800

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

    Conflicts:
    	demo/dev.html

commit 44ecd8c8
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 18:27:32 2013 +0800

    dev

commit f3cc4c73
Author: techird <techird@qq.com>
Date:   Mon Dec 23 18:24:12 2013 +0800

    merge 2

commit 3cd99103
Merge: 9a66a05c 3bf2700e
Author: techird <techird@qq.com>
Date:   Mon Dec 23 18:01:21 2013 +0800

    merge from panzheng

commit 9a66a05c
Author: techird <techird@qq.com>
Date:   Mon Dec 23 17:54:28 2013 +0800

    update kity

commit 05069fe2
Author: techird <techird@qq.com>
Date:   Mon Dec 23 17:53:39 2013 +0800

    dev

commit 3bf2700e
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 17:52:51 2013 +0800

    dev

commit 3cb3e8bc
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 17:46:08 2013 +0800

    dev

commit 94ba87d1
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 16:10:27 2013 +0800

    dev

commit 360c83bf
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 15:27:13 2013 +0800

    added _getCommand&&getQuery

commit 8b8945db
Author: techird <techird@qq.com>
Date:   Mon Dec 23 13:42:55 2013 +0800

    src adjust

commit 196addf0
Author: techird <techird@qq.com>
Date:   Mon Dec 23 13:37:57 2013 +0800

    拆分minder.js

commit 23920e31
Merge: 163c528d 82bfdd81
Author: techird <techird@qq.com>
Date:   Mon Dec 23 13:26:13 2013 +0800

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

commit 82bfdd81
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 13:25:18 2013 +0800

    dev

commit 163c528d
Author: techird <techird@qq.com>
Date:   Mon Dec 23 12:12:19 2013 +0800

    rename cancel to stopPropagation

commit 313cfc12
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 11:35:24 2013 +0800

    dev

commit ae6c0298
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 11:16:18 2013 +0800

    dev

commit ae81c95e
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 19:04:40 2013 +0800

    dev

commit 6fbd73c8
Merge: 469d5306 8b7c0bfa
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 18:23:54 2013 +0800

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

    Conflicts:
    	src/core/kityminder.js

commit 469d5306
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 18:20:58 2013 +0800

    dev

commit 8b7c0bfa
Author: techird <techird@qq.com>
Date:   Fri Dec 20 18:19:01 2013 +0800

    History Module

commit 0718e9b6
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 15:51:04 2013 +0800

    deleted extra files

commit 901b665d
Merge: cc79a59d 6d54ebe4
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 15:25:28 2013 +0800

    merge conflict

commit cc79a59d
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 15:24:15 2013 +0800

    dev

commit 6d54ebe4
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:22:54 2013 +0800

    expose getRenderContainer()

commit 6e79243c
Merge: ad872831 599d15fc
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:20:41 2013 +0800

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

    Conflicts:
    	minder_module/module.render.js

commit ad872831
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:19:57 2013 +0800

    Format Files

commit 65b73774
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:19:23 2013 +0800

    Module Example

commit 8402f4c8
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:00:39 2013 +0800

    添加 KityMinder 到开发全局变量

commit 60ab901b
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:00:14 2013 +0800

    测试模块移除

commit 6f071fef
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:00:08 2013 +0800

    模块文件建立

commit 599d15fc
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 14:30:35 2013 +0800

    added a func

commit 4ce2e79a
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 19:13:26 2013 +0800

    dev

commit a811bc78
Merge: 3e646f89 d0c4d013
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 19:03:09 2013 +0800

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

    Conflicts:
    	minder_module/module.default.test.js

commit 3e646f89
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 19:02:09 2013 +0800

    dev

commit d0c4d013
Author: techird <techird@qq.com>
Date:   Thu Dec 19 18:58:22 2013 +0800

    beautify

commit 6c1715b3
Merge: 13e44a41 5fc1721f
Author: techird <techird@qq.com>
Date:   Thu Dec 19 18:57:14 2013 +0800

    solve

commit 13e44a41
Author: techird <techird@qq.com>
Date:   Thu Dec 19 18:47:18 2013 +0800

    beautify

commit 5fc1721f
Merge: a0223c78 5f4a336a
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 18:46:43 2013 +0800

    merge conflict

commit a0223c78
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 18:42:49 2013 +0800

    command

commit 5f4a336a
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:39:13 2013 +0800

    selection change

commit a2ba1b8f
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:28:36 2013 +0800

    kity

commit eaf3afa1
Merge: 0c2f404e 6cf7c319
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:21:56 2013 +0800

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

commit 6cf7c319
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 17:21:26 2013 +0800

    added

commit 0c2f404e
Merge: 4b354b10 6a6855a2
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:18:01 2013 +0800

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

commit 4b354b10
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:17:56 2013 +0800

    make private sign

commit 6a6855a2
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 16:58:19 2013 +0800

    changed event trigger

commit 4499d9cf
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 16:51:31 2013 +0800

    changed the calling queue

commit 5343aade
Merge: 87a53298 d9a86469
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 16:19:47 2013 +0800

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

commit 87a53298
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 16:13:42 2013 +0800

    added closure

commit d9a86469
Merge: 494627a3 94a01e2e
Author: techird <techird@qq.com>
Date:   Thu Dec 19 16:13:04 2013 +0800

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

commit 494627a3
Author: techird <techird@qq.com>
Date:   Thu Dec 19 16:12:56 2013 +0800

    kity update

commit 26c4353e
Author: techird <techird@qq.com>
Date:   Thu Dec 19 16:11:41 2013 +0800

    dev.html update

commit 4d64fed6
Author: techird <techird@qq.com>
Date:   Thu Dec 19 16:11:15 2013 +0800

    event fix

commit 94a01e2e
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 15:53:49 2013 +0800

    added closure

commit 31f3519a
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 14:42:43 2013 +0800

    added query

commit 0fd0870f
Merge: fe365417 04bc3453
Author: techird <techird@qq.com>
Date:   Thu Dec 19 14:00:27 2013 +0800

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

commit fe365417
Author: techird <techird@qq.com>
Date:   Thu Dec 19 14:00:14 2013 +0800

    merge

commit f2d230d1
Author: techird <techird@qq.com>
Date:   Thu Dec 19 13:58:34 2013 +0800

    event & import & export

commit 04bc3453
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 13:12:38 2013 +0800

    fixed grammar with JSLint

commit d38e61b3
Author: techird <techird@qq.com>
Date:   Wed Dec 18 17:57:57 2013 +0800

    revert kity

commit 9a703d20
Merge: 8569f75a 87230381
Author: techird <techird@qq.com>
Date:   Wed Dec 18 17:56:16 2013 +0800

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

commit 8569f75a
Author: techird <techird@qq.com>
Date:   Wed Dec 18 17:55:09 2013 +0800

    revert kity

commit 87230381
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 17:51:33 2013 +0800

    added queryState

commit 917d1306
Merge: 208a7cd0 6b548ab3
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 17:29:39 2013 +0800

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

commit 208a7cd0
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 17:29:20 2013 +0800

    added action stack

commit 89760d30
Author: techird <techird@qq.com>
Date:   Wed Dec 18 16:04:29 2013 +0800

    kity

commit dda791d2
Author: techird <techird@qq.com>
Date:   Wed Dec 18 16:01:07 2013 +0800

    remove symbol link

commit 6b548ab3
Merge: 4b821dcd a2631cfa
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:58:46 2013 +0800

    merge

commit 4b821dcd
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:57:37 2013 +0800

    dev

commit e5ffeea9
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:54:58 2013 +0800

    link kity

commit a2631cfa
Merge: 75836c57 fbde29d7
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 15:27:58 2013 +0800

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

commit 75836c57
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 15:27:50 2013 +0800

    added impliment of  _initModules

commit fbde29d7
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:25:38 2013 +0800

    测试文件

commit 5e4cdcae
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:25:29 2013 +0800

    MinderNode

commit 4fb1161e
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:24:55 2013 +0800

    dev版本引用脚本

commit 3b0ce8c1
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:24:42 2013 +0800

    Node build工具

commit 6723effa
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:24:33 2013 +0800

    忽略项目文件

commit a26755ef
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:23:40 2013 +0800

    .jshintrc

commit baa4e3e1
Author: techird <techird@qq.com>
Date:   Tue Dec 17 18:14:39 2013 +0800

    core framework

commit 3d789914
Merge: d548c9ba a6b69e8a
Author: techird <techird@qq.com>
Date:   Tue Dec 17 14:54:20 2013 +0800

    架构修改合并

commit d548c9ba
Author: techird <techird@qq.com>
Date:   Tue Dec 17 14:09:04 2013 +0800

    架构设计修改

commit a6b69e8a
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 14:07:27 2013 +0800

    added document

commit 416cac77
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 13:08:30 2013 +0800

    format

commit ca44d2ce
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 13:02:12 2013 +0800

    changed command doc

commit 5f3051b9
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 12:59:20 2013 +0800

    changed command doc

commit cf1f3870
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 12:54:17 2013 +0800

    added command define

commit 5432fbe3
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 12:40:29 2013 +0800

    changed module define

commit bc05310e
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 12:35:42 2013 +0800

    changed module define

commit 08cee6c9
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 11:11:49 2013 +0800

    changed module define

commit d7b40a5b
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 16 18:59:27 2013 +0800

    changed km Architecture document

commit f285107d
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 16 18:30:32 2013 +0800

    changed km Architecture document

commit b63fe9ad
Author: techird <techird@qq.com>
Date:   Mon Dec 16 15:53:53 2013 +0800

    添加目标

commit 7eb09c53
Author: techird <techird@qq.com>
Date:   Mon Dec 16 15:37:38 2013 +0800

    架构脑图

commit 442025c8
Author: techird <techird@qq.com>
Date:   Mon Dec 16 15:12:31 2013 +0800

    脑图设计文档更新

commit 11d9f26c
Author: techird <techird@qq.com>
Date:   Mon Dec 16 15:12:22 2013 +0800

    更新Kity子库引用

commit 4c679ea2
Author: techird <techird@qq.com>
Date:   Mon Dec 16 12:55:34 2013 +0800

    架构文档
parent de8c5b59
Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 103 deletions
dist/baidu-frontia-js-full-1.0.0.js
View file @ ff5316c8
......@@ -884,7 +884,8 @@ baidu.frontia = {}, function(e) {
var i = [];
t.response_params.users.forEach(function(t) {
var r = new e.User({socialId: t.user_id,mediaType: t.media_type,name: t.username});
i.push(r)
r.extra = t;
i.push(r);
}), u.options.success({result: i,count: t.response_params.count}), c.err_code = 0
}
c.restimestamp = n(), r(c)
......
dist/index.html
View file @ ff5316c8
......@@ -9,7 +9,8 @@
<script src="../configure.js"></script>
<script src="../dist/dev.php"></script>
<script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script>
<link href="../themes/default/_css/import.css" type="text/css" rel="stylesheet">
<link href="../themes/default/css/import.css" type="text/css" rel="stylesheet">
<link rel="stylesheet" href="social.css">
<style>
.km_receiver{
width:0;
......@@ -25,38 +26,6 @@
margin: 0;
padding: 0;
}
#social {
position: absolute;
right: 10px;
top: 10px;
line-height: 20px;
text-align: right;
overflow: hidden;
}
#social button {
outline: none;
display: inline-block;
bottom: 20px;
right: 30px;
background: #0099f2;
padding: 0 15px;
height: 35px;
font-size: 13px;
line-height: 35px;
text-align: center;
border-radius: 5px;
color: #ffffff;
text-decoration: none;
border: none;
margin-left: 5px;
cursor: pointer;
}
#social button:hover {
background: #009fff;
}
#social button[disabled] {
background-color: #AAA;
}
</style>
</head>
<body >
......
dist/social.css 0 → 100644
View file @ ff5316c8
#social{position:absolute;right:10px;top:10px;line-height:20px;text-align:right;overflow:hidden}#social button,#social .kmui-btn{outline:none;display:inline-block;padding:0 15px;height:35px;font-size:13px;line-height:35px;text-align:center;border-radius:5px;color:#fff;text-decoration:none;border:none;margin-left:5px;cursor:pointer;background:#0099f2;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwOTlmMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjNDA5NmVlIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwNzZkZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=);background:-moz-linear-gradient(top, #0099f2 0, #4096ee 0, #0076dd 100%);background:-webkit-gradient(linear, left top, left bottom, color-stop(0, #0099f2), color-stop(0, #4096ee), color-stop(100%, #0076dd));background:-webkit-linear-gradient(top, #0099f2 0, #4096ee 0, #0076dd 100%);background:-o-linear-gradient(top, #0099f2 0, #4096ee 0, #0076dd 100%);background:-ms-linear-gradient(top, #0099f2 0, #4096ee 0, #0076dd 100%);background:linear-gradient(to bottom, #0099f2 0, #4096ee 0, #0076dd 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0099f2', endColorstr='#0076dd', GradientType=0);}#social button:hover,#social .kmui-btn:hover{background:#009fff}
#social button[disabled],#social .kmui-btn[disabled]{background:#aaa}
#social button.baidu-cloud,#social .kmui-btn.baidu-cloud{padding-left:35px;position:relative}#social button.baidu-cloud:before,#social .kmui-btn.baidu-cloud:before{content:' ';display:block;width:24px;height:24px;background:url(../themes/default/images/baiducloud.png);position:absolute;left:7px;top:5px}
#social button.share,#social .kmui-btn.share{padding-left:35px;position:relative}#social button.share:before,#social .kmui-btn.share:before{content:' ';display:block;width:24px;height:24px;background:url(../themes/default/images/share.png) no-repeat;position:absolute;left:7px;top:5px}
#social button img,#social .kmui-btn img{position:relative;top:3px;border-radius:2px;margin-right:7px}
dist/social.js
View file @ ff5316c8
$( function () {
var $panel = $( '#social' );
var $login_btn, $save_btn, $share_btn;
var $login_btn, $save_btn, $share_btn, $user_btn;
var baseUrl = ( function () {
var scripts = document.getElementsByTagName( 'script' );
......@@ -12,26 +12,44 @@ $( function () {
}
} )();
$login_btn = $( '<button>登录</button>' ).click( function () {
if ( currentUser === null ) {
$login_btn = $.kmuibutton( {
text: '登录'
} ).click( function () {
if ( !currentUser ) {
login();
} else {
baidu.frontia.logOutCurrentAccount();
currentUser = null;
//$save_btn.detach();
$share_btn.detach();
$login_btn.text( '登录' );
}
} ).appendTo( $panel );
$save_btn = $( '<button>保存到云盘</button>' ).click( function () {
var $menu = $.kmuidropmenu( {
data: [ {
label: '新建脑图',
value: 'action_newminder'
}, {
divider: true
}, {
label: '最近脑图',
value: 'action_recent'
} ]
} ).appendTo( 'body' ).kmui().attachTo( $login_btn );
var thisMapFilename;
$save_btn = $( '<button>保存</button>' ).click( function () {
var data = window.km.exportData( 'json' );
save( data, 'apps/kityminder/mymind.km' );
} );
save( data, 'apps/kityminder/mymind.km', function ( success, info ) {
if ( success ) {
$save_btn.text( '保存成功！' );
setTimeout( function () {
$save_btn.removeAttr( 'disabled' ).text( '保存' );
}, 3000 );
}
console.log( info );
} );
$save_btn.attr( 'disabled', 'disabled' ).text( '正在保存...' );
} ).addClass( 'baidu-cloud' );
$share_btn = $( '<button>分享脑图</button>' ).click( function () {
$share_btn = $( '<button>分享</button>' ).click( function () {
if ( $share_btn.attr( 'disabled' ) ) {
return;
}
var data = window.km.exportData( 'json' );
......@@ -55,7 +73,7 @@ $( function () {
$popup.append( '<p style="margin: 5px 0; font-size: 12px;">分享成功，请复制URL：</p>' );
var $input = $( '<input type="text" style="width: 250px;" value="' + shareUrl + '"></input>' ).appendTo( $popup );
$input[0].select();
$input[ 0 ].select();
$popup.mousedown( function ( e ) {
e.stopPropagation();
......@@ -64,15 +82,12 @@ $( function () {
$popup.fadeOut( 'fast', function () {
$popup.remove();
} );
$share_btn.removeAttr( 'disabled' ).text( '分享脑图' );
$share_btn.removeAttr( 'disabled' ).text( '分享' );
$( 'body' ).off( 'mousedown', arguments.callee );
} );
}
} );
} );
} ).addClass( 'share' );
baidu.frontia.init( 'wiE55BGOG8BkGnpPs6UNtPbb' );
......@@ -100,23 +115,66 @@ $( function () {
function setLogined( user ) {
currentUser = user;
$login_btn.text( '注销 ' + user.getName() );
//$save_btn.appendTo( $panel );
$login_btn.text( user.getName() + ' 的文件' );
$save_btn.appendTo( $panel );
$share_btn.appendTo( $panel );
loadRecent();
loadAvator();
}
function loadAvator() {
currentUser.getDetailInfo( {
success: function ( user ) {
var $img = $( '<img />' ).attr( {
'src': user.extra.tinyurl,
'width': 16,
'height': 16
} );
$img.prependTo( $login_btn );
}
} );
}
function loadRecent() {
var sto = baidu.frontia.personalStorage;
sto.listFile( 'apps/kityminder/', {
by: 'time',
success: function ( result ) {
if ( result.list.length ) {
loadPersonal( result.list[ 0 ].path );
}
}
} );
}
function loadPersonal( path ) {
var sto = baidu.frontia.personalStorage;
thisMapFilename = path;
sto.getFileUrl( path, {
success: function ( url ) {
$.ajax( {
url: url,
dataType: 'text',
success: function ( result ) {
window.km.importData( result, 'json' );
}
} );
}
} );
}
function save( file, filename ) {
var personlStorage = baidu.frontia.personalStorage;
function save( file, filename, callback ) {
var sto = baidu.frontia.personalStorage;
var options = {
ondup: personlStorage.constant.ONDUP_OVERWRITE,
ondup: sto.constant.ONDUP_OVERWRITE,
success: function ( result ) {
console.log( result );
callback( true, result );
},
error: function ( error ) {
console.log( error );
callback( false, error );
}
};
personlStorage.uploadTextFile( file, filename, options );
sto.uploadTextFile( file, filename, options );
}
function uuid() {
......
dist/social.less 0 → 100644
View file @ ff5316c8
#social {
position: absolute;
right: 10px;
top: 10px;
line-height: 20px;
text-align: right;
overflow: hidden;
button, .kmui-btn {
outline: none;
display: inline-block;
padding: 0 15px;
height: 35px;
font-size: 13px;
line-height: 35px;
text-align: center;
border-radius: 5px;
color: #ffffff;
text-decoration: none;
border: none;
margin-left: 5px;
cursor: pointer;background: #0099f2; /* Old browsers */
/* IE9 SVG, needs conditional override of 'filter' to 'none' */
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwOTlmMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjNDA5NmVlIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwNzZkZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=);
background: -moz-linear-gradient(top, #0099f2 0%, #4096ee 0%, #0076dd 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0099f2), color-stop(0%,#4096ee), color-stop(100%,#0076dd)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* IE10+ */
background: linear-gradient(to bottom, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0099f2', endColorstr='#0076dd',GradientType=0 ); /* IE6-8 */
&:hover {
background: #009fff;
}
&[disabled] {
background: #AAA;
}
&.baidu-cloud {
padding-left: 35px;
position: relative;
&:before {
content: ' ';
display: block;
width: 24px;
height: 24px;
background: url(../themes/default/images/baiducloud.png);
position: absolute;
left: 7px;
top: 5px;
}
}
&.share {
padding-left: 35px;
position: relative;
&:before {
content: ' ';
display: block;
width: 24px;
height: 24px;
background: url(../themes/default/images/share.png) no-repeat;
position: absolute;
left: 7px;
top: 5px;
}
}
img {
position: relative;
top: 3px;
border-radius: 2px;
margin-right: 7px;
}
}
}
\ No newline at end of file
src/module/hand.js
View file @ ff5316c8
......@@ -29,6 +29,7 @@ var ViewDragger = kity.createClass( "ViewDragger", {
if ( dragger.isEnabled() ) {
lastPosition = e.getPosition();
e.stopPropagation();
e.originEvent.preventDefault();
}
// 点击未选中的根节点临时开启
else if ( e.getTargetNode() == this.getRoot() &&
......
src/protocal/xmind.js 0 → 100644
View file @ ff5316c8
/*
http://www.xmind.net/developer/
Parsing XMind file
XMind files are generated in XMind Workbook (.xmind) format, an open format that is based on the principles of OpenDocument. It consists of a ZIP compressed archive containing separate XML documents for content and styles, a .jpg image file for thumbnails, and directories for related attachments.
*/
KityMinder.registerProtocal( 'xmind', {
fileExtension: '.xmind',
} );
\ No newline at end of file
src/protocal/xmind.md 0 → 100644
View file @ ff5316c8
# XMind 文件格式
## 官方说明
官方上对 XMind 文件的介绍是这样的：
> XMind files are generated in XMind Workbook (.xmind) format, an open format that is based on the principles of OpenDocument. It consists of a ZIP compressed archive containing separate XML documents for content and styles, a .jpg image file for thumbnails, and directories for related attachments.
整体来说这是一个 zip 包，里面有两个 XML 文档，一个存放内容，一个存放样式，还有一个 jpg 格式的缩略图。如果有附件，还会有存放附件的目录。
## 解析和生成目标
只解析 KityMinder 支持部分的文件内容；只生成 KityMinder 和 XMind 都支持的文件内容
\ No newline at end of file
src/ui/dropmenu.js
View file @ ff5316c8
......@@ -27,15 +27,15 @@ KM.ui.define('dropmenu', {
});
return this;
},
show:function(){
if(this.trigger('beforeshow') === false){
return;
}else{
this.root().css({display:'block'});
this.trigger('aftershow');
}
return this;
},
// show:function(){
// if(this.trigger('beforeshow') === false){
// return;
// }else{
// this.root().css({display:'block'});
// this.trigger('aftershow');
// }
// return this;
// },
init: function (options) {
var me = this;
var eventName = {
......
themes/default/_css/comboboxmenu.css → themes/default/css/comboboxmenu.css
View file @ ff5316c8
.kmui-combobox-menu{
position: absolute;
top: 100%;
left: 2px;
display: none;
list-style: none;
text-decoration: none;
margin: 0;
padding:5px;
padding: 5px 0;
background-color: #ffffff;
font-size: 12px;
box-shadow: 2px 2px 5px rgba(0, 0, 0, .5);
box-shadow: 2px 5px 15px rgba(0, 0, 0, .5);
border-radius: 3px;
min-width: 160px;
_width: 160px;
-webkit-transform: translateX(2px);
......@@ -18,38 +17,55 @@
.kmui-combobox-menu .kmui-combobox-item {
display: block;
border: 1px solid white;
padding: 2px 15px 2px 2px;
white-space:nowrap;
}
.kmui-combobox-menu .kmui-combobox-item:first-child:last-child {
border-radius: 2px;
}
.kmui-combobox-menu .kmui-combobox-item-label {
height: 25px;
line-height: 25px;
display: inline-block;
vertical-align: middle;
_display: inline;
_zoom: 1;
margin-left: 10px;
}
.kmui-combobox-menu .kmui-combobox-item:hover, .kmui-combobox-menu .kmui-combobox-stack-item:hover, .kmui-combobox-menu .kmui-combobox-item-hover {
background-color: #d5e1f2;
padding: 0;
border: 1px solid #a3bde3;
background: #0099f2; /* Old browsers */
/* IE9 SVG, needs conditional override of 'filter' to 'none' */
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwOTlmMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjNDA5NmVlIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwNzZkZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=);
background: -moz-linear-gradient(top, #0099f2 0%, #4096ee 0%, #0076dd 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0099f2), color-stop(0%,#4096ee), color-stop(100%,#0076dd)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* IE10+ */
background: linear-gradient(to bottom, #0099f2 0%,#4096ee 0%,#0076dd 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0099f2', endColorstr='#0076dd',GradientType=0 ); /* IE6-8 */
color: white;
/*border: 1px solid #a3bde3;*/
}
.kmui-combobox-menu .kmui-combobox-item .kmui-combobox-icon {
display: inline-block;
*zoom: 1;
*display: inline;
width: 24px;
height: 25px;
background: red;
vertical-align: bottom;
background: url(../images/ok.gif) no-repeat 1000px 1000px;
width: 30px;
height: 12px;
line-height: 12px;
vertical-align: middle;
background: url(../images/check.png) no-repeat 1000px 1000px;
}
.kmui-combobox-menu .kmui-combobox-checked .kmui-combobox-icon {
background-position: 10px 7px;
background-position: center 0;
}
.kmui-combobox-menu .kmui-combobox-checked:hover .kmui-combobox-icon {
background-position: center -12px;
}
......@@ -65,21 +81,6 @@
/* 字体样式校正 */
.kmui-combobox-fontsize .kmui-combobox-item-0.kmui-combobox-checked .kmui-combobox-icon {
background-position: 10px 7px;
}
.kmui-combobox-fontsize .kmui-combobox-item-1.kmui-combobox-checked .kmui-combobox-icon {
background-position: 10px 7px;
}
.kmui-combobox-fontsize .kmui-combobox-item-2.kmui-combobox-checked .kmui-combobox-icon {
background-position: 10px 7px;
}
.kmui-combobox-fontsize .kmui-combobox-item-3.kmui-combobox-checked .kmui-combobox-icon {
background-position: 10px 7px;
}
/* 24 */
.kmui-combobox-fontsize .kmui-combobox-item-4 .kmui-combobox-item-label {
......@@ -188,10 +189,12 @@
}
.kmui-combobox-menu .kmui-combobox-item-disabled {
color: black;
opacity: 0.3;
}
.kmui-combobox-menu .kmui-combobox-item-disabled:HOVER {
.kmui-combobox-menu .kmui-combobox-item-disabled:hover {
border-color: #fff;
background-color: #fff;
background: #fff;
color: black;
}
\ 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