fix navigate to invisible nodes

fex-team · May 11, 2014 · ba29cdf · ba29cdf
1 parent b8941f1
commit ba29cdf
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 34 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -7,26 +7,26 @@
     <meta name="description" content="百度脑图，便捷的脑图编辑工具。让您在线上直接创建、保存并分享你的思路。">
 
 
-    <script src="lib/jquery-2.1.0.min.js?_=1399822592172" charset="utf-8"></script>
-    <script src="lib/ZeroClipboard.min.js?_=1399822592172" charset="utf-8"></script>
+    <script src="lib/jquery-2.1.0.min.js?_=1399824598062" charset="utf-8"></script>
+    <script src="lib/ZeroClipboard.min.js?_=1399824598062" charset="utf-8"></script>
     <script type="text/javascript">
         ZeroClipboard.setDefaults( { moviePath: 'lib/ZeroClipboard.swf' } );
     </script>
 
-    <script src="lib/kitygraph.all.min.js?_=1399822592172" charset="utf-8"></script>
-    <script src="kityminder.all.min.js?_=1399822592172" charset="utf-8"></script>
-    <script src="kityminder.config.js?_=1399822592172" charset="utf-8"></script>
-    <script src="lang/zh-cn/zh-cn.js?_=1399822592172" charset="utf-8"></script>
+    <script src="lib/kitygraph.all.min.js?_=1399824598062" charset="utf-8"></script>
+    <script src="kityminder.all.min.js?_=1399824598062" charset="utf-8"></script>
+    <script src="kityminder.config.js?_=1399824598062" charset="utf-8"></script>
+    <script src="lang/zh-cn/zh-cn.js?_=1399824598062" charset="utf-8"></script>
 
-    <script src="lib/zip.js?_=1399822592172" charset="utf-8"></script>
+    <script src="lib/zip.js?_=1399824598062" charset="utf-8"></script>
     <script>
         zip.inflateJSPath = 'lib/inflate.js';
     </script>
 
-    <script src="lib/jquery.xml2json.js?_=1399822592172" charset="utf-8"></script>
-    <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1399822592172" charset="utf-8"></script>
-    <script src="social/draftmanager.js?_=1399822592172" charset="utf-8"></script>
-    <script src="social/social.js?_=1399822592172" charset="utf-8"></script>
+    <script src="lib/jquery.xml2json.js?_=1399824598062" charset="utf-8"></script>
+    <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1399824598062" charset="utf-8"></script>
+    <script src="social/draftmanager.js?_=1399824598062" charset="utf-8"></script>
+    <script src="social/social.js?_=1399824598062" charset="utf-8"></script>
     <link href="social/social.css" rel="stylesheet">
 
     <link href="themes/default/css/import.css" type="text/css" rel="stylesheet" />

diff --git a/dist/kityminder.all.js b/dist/kityminder.all.js
@@ -1,6 +1,6 @@
 /*!
  * ====================================================
- * kityminder - v1.1.3 - 2014-05-11
+ * kityminder - v1.1.3 - 2014-05-12
  * https://github.com/fex-team/kityminder
  * GitHub: https://github.com/fex-team/kityminder.git 
  * Copyright (c) 2014 f-cube @ FEX; Licensed MIT
@@ -4709,16 +4709,20 @@ KityMinder.registerModule( "KeyboardModule", function () {
             p;
         root.traverse( function ( node ) {
             p = node.getRenderContainer().getRenderBox( 'top' );
-            pointIndexes.push( {
-                left: p.x,
-                top: p.y,
-                right: p.x + p.width,
-                bottom: p.y + p.height,
-                width: p.width,
-                height: p.height,
-                node: node,
-                text: node.getText()
-            } );
+
+            // bugfix: 不应导航到收起的节点（判断其尺寸是否存在）
+            if ( p.width && p.height ) {
+                pointIndexes.push( {
+                    left: p.x,
+                    top: p.y,
+                    right: p.x + p.width,
+                    bottom: p.y + p.height,
+                    width: p.width,
+                    height: p.height,
+                    node: node,
+                    text: node.getText()
+                } );
+            }
         } );
         for ( var i = 0; i < pointIndexes.length; i++ ) {
             findClosestPointsFor( pointIndexes, i );
@@ -4754,8 +4758,10 @@ KityMinder.registerModule( "KeyboardModule", function () {
         var current, dist;
 
         for ( var i = 0; i < pointIndexes.length; i++ ) {
+
             if ( i == iFind ) continue;
             current = pointIndexes[ i ];
+
             dist = getCoefedDistance( current, find );
 
             // left check

diff --git a/dist/kityminder.all.min.js b/dist/kityminder.all.min.js
diff --git a/src/module/keyboard.js b/src/module/keyboard.js
@@ -10,16 +10,20 @@ KityMinder.registerModule( "KeyboardModule", function () {
             p;
         root.traverse( function ( node ) {
             p = node.getRenderContainer().getRenderBox( 'top' );
-            pointIndexes.push( {
-                left: p.x,
-                top: p.y,
-                right: p.x + p.width,
-                bottom: p.y + p.height,
-                width: p.width,
-                height: p.height,
-                node: node,
-                text: node.getText()
-            } );
+
+            // bugfix: 不应导航到收起的节点（判断其尺寸是否存在）
+            if ( p.width && p.height ) {
+                pointIndexes.push( {
+                    left: p.x,
+                    top: p.y,
+                    right: p.x + p.width,
+                    bottom: p.y + p.height,
+                    width: p.width,
+                    height: p.height,
+                    node: node,
+                    text: node.getText()
+                } );
+            }
         } );
         for ( var i = 0; i < pointIndexes.length; i++ ) {
             findClosestPointsFor( pointIndexes, i );
@@ -55,8 +59,10 @@ KityMinder.registerModule( "KeyboardModule", function () {
         var current, dist;
 
         for ( var i = 0; i < pointIndexes.length; i++ ) {
+
             if ( i == iFind ) continue;
             current = pointIndexes[ i ];
+
             dist = getCoefedDistance( current, find );
 
             // left check