update

kityminder-editor/.gitignore

@@ -1,7 +1,8 @@
 .idea
 .DS_Store
-*.sublime-project
-*.sublime-workspace
+bower_components/
 node_modules/
-_drafts/
-bower_components
+dist/
+ui/templates.js
+.tmp/
+upload/

kityminder-editor/.jshintrc

@@ -9,6 +9,7 @@
     "quotmark": false,
     "browser": true,
     "boss": true,
+    "indent": 4,
     "predef" : [
         "define"
     ]

kityminder-editor/Gruntfile.js

@@ -5,19 +5,18 @@ var path = require('path');
 module.exports = function(grunt) {
     'use strict';
 
-    // These plugins provide necessary tasks.
-    /* [Build plugin & task ] ------------------------------------*/
-    grunt.loadNpmTasks('grunt-module-dependence');
-    grunt.loadNpmTasks('grunt-replace');
-    grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-contrib-copy');
-    grunt.loadNpmTasks('grunt-contrib-concat');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
+	// Load grunt tasks automatically
+	require('load-grunt-tasks')(grunt);
     grunt.loadNpmTasks('grunt-browser-sync');
     grunt.loadNpmTasks('grunt-contrib-watch');
 
     var pkg = grunt.file.readJSON('package.json');
 
+	var appConfig = {
+		app: require('./bower.json').appPath || 'app',
+		dist: 'dist'
+	};
+
     var banner = '/*!\n' +
         ' * ====================================================\n' +
         ' * <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
@@ -29,7 +28,7 @@ module.exports = function(grunt) {
         ' * ====================================================\n' +
         ' */\n\n';
 
-    var expose = '\nuse(\'expose-kityminder\');\n';
+    var expose = '\nuse(\'expose-editor\');\n';
 
     // Project configuration.
     grunt.initConfig({
@@ -37,17 +36,36 @@ module.exports = function(grunt) {
         // Metadata.
         pkg: pkg,
 
+	    yeoman: appConfig,
+
         clean: {
-            last: 'dist'
+            last: [
+	            '.tmp',
+	            'dist/*.js',
+	            'dist/*.css',
+	            'dist/*.css.map'
+            ],
+	        clstmp: ['.tmp']
         },
 
-        // watch
-        watch: {
-            files: 'src/**',
-            tasks: ['build']
+        // resolve dependence
+        dependence: {
+            options: {
+                base: 'src',
+                entrance: 'expose-editor'
+            },
+            merge: {
+                files: [{
+                    src: [
+                        'src/**/*.js'
+                    ],
+                    dest: '.tmp/scripts/kityminder.editor.logic.js'
+                }]
+            }
         },
+
         // browser sync for dev
-        browserSync: {
+		browserSync: {
             bsFiles: {
                 dist: 'dist/css/*.css',
                 src: 'src/**'
@@ -55,35 +73,29 @@ module.exports = function(grunt) {
             options: {
                 server: {
                     baseDir: './',
-                    index: 'dev.html',
+                    index: 'index.html',
                     watchTask: true
                 }
             }
-        },
-
-        // resolve dependence
-        dependence: {
-            options: {
-                base: 'src',
-                entrance: 'expose-kityminder'
-            },
-            merge: {
-                files: [{
-                    src: 'src/**/*.js',
-                    dest: 'dist/kityminder.core.js'
-                }]
-            }
-        },
+		},
 
-        // concat, just add closure
+        // concat
         concat: {
-            options: {
-                banner: banner + '(function () {\n',
-                footer: expose + '})();'
-            },
-            build: {
+            closure: {
+                options: {
+                    banner: banner + '(function () {\n',
+                    footer: expose + '})();'
+                },
                 files: {
-                    'dist/kityminder.core.js': ['dist/kityminder.core.js']
+	                'dist/kityminder.editor.js': [
+		                '.tmp/scripts/kityminder.editor.logic.js',
+		                '.tmp/scripts/kityminder.app.annotated.js',
+		                '.tmp/scripts/templates.annotated.js',
+		                '.tmp/scripts/service/*.js',
+		                '.tmp/scripts/filter/*.js',
+                        '.tmp/scripts/dialog/**/*.js',
+		                '.tmp/scripts/directive/**/*.js'
+	                ]
                 }
             }
         },
@@ -93,23 +105,98 @@ module.exports = function(grunt) {
                 banner: banner
             },
             minimize: {
-                src: 'dist/kityminder.core.js',
-                dest: 'dist/kityminder.core.min.js'
+                files: [{
+	                src: 'dist/kityminder.editor.js',
+	                dest: 'dist/kityminder.editor.min.js'
+                }]
             }
         },
 
-        copy: {
-            dist: {
-                src: 'src/kityminder.css',
-                dest: "dist/kityminder.core.css"
+        less: {
+            compile: {
+                options: {
+                    sourceMap: true,
+	                sourceMapURL: 'kityminder.editor.css.map',
+                    sourceMapFilename: 'dist/kityminder.editor.css.map'
+                },
+                files: [{
+                    dest: 'dist/kityminder.editor.css',
+                    src: 'less/editor.less'
+                }]
             }
-        }
+        },
 
-    });
+	    cssmin: {
+	        dist: {
+	            files: {
+	                'dist/kityminder.editor.min.css': 'dist/kityminder.editor.css'
+	         }
+	       }
+	    },
+
+	    ngtemplates: {
+		    kityminderEditor: {
+			    src: ['ui/directive/**/*.html', 'ui/dialog/**/*.html'],
+			    dest: 'ui/templates.js',
+			    options: {
+				    htmlmin: {
+					    collapseBooleanAttributes: true,
+					    collapseWhitespace: true,
+					    removeComments: true
+				    }
+			    }
+		    }
+	    },
+
+	    // Automatically inject Bower components into the app
+	    wiredep: {
+		    dev: {
+			    src: ['index.html'],
+			    devDependencies: true
+		    },
+		    dist: {
+			    src: ['dist/index.html']
+		    }
+	    },
+
+	    // Copies remaining files to places other tasks can use
+	    copy: {
+		    dist: {
+				files: [{
+				    expand: true,
+				    cwd: 'ui',
+					src: 'images/*',
+				    dest: 'dist'
+
+			    }]
+		    }
+	    },
+
+
+	    // ng-annotate tries to make the code safe for minification automatically
+	    // by using the Angular long form for dependency injection.
+	    ngAnnotate: {
+		    dist: {
+			    files: [{
+				    expand: true,
+				    cwd: 'ui/',
+				    src: '**/*.js',
+				    ext: '.annotated.js',
+				    extDot: 'last',
+				    dest: '.tmp/scripts/'
+			    }]
+		    }
+	    }
 
 
+    });
+
     // Build task(s).
-    grunt.registerTask('build', ['clean', 'dependence', 'concat:build', 'uglify:minimize', 'copy']);
-    grunt.registerTask('dev', ['browserSync', 'watch']);
+	grunt.registerTask('build', ['clean:last',
+		//'wiredep:dist',
+        'ngtemplates', 'dependence', 'ngAnnotate', 'concat', 'uglify', 'less', 'cssmin', 'copy', 'clean:clstmp']);
 
+	grunt.registerTask('dev', ['clean:last',
+        //'wiredep:dev',
+        'ngtemplates', 'dependence', 'ngAnnotate', 'concat', 'uglify', 'less', 'cssmin', 'copy', 'clean:clstmp', 'browserSync', 'watch']);
 };

kityminder-editor/LICENSE

@@ -1,27 +1,340 @@
-Copyright (c) 2014, FEX, Baidu.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the KityMinder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+

kityminder-editor/README.md

@@ -1,68 +1,87 @@
-KityMinder Core
+KityMinder Editor
 ==========
 
 ## 简介
 
-KityMinder 是一款强大的脑图可视化/编辑工具，由百度 FEX 团队开发并维护。
+KityMinder Editor 是一款强大、简洁、体验优秀的脑图编辑工具，适合用于编辑树/图/网等结构的数据。
 
-本仓库是 KityMinder 的核心实现部分：
+编辑器由百度 [FEX](https://github.com/fex-team) 基于 [kityminder-core](https://github.com/fex-team/kityminder-core) 搭建，并且在[百度脑图](http://naotu.baidu.com)中使用。
 
-* 包括脑图数据的可视化展示（Json 格式）
-* 包括简单的编辑功能（节点创建、编辑、删除）。更加强大编辑功能的 KityMinder 编辑器请移步 [kityminder-editor](https://github.com/fex-team/kityminder-editor)
-* 不包含第三方格式（FreeMind、XMind、MindManager）的支持，可以加载 [kityminder-protocol](https://github.com/fex-team/kityminder-third-party-protocol) 来扩展第三方格式支持。
-* 不包含文件存储的支持，需要自行实现存储。可参照[百度脑图](https://naotu.baidu.com)中的开源的 fio + 百度网盘方案进行实现。
+他们的区别与联系如下：
 
-## 使用
+![KityMinder 联系](relations.png "KityMinder 联系")
 
-可以参考 [example.html](example.html) 进行使用。
+- [kityminder-core](https://github.com/fex-team/kityminder-core) 是 kityminder 的核心部分，基于百度 [FEX](https://github.com/fex-team) 开发的矢量图形库 [kity](https://github.com/fex-team/kity)。包含了脑图数据的可视化展现，简单编辑功能等所有底层支持。
+- [kityminder-editor](https://github.com/fex-team/kityminder-editor) 基于 kityminder-core 搭建，依赖于 AngularJS，包含 UI 和热盒 [hotbox](https://github.com/fex-team/hotbox) 等方便用户输入的功能，简单来说，就是一款编辑器。
+- [百度脑图](http://naotu.baidu.com) 基于 kityminder-editor，加入了第三方格式导入导出 (FreeMind, XMind, MindManager) 、文件储存、用户认证、文件分享、历史版本等业务逻辑。
 
-```js
-<div id="minder-container"></div>
-<script type="text/javascript" src="kityminder.core.min.js"></script>
-<script type="text/javascript">
-var minder = new kityminder.Minder({
-	renderTo: '#minder-container'
-});
-</script>
-```
-
-更多详细的开发资料可以参考 [wiki](https://github.com/fex-team/kityminder-core/wiki)
+## 功能
 
-## 兼容性
+- 基本操作：文本编辑，节点折叠、插入、删除、排序、归纳、复制、剪切、粘贴等
+- 样式控制：字体、加粗、斜体、颜色、样式拷贝、样式粘贴等
+- 图标：优先级、进度等
+- 历史：撤销/重做
+- 标签：多标签贴入
+- 备注：支持 Markdown 格式备注
+- 图片：支持本地/网络/搜索图片插入
+- 超链接：支持 HTTP/HTTPS/MAIL/FTP 链接插入
+- 布局：支持多种布局切换
+- 主题：支持多种主题切换
+- 数据导入导出：支持多种格式的导入，多种格式（包括图片）的导出
+- 缩略图：支持缩略图查看/导航
 
-KityMinder 基于 SVG 技术实现，支持绝大多数的 HTML5 浏览器，包括：
+## 开发使用
+根目录下的 `index.html` 为开发环境，`dist` 目录下的 `index.html` 使用打包好的代码，适用于线上环境。
 
-1. Chrome
-2. Firefox
-3. Safari
-4. Internet Explorer 10 或以上
+1. 安装 [nodejs](http://nodejs.org) 和 [npm](https://docs.npmjs.com/getting-started/installing-node)
+2. 初始化：切到 kityminder-editor 根目录下运行 `npm run init`
+3. 在 kityminder-editor 根目录下运行 `grunt dev` 即可启动项目
+4. 你可以基于根目录的 `index.html` 开发，或者查看 `dist` 目录下用于生产环境的 `index.html`，Enjoy it!
 
-## 使用说明
+另外，kityminder-editor 还提供了 bower 包，方便开发者直接使用。你可以在需要用到 kityminder-editor 的工程目录下
+运行 `bower install kityminder-editor`，接着手动引入 kityminder-editor 所依赖的 css 和 js 文件，具体文件见
+`dist` 目录下的 `index.html`，推荐使用 npm 包 [wireDep](https://www.npmjs.com/package/wiredep) 自动进行，
+可参考根目录下 `Gruntfile.js`。
 
-kityminder-core 依赖于 [kity](https://github.com/fex-team/kity)，开发中用到 seajs 进行异步加载。
-例子中 dev.html 使用 seajs 进行包加载，example.html 使用同步加载的方式。
-使用步骤如下：
+## 构建
+运行 `grunt build`，完成后 `dist` 目录里就是可用运行的 kityminder-editor, 双击 `index.html` 即可打开运行示例
 
-1. 安装 [bower](http://bower.io/#install-bower)
-2. 切换到 kityminder-core 目录下，运行：
+## 初始化配置
+用户可以根据需要，配置 `kityminder-editor`, 具体使用方法如下：
+```
+angular.module('kityminderDemo', ['kityminderEditor'])
+    .config(function (configProvider) {
+        configProvider.set('imageUpload', 'path/to/image/upload/handler');
+    });
 
-```bash
-bower install
 ```
 
-## 开发说明
+## 数据导入导出
+由于 kityminder-editor 是基于 kityminder-core 搭建的，而 kityminder-core 内置了五种常见
+格式的导入或导出，在创建编辑器实例之后，可以使用四个接口进行数据的导入导出。
 
-1. 安装 [bower](http://bower.io/#install-bower)
-2. 安装 [npm](https://www.npmjs.com/get-npm)
+* `editor.minder.exportJson()` - 导出脑图数据为 JSON 对象
+* `editor.minder.importJson(json)` - 导入 JSON 对象为当前脑图数据
+* `editor.minder.exportData(protocol, option)` - 导出脑图数据为指定的数据格式，返回一个 Promise，其值为导出的结果
+* `editor.minder.importData(protocol, data, option)` - 导入指定格式的数据为脑图数据，返回一个 Promise，其值为转换之后的脑图 Json 数据
 
-```bash
-bower install
-npm install
-npm run dev
-```
+目前支持的数据格式包括：
+
+* `json` - JSON 字符串，支持导入和导出
+* `text` - 纯文本格式，支持导入和导出
+* `markdown` - Markdown 格式，支持导入和导出
+* `svg` - SVG 矢量格式，仅支持导出
+* `png` - PNG 位图格式，仅支持导出
+
+更多格式的支持，可以加载 [kityminder-protocol](https://github.com/fex-team/kityminder-protocol) 来扩展第三方格式支持。
+
+数据格式的具体信息，可参考 [kityminder-core-wiki 的中的说明](https://github.com/fex-team/kityminder-core/wiki)。
 
 ## 联系我们
+问题和建议反馈：
+
+[Github issues](https://github.com/fex-team/kityminder-editor/issues)
+
+邮件组：kity@baidu.com
 
-问题和建议反馈：[Github Issues](https://github.com/fex-team/kityminder-core/issues)
-邮件组: kity@baidu.com
-QQ 讨论群: 374918234
+QQ 讨论群：475962105

kityminder-editor/dist/index.html

@@ -36,7 +36,7 @@
 		}
 		div.minder-editor-container {
 			position: absolute;
-			top: 40px;
+			top: 0px;
 			bottom: 0;
 			left: 0;
 			right: 0;
@@ -44,7 +44,7 @@
 	</style>
 </head>
 <body ng-app="kityminderDemo" ng-controller="MainController">
-<h1 class="editor-title">KityMinder Editor - Powered By FEX</h1>
+<h1 class="editor-title" style=" display:none">KityMinder Editor - Powered By FEX</h1>
 <kityminder-editor on-init="initEditor(editor, minder)"></kityminder-editor>
 </body>
 

kityminder-editor/dist/kityminder.editor.js

@@ -1,6 +1,6 @@
 /*!
  * ====================================================
- * kityminder-editor - v1.0.67 - 2022-05-24
+ * kityminder-editor - v1.0.67 - 2022-05-25
  * https://github.com/fex-team/kityminder-editor
  * GitHub: https://github.com/fex-team/kityminder-editor 
  * Copyright (c) 2022 ; Licensed 

kityminder-editor/dist/kityminder.editor.min.js

@@ -1,6 +1,6 @@
 /*!
  * ====================================================
- * kityminder-editor - v1.0.67 - 2022-05-24
+ * kityminder-editor - v1.0.67 - 2022-05-25
  * https://github.com/fex-team/kityminder-editor
  * GitHub: https://github.com/fex-team/kityminder-editor 
  * Copyright (c) 2022 ; Licensed 

kityminder-editor/index.html

@@ -1,28 +1,31 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>KityMinder Editor - Powered By FEX</title>
 
-	<link href="favicon.ico" type="image/x-icon" rel="shortcut icon">
+    <link href="favicon.ico" type="image/x-icon" rel="shortcut icon">
 
-	<!-- bower:css -->
+    <!-- bower:css -->
     <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
     <link rel="stylesheet" href="bower_components/codemirror/lib/codemirror.css" />
     <link rel="stylesheet" href="bower_components/hotbox/hotbox.css" />
     <link rel="stylesheet" href="node_modules/kityminder-core/dist/kityminder.core.css" />
     <link rel="stylesheet" href="bower_components/color-picker/dist/color-picker.css" />
-	<!-- endbower -->
+    <!-- endbower -->
 
-	<link rel="stylesheet" href="dist/kityminder.editor.css">
+    <link rel="stylesheet" href="dist/kityminder.editor.css">
 
     <style>
-        html, body {
+        html,
+        body {
             margin: 0;
             padding: 0;
             height: 100%;
             overflow: hidden;
         }
+
         h1.editor-title {
             background: #393F4F;
             color: white;
@@ -36,8 +39,9 @@
         }
     </style>
 </head>
+
 <body ng-app="kityminderDemo" ng-controller="MainController">
-    <h1 class="editor-title">KityMinder Editor - Powered By FEX</h1>
+    <h1 class="editor-title" style=" display:none">KityMinder Editor - Powered By FEX</h1>
     <kityminder-editor on-init="initEditor(editor, minder)"></kityminder-editor>
 </body>
 
@@ -106,13 +110,13 @@
 
 
 <script>
-	angular.module('kityminderDemo', ['kityminderEditor'])
-			.controller('MainController', function($scope) {
-				$scope.initEditor = function(editor, minder) {
-					window.editor = editor;
-					window.minder = minder;
-				};
-			});
+    angular.module('kityminderDemo', ['kityminderEditor'])
+        .controller('MainController', function ($scope) {
+            $scope.initEditor = function (editor, minder) {
+                window.editor = editor;
+                window.minder = minder;
+            };
+        });
 
 </script>
 

kityminder-editor/package.json

@@ -1,61 +1,59 @@
 {
-  "name": "kityminder-core",
-  "title": "Kity Minder Core",
-  "description": "KityMinder Core Implement",
-  "version": "1.4.50",
-  "homepage": "https://github.com/fex-team/kityminder-core",
-  "author": {
-    "name": "Baidu FEX",
-    "url": "http://fex.baidu.com"
+  "name": "kityminder-editor",
+  "version": "1.0.67",
+  "description": "A powerful mind map editor",
+  "main": "kityminder.editor.js",
+  "scripts": {
+    "init": "npm i -g wr && npm install -g less && npm install -g bower && bower install && npm install",
+    "build": "grunt build",
+    "dev": "grunt dev",
+    "watch": "wr --exec \"lessc --source-map less/editor.less dist/kityminder.editor.css && grunt build\" less ui",
+    "postinstall": "bower install"
   },
-  "main": "dist/kityminder.core.js",
-  "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
-    "url": "https://github.com/fex-team/kityminder-core.git"
+    "url": "https://github.com/fex-team/kityminder-editor"
   },
   "keywords": [
     "kityminder",
-    "kity",
-    "minder",
-    "svg",
-    "graphic",
-    "javascript"
+    "editor",
+    "html5",
+    "js",
+    "mindmap"
   ],
-  "scripts": {
-    "dev": "grunt dev",
-    "build": "grunt build"
-  },
+  "author": "fex <fex@baidu.com>",
+  "license": "GPL-2.0",
   "bugs": {
-    "url": "https://github.com/fex-team/kityminder-core/issues"
-  },
-  "licenses": [
-    {
-      "type": "BSD-3-Clause",
-      "url": "https://github.com/fex-team/kityminder-core/blob/dev/LICENSE"
-    }
-  ],
-  "dependencies": {
-    "json-diff": "^0.5.2",
-    "kity": "^2.0.4",
-    "seajs": "^2.3.0"
+    "url": "https://github.com/fex-team/kityminder-editor/issues"
   },
+  "homepage": "https://github.com/fex-team/kityminder-editor",
   "devDependencies": {
     "cz-conventional-changelog": "^1.1.5",
     "grunt": "~0.4.1",
+    "grunt-angular-templates": "~0.5.0",
     "grunt-browser-sync": "^2.2.0",
-    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-clean": "^0.5.0",
     "grunt-contrib-concat": "~0.5.0",
-    "grunt-contrib-copy": "~0.8.2",
-    "grunt-contrib-uglify": "~0.4.0",
+    "grunt-contrib-copy": "^0.5.0",
+    "grunt-contrib-cssmin": "^0.12.0",
+    "grunt-contrib-less": "^1.0.0",
+    "grunt-contrib-uglify": "^3.3.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-module-dependence": "~0.2.1",
+    "grunt-module-dependence": "~0.2.0",
+    "grunt-ng-annotate": "^0.9.2",
     "grunt-replace": "~0.8.0",
+    "grunt-wiredep": "^2.0.0",
+    "jshint-stylish": "^1.0.0",
+    "load-grunt-tasks": "^3.1.0",
     "uglify-js": "^2.8.29"
   },
+  "dependencies": {
+    "kityminder-core": "^1.4.50"
+  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
-  }
-}
+  },
+  "__npminstall_done": false
+}