Merge branch 'dev' of https://github.com/fex-team/kityminder into dev

index.html

@@ -75,6 +75,18 @@
             localStorage.lastKMVersion = KM.version;
         }
     });
+
+    km.on('unziperror', function(ev){
+        alert('unziperror');
+    });
+
+    km.on('parseerror', function(ev){
+        alert('parseerror');
+    });
+
+    km.on('unknownprotocal', function(ev){
+        alert('unknownprotocal');
+    });
 </script>
 
 <!--Baidu Tongji Code-->

src/core/minder.data.js

@@ -89,6 +89,7 @@ kity.extendClass(Minder, {
         }
 
         if (!protocal) {
+            this.fire('unknownprotocal');
             throw new Error('Unsupported protocal: ' + protocalName);
         }
 
@@ -104,7 +105,7 @@ kity.extendClass(Minder, {
 
         json = params.json || (params.json = protocal.decode(local));
 
-        if (typeof json === 'object' && 'then' in json) {
+        if (typeof json === 'object' && 'then' in json){
             var self = this;
             json.then(local, function(data) {
                 self._doImport(data, params);
@@ -116,28 +117,32 @@ kity.extendClass(Minder, {
     },
 
     _doImport: function(json, params) {
-        this._fire(new MinderEvent('preimport', params, false));
+        try{
+            this._fire(new MinderEvent('preimport', params, false));
 
-        // 删除当前所有节点
-        while (this._root.getChildren().length) {
-            this.removeNode(this._root.getChildren()[0]);
-        }
+            // 删除当前所有节点
+            while (this._root.getChildren().length) {
+                this.removeNode(this._root.getChildren()[0]);
+            }
 
-        importNode(this._root, json, this);
-        this._root.preTraverse(function(node) {
-            node.render();
-        });
-        this._root.layout();
+            importNode(this._root, json, this);
+            this._root.preTraverse(function(node) {
+                node.render();
+            });
+            this._root.layout();
 
-        this.fire('beforeimport', params);
-        this.fire('import', params);
+            this.fire('beforeimport', params);
+            this.fire('import', params);
 
-        this._firePharse({
-            type: 'contentchange'
-        });
-        this._firePharse({
-            type: 'interactchange'
-        });
+            this._firePharse({
+                type: 'contentchange'
+            });
+            this._firePharse({
+                type: 'interactchange'
+            });
+        }catch(e){
+            this.fire('rendererror');
+        }
     }
 
 });
\ No newline at end of file

src/protocal/freemind.js

@@ -73,15 +73,18 @@ KityMinder.registerProtocal( 'freemind', function () {
     }
 
     return {
-        fileDescription: 'xmind格式文件',
-        fileExtension: '.xmind',
+        fileDescription: 'freemind格式文件',
+        fileExtension: '.mm',
 
         decode: function ( local ) {
-            var json = xml2km( local );
-
-            return json;
+            try{
+                return xml2km( local );
+            }catch(e){
+                km.fire('parseerror');
+                return undefined;
+            }
         },
-        // recognize: recognize,
+        // recognize: null,
         recognizePriority: -1
     };
     

src/protocal/mindmanager.js

@@ -75,7 +75,7 @@ KityMinder.registerProtocal( 'mindmanager', function () {
     }
 
     function onerror(){
-        alert('文件过程解压出错，请检查该文件是否损坏');
+        km.fire('unziperror');
     }
 
     function getEntries( file, onend ) {
@@ -99,12 +99,16 @@ KityMinder.registerProtocal( 'mindmanager', function () {
                             if ( entry.filename == 'Document.xml' ) {
                                 hasMainDoc = true;
                                 entry.getData( new zip.TextWriter(), function ( text ) {
-                                    var km = xml2km( $.parseXML( text ) );
-                                    callback && callback( km );
+                                    try{
+                                        var km = xml2km( $.parseXML( text ) );
+                                        callback && callback( km );
+                                    }catch(e){
+                                        km.fire('parseerror');
+                                    }
                                 } );
                             }
                         } );
-                        !hasMainDoc && alert('找不到文件主文档，请检查文件是否是合法mindmanager格式文件');
+                        !hasMainDoc && km.fire('parseerror');
                     } );
                 }
             };

src/protocal/xmind.js

@@ -81,7 +81,7 @@ KityMinder.registerProtocal( 'xmind', function () {
     }
 
     function onerror(){
-        alert('文件过程解压出错，请检查该文件是否损坏');
+        km.fire('unziperror');
     }
 
     function getEntries(file, onend) {
@@ -105,13 +105,17 @@ KityMinder.registerProtocal( 'xmind', function () {
                             if(entry.filename == 'content.xml'){
                                 hasMainDoc = true;
                                 entry.getData(new zip.TextWriter(), function(text) {
-                                    var km = xml2km($.parseXML(text));
-                                    callback && callback( km );
+                                    try{
+                                        var km = xml2km($.parseXML(text));
+                                        callback && callback( km );
+                                    }catch(e){
+                                        km.fire('parseerror');
+                                    }                                    
                                 });
                             }
                         });
 
-                        !hasMainDoc && alert('找不到文件主文档，请检查文件是否是合法xmind格式文件');
+                        !hasMainDoc && km.fire('parseerror');
                     });
                 }
             };