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

CHANGELOG.md

@@ -8,8 +8,11 @@
 1. 支持本地格式文件导入
    * 支持文件拖拽和网盘文件导入
    * 格式支持 xmind/freemind/mindmanager，其他格式不支持
-   * 支持标签，包括优先级和任务进度
 2. 新增节点移动到视野中
+3.当前文件名加到 Title 中
+4.分享链接直接到粘贴板（针对已经支持的浏览器）
+5.分享到社交网络
+6.用户登出功能
 
 ### 问题修复
 

src/adapter/node.js

@@ -46,12 +46,12 @@ KM.registerToolbarUI( 'node', function ( name ) {
     //状态反射
     me.on( 'interactchange', function () {
         var state = 0;
-        utils.each(shortcutKeys,function(k){
-            state = me.queryCommandState(k);
-            if(state!=-1){
+        utils.each( shortcutKeys, function ( k ) {
+            state = me.queryCommandState( k );
+            if ( state != -1 ) {
                 return false;
             }
-        });
+        } );
         //设置按钮状态
         comboboxWidget.button().kmui().disabled( state == -1 ).active( state == 1 );
 

src/adapter/saveto.js

@@ -62,11 +62,6 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
         iframe.contentDocument.open( urltype, 'replace' );
         iframe.contentDocument.writeln( d );
         iframe.contentDocument.execCommand( 'saveas', '', filename );
-        // var winname = window.open( '', '_blank', 'height=0,width=0,toolbar=no,menubar=no,scrollbars=no,resizable=on,location=no,status=no' );
-        // winname.document.open( urltype, 'replace' );
-        // winname.document.writeln( d );
-        // winname.document.execCommand( 'saveas', '', filename );
-        // winname.close();
     };
     comboboxWidget.on( 'comboboxselect', function ( evt, res ) {
         var data = me.exportData( res.value );

src/core/minder.js

@@ -41,7 +41,7 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
         this._root.setType( "root" );
         if ( this._options.renderTo ) {
             this.renderTo( this._options.renderTo );
-            this._paper.setStyle( 'font-family', 'Arial,Microsoft YaHei,sans-serif' );
+            //this._paper.setStyle( 'font-family', 'Arial,"Microsoft YaHei",sans-serif' );
         }
     },
     _addRenderContainer: function () {

src/protocal/png.js

@@ -38,7 +38,7 @@ KityMinder.registerProtocal( "png", function () {
 			$svg.attr( {
 				width: renderBox.width,
 				height: renderBox.height,
-				style: 'font-family: Arial, "Heiti SC", "Microsoft Yahei";'
+				style: 'font-family: Arial, "Microsoft Yahei","Heiti SC";'
 			} );
 
 			// need a xml with width and height

themes/default/css/kityminder.css

@@ -42,5 +42,5 @@ html, body, #kityminder, div.kmui-editor-body {
     overflow: hidden;
 }
 svg {
-    font-family: Arial, "Heiti SC", "Microsoft Yahei";
+    font-family: Arial, "Microsoft Yahei","Heiti SC",sans-serif;
 }
\ No newline at end of file