release 1.2.1

dist/index.html

@@ -7,26 +7,26 @@
     <meta name="description" content="百度脑图，便捷的脑图编辑工具。让您在线上直接创建、保存并分享你的思路。">
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 
-    <script src="lib/jquery-2.1.0.min.js?_=1406193886421" charset="utf-8"></script>
-    <script src="lib/ZeroClipboard.min.js?_=1406193886421" charset="utf-8"></script>
+    <script src="lib/jquery-2.1.0.min.js?_=1406196567611" charset="utf-8"></script>
+    <script src="lib/ZeroClipboard.min.js?_=1406196567611" charset="utf-8"></script>
     <script type="text/javascript">
         ZeroClipboard.setDefaults( { moviePath: 'lib/ZeroClipboard.swf' } );
     </script>
 
-    <script src="lib/kity.min.js?_=1406193886421" charset="utf-8"></script>
-    <script src="kityminder.all.min.js?_=1406193886421" charset="utf-8"></script>
-    <script src="kityminder.config.js?_=1406193886421" charset="utf-8"></script>
-    <script src="lang/zh-cn/zh-cn.js?_=1406193886421" charset="utf-8"></script>
+    <script src="lib/kity.min.js?_=1406196567611" charset="utf-8"></script>
+    <script src="kityminder.all.min.js?_=1406196567611" charset="utf-8"></script>
+    <script src="kityminder.config.js?_=1406196567611" charset="utf-8"></script>
+    <script src="lang/zh-cn/zh-cn.js?_=1406196567611" charset="utf-8"></script>
     
-    <script src="lib/zip.js?_=1406193886421" charset="utf-8"></script>
+    <script src="lib/zip.js?_=1406196567611" charset="utf-8"></script>
     <script>
         zip.inflateJSPath = 'lib/inflate.js';
     </script>
 
-    <script src="lib/jquery.xml2json.js?_=1406193886421" charset="utf-8"></script>
-    <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1406193886421" charset="utf-8"></script>
-    <script src="social/draftmanager.js?_=1406193886421" charset="utf-8"></script>
-    <script src="social/social.js?_=1406193886421" charset="utf-8"></script>
+    <script src="lib/jquery.xml2json.js?_=1406196567611" charset="utf-8"></script>
+    <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1406196567611" charset="utf-8"></script>
+    <script src="social/draftmanager.js?_=1406196567611" charset="utf-8"></script>
+    <script src="social/social.js?_=1406196567611" charset="utf-8"></script>
     <link href="social/social.css" rel="stylesheet">
    
     <link href="themes/default/css/import.css" type="text/css" rel="stylesheet" />

dist/kityminder.all.js

@@ -2508,7 +2508,6 @@ kity.extendClass(Minder, {
             matrix.m.e = Math.round(matrix.m.e);
             matrix.m.f = Math.round(matrix.m.f);
 
-            if (!matrix.equals(lastMatrix)) {
 
             // 如果当前有动画，停止动画
             if (node._layoutTimeline) {
@@ -2542,18 +2541,6 @@ kity.extendClass(Minder, {
                 });
                 consume();
             }
-            } else {
-                // 可能位置没有改变，但是相关布局变量变了
-                me.fire('layoutapply', {
-                    node: node,
-                    matrix: matrix
-                });
-                me.fire('layoutfinish', {
-                    node: node,
-                    matrix: matrix
-                });
-                consume();
-            }
 
             for (var i = 0; i < node.children.length; i++) {
                 apply(node.children[i], matrix);

dist/social/social.js

@@ -740,8 +740,9 @@ $(function() {
 
         // 确定上传文件名
         if (!remotePath) {
-            filename = window.prompt('请输入文件名: ', minder.getMinderTitle());
+            filename = window.prompt('请输入文件名: ', minder.getMinderTitle().replace(/[\/\\\:\?\|\<\>\"\'\*]/g, ''));
             if (!filename) return;
+            filename = filename.replace(/[\/\\\:\?\|\<\>\"\'\*]/g, '');
             uploadPath = generateRemotePath(filename);
         } else {
             uploadPath = remotePath;

social/social.js

@@ -740,9 +740,9 @@ $(function() {
 
         // 确定上传文件名
         if (!remotePath) {
-            filename = window.prompt('请输入文件名: ', minder.getMinderTitle().replace(/[\/\\\:\?\|\<\>\*]/g, ''));
+            filename = window.prompt('请输入文件名: ', minder.getMinderTitle().replace(/[\/\\\:\?\|\<\>\"\'\*]/g, ''));
             if (!filename) return;
-            filename = filename.replace(/[\/\\\:\?\|\<\>\*]/g, '');
+            filename = filename.replace(/[\/\\\:\?\|\<\>\"\'\*]/g, '');
             uploadPath = generateRemotePath(filename);
         } else {
             uploadPath = remotePath;

src/core/layout.js

@@ -227,7 +227,6 @@ kity.extendClass(Minder, {
             matrix.m.e = Math.round(matrix.m.e);
             matrix.m.f = Math.round(matrix.m.f);
 
-            if (!matrix.equals(lastMatrix)) {
 
             // 如果当前有动画，停止动画
             if (node._layoutTimeline) {
@@ -261,18 +260,6 @@ kity.extendClass(Minder, {
                 });
                 consume();
             }
-            } else {
-                // 可能位置没有改变，但是相关布局变量变了
-                me.fire('layoutapply', {
-                    node: node,
-                    matrix: matrix
-                });
-                me.fire('layoutfinish', {
-                    node: node,
-                    matrix: matrix
-                });
-                consume();
-            }
 
             for (var i = 0; i < node.children.length; i++) {
                 apply(node.children[i], matrix);