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

CHANGELOG.md

@@ -10,12 +10,8 @@
 ###问题修复
 1. 修复当滚动鼠标滚轮时，光标不跟着移动的问题
 2. 优化了拖拽节点操作体验
+3. 优化了大文件加载体验
 
-## v1.1.3
-
-### 功能更新
-### 问题修复
-1. 优化加载速度、拖拽速度
 
 ## v1.1.2
 

dialogs/preference/preference.js

@@ -54,18 +54,15 @@
                 html = $.parseTmpl( this.tpl, lang );
             }
             this.root().html( html );
-
         },
         initEvent: function ( km, $w ) {
             //绑定默认值
             initEverything( km, $w );
-
             $w.find( '#reset_preference' ).on( 'click', function ( e ) {
                 resetPreferences( km );
                 //重置系统默认的偏好设置
                 initEverything( km, $w )
             } );
-
             $w.on( 'click', '.kmui-close', function ( e ) {
                 checkEverything( km, $w );
                 km.fire( 'preferencechange' )

import.js

 /**
  * 开发版本的文件导入
  */
-(function (){
-    var paths  = new Array(
-            'core/kityminder.js'
-            ,'core/utils.js'
-            ,'core/command.js'
-            ,'core/node.js'
-            ,'core/module.js'
-            ,'core/event.js'
-            ,'core/minder.js'
-            ,'core/minder.data.js'
-            ,'core/minder.event.js'
-            ,'core/minder.module.js'
-            ,'core/minder.command.js'
-            ,'core/minder.node.js'
-            ,'core/keymap.js'
-            ,'core/minder.lang.js'
-            ,'core/minder.defaultoptions.js'
-            ,'core/minder.preference.js'
-            ,'core/browser.js'
-            ,'module/geometry.js'
-            ,'module/history.js'
-            ,'module/icon.js'
-            ,'module/layout.js'
-            ,'module/layout.default.js'
-            ,'module/layout.bottom.js'
-            ,'core/minder.select.js'
-            ,'module/view.js'
-            ,'module/dragtree.js'
-            ,'module/dropfile.js'
-            ,'module/keyboard.js'
-            ,'module/select.js'
-            ,'module/history.js'
-            ,'module/editor.js'
-            ,'module/editor.range.js'
-            ,'module/editor.receiver.js'
-            ,'module/editor.selection.js'
-            ,'module/basestyle.js'
-            ,'module/font.js'
-            ,'module/zoom.js'
-            ,'module/nodetext.js'
-            ,'module/hyperlink.js'
-            ,'ui/jquery-ui-1.10.4.custom.min.js'
-            ,'ui/widget.js'
-            ,'ui/button.js'
-            ,'ui/toolbar.js'
-            ,'ui/menu.js'
-            ,'ui/dropmenu.js'
-            ,'ui/splitbutton.js'
-            ,'ui/colorsplitbutton.js'
-            ,'ui/popup.js'
-            ,'ui/scale.js'
-            ,'ui/colorpicker.js'
-            ,'ui/combobox.js'
-            ,'ui/buttoncombobox.js'
-            ,'ui/modal.js'
-            ,'ui/tooltip.js'
-            ,'ui/tab.js'
-            ,'ui/separator.js'
-            ,'ui/scale.js'
-            ,'adapter/utils.js'
-            ,'adapter/adapter.js'
-            ,'adapter/button.js'
-            ,'adapter/combobox.js'
-            ,'adapter/saveto.js'
-            ,'adapter/view.js'
-            ,'adapter/tooltips.js'
-            ,'adapter/layout.js'
-            ,'adapter/node.js'
-            ,'adapter/contextmenu.js'
-            ,'adapter/dialog.js'
-            ,'protocal/xmind.js'
-            ,'protocal/freemind.js'
-            ,'protocal/mindmanager.js'
-            ,'protocal/plain.js'
-            ,'protocal/json.js'
-            ,'protocal/png.js'
-            ,'protocal/svg.js'
+( function () {
+      var paths = new Array(
+            'core/kityminder.js', 'core/utils.js', 'core/command.js', 'core/node.js', 'core/module.js', 'core/event.js', 'core/minder.js', 'core/minder.data.js', 'core/minder.event.js', 'core/minder.module.js', 'core/minder.command.js', 'core/minder.node.js', 'core/keymap.js', 'core/minder.lang.js', 'core/minder.defaultoptions.js', 'core/minder.preference.js', 'core/browser.js', 'module/geometry.js', 'module/history.js', 'module/icon.js', 'module/layout.js', 'module/layout.default.js', 'module/layout.bottom.js', 'core/minder.select.js', 'module/view.js', 'module/dragtree.js', 'module/dropfile.js', 'module/keyboard.js', 'module/select.js', 'module/history.js', 'module/editor.js', 'module/editor.range.js', 'module/editor.receiver.js', 'module/editor.selection.js', 'module/basestyle.js', 'module/font.js', 'module/zoom.js', 'module/nodetext.js', 'module/hyperlink.js', 'ui/jquery-ui-1.10.4.custom.min.js', 'ui/widget.js', 'ui/button.js', 'ui/toolbar.js', 'ui/menu.js', 'ui/dropmenu.js', 'ui/splitbutton.js', 'ui/colorsplitbutton.js', 'ui/popup.js', 'ui/scale.js', 'ui/colorpicker.js', 'ui/combobox.js', 'ui/buttoncombobox.js', 'ui/modal.js', 'ui/tooltip.js', 'ui/tab.js', 'ui/separator.js', 'ui/scale.js', 'adapter/utils.js', 'adapter/adapter.js', 'adapter/button.js', 'adapter/combobox.js', 'adapter/saveto.js', 'adapter/view.js', 'adapter/tooltips.js', 'adapter/layout.js', 'adapter/node.js', 'adapter/contextmenu.js', 'adapter/dialog.js', 'protocal/xmind.js', 'protocal/freemind.js', 'protocal/mindmanager.js', 'protocal/plain.js', 'protocal/json.js', 'protocal/png.js', 'protocal/svg.js'
 
-        ),
-        baseURL = 'src/';
-    for (var i=0,pi;pi = paths[i++];) {
-        document.write('<script type="text/javascript" src="'+ baseURL + pi +'"></script>');
-    }
-})();
+      ),
+            baseURL = 'src/';
+      for ( var i = 0, pi; pi = paths[ i++ ]; ) {
+            document.write( '<script type="text/javascript" src="' + baseURL + pi + '"></script>' );
+      }
+} )();
\ No newline at end of file

kityminder.config.js

@@ -63,7 +63,7 @@
         'KITYMINDER_HOME_URL': getKMBasePath(),
         //定义工具栏
         toolbars: [
-            'hand zoom-in zoom-out | undo redo | bold italic | fontfamily fontsize forecolor | saveto | markers | node | preference | help'
+            'hand zoom-in zoom-out expand contract | undo redo | bold italic | fontfamily fontsize forecolor | saveto | markers | node | preference | help'
         ]
         //只读模式，默认是false
         //readOnly: true

src/adapter/view.js

-KM.registerToolbarUI( 'hand zoom-in zoom-out',
+KM.registerToolbarUI( 'hand zoom-in zoom-out expand contract',
     function ( name ) {
         var me = this;
         var $btn = $.kmuibutton( {
@@ -8,10 +8,10 @@ KM.registerToolbarUI( 'hand zoom-in zoom-out',
             },
             title: this.getLang( 'tooltips.' )[ name ] || ''
         } );
-        me.on('interactchange', function() {
+        me.on( 'interactchange', function () {
             var state = me.queryCommandState( name );
             $btn.kmui().disabled( state == -1 ).active( state == 1 );
-        });
+        } );
         return $btn;
     }
 );
\ No newline at end of file

themes/default/css/buttonicon.css

@@ -34,4 +34,10 @@
 }
 .kmui-btn-toolbar .kmui-btn .kmui-icon-preference {
     background: url(../images/setting.png) no-repeat 2px 2px;
+}
+.kmui-btn-toolbar .kmui-btn .kmui-icon-expand {
+    background: url(../images/expand.png) no-repeat 2px 2px;
+}
+.kmui-btn-toolbar .kmui-btn .kmui-icon-contract {
+    background: url(../images/contract.png) no-repeat 2px 2px;
 }
\ No newline at end of file