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

fex-team · Apr 18, 2014 · 2c353fa · 2c353fa
2 parents ef3b55d + e51f17a
commit 2c353fa
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 16 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="keywords" content="思维导图,脑图,minder,mind,kity">
-    <meta name="description" content="在线思维导图工具"＞
+    <meta name="description" content="在线思维导图工具">
     <script src="../lib/jquery-2.1.0.min.js" charset="utf-8"></script>
     <script src="../lib/ZeroClipboard.min.js" charset="utf-8"></script>
     <script type="text/javascript">

diff --git a/social/loading.gif b/social/loading.gif
diff --git a/social/social.css b/social/social.css
diff --git a/social/social.js b/social/social.js
@@ -91,8 +91,10 @@ $( function () {
     function start() {
         initUI();
         initFrontia();
+        if ( checkLogin() ) {
+            return;
+        }
         loadShare();
-        checkLogin();
         bindShortCuts();
         bindDraft();
         watchChanges();
@@ -260,8 +262,10 @@ $( function () {
     function checkLogin() {
         var account = baidu.frontia.getCurrentAccount();
         if ( account ) {
-            setAccount( account );
+            login();
+            return true;
         }
+        return false;
     }
 
     // 用户点击登录按钮主动登录
@@ -299,14 +303,16 @@ $( function () {
 
     // 加载用户头像
     function loadAvator() {
+        var $img = $( '<img />' ).attr( {
+            'src': '../social/loading.gif',
+            'width': 16,
+            'height': 16
+        } ).prependTo( $user_btn );
         currentAccount.getDetailInfo( {
             success: function ( user ) {
-                var $img = $( '<img />' ).attr( {
-                    'src': user.extra.tinyurl,
-                    'width': 16,
-                    'height': 16
+                $img.attr( {
+                    'src': user.extra.tinyurl
                 } );
-                $img.prependTo( $user_btn );
             }
         } );
     }

diff --git a/social/social.less b/social/social.less
@@ -27,6 +27,7 @@ button {
     font-family: Arial, "Heiti SC", "Microsoft Yahei";
     outline: none;
     display: inline-block;
+    vertical-align: middle;
     padding: 0 15px;
     height: 35px;
     font-size: 13px;
@@ -47,7 +48,7 @@ button {
     background: -o-linear-gradient(top,  #0099f2 0%,#4096ee 0%,#0076dd 100%); /* Opera 11.10+ */
     background: -ms-linear-gradient(top,  #0099f2 0%,#4096ee 0%,#0076dd 100%); /* IE10+ */
     background: linear-gradient(to bottom,  #0099f2 0%,#4096ee 0%,#0076dd 100%); /* W3C */
-
+    
     &:hover, &.hover {
         background: #009fff;
     }
@@ -99,6 +100,15 @@ button {
     }
     &.user-file {
         position: relative;
+        img {
+            border: none;
+            outline: none;
+        }
+        span.text {
+            display: inline-block;
+            height: 24px;
+            line-height: 24px;
+        }
         .dropdown;
     }
 }

diff --git a/src/adapter/saveto.js b/src/adapter/saveto.js
@@ -11,7 +11,7 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
             value: [],
             autowidthitem: [],
             enabledRecord: false,
-            enabledSelected:false
+            enabledSelected: false
         },
         $combox = null,
         comboboxWidget = null;
@@ -70,9 +70,12 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
         if ( typeof ( data ) == 'string' ) {
             var url = 'data:text/plain; utf-8,' + encodeURIComponent( data );
             if ( ie_ver() > 0 ) {
+                alert( '11111111' );
+                console.log( p.fileExtension );
                 if ( p.fileExtension === '.km' ) {
-                    console.log( "KM" );
                     doSave( 'application/x-javascript', data, me.getMinderTitle() );
+                } else( p.fileExtension === '.svg' ) {
+                    doSave( 'image/svg+xml', data, filename );
                 } else {
                     doSave( 'text/html', data, filename );
                 }
@@ -81,7 +84,6 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
             }
         } else if ( data && data.then ) {
             data.then( function ( url ) {
-                console.log( url );
                 if ( ie_ver() > 0 ) {
                     //doSave( 'application/base64', url.replace( 'image/octet-stream,', '' ), filename );
                 } else {

diff --git a/src/protocal/png.js b/src/protocal/png.js
@@ -2,6 +2,7 @@ KityMinder.registerProtocal( "png", function () {
 	function loadImage( url, callback ) {
 		var image = new Image();
 		image.onload = callback;
+		console.log( url );
 		image.src = url;
 	}
 
@@ -27,7 +28,7 @@ KityMinder.registerProtocal( "png", function () {
 				ctx = canvas.getContext( '2d' ),
 				blob, DomURL, url, img, finishCallback;
 
-
+			bgUrl = bgUrl.replace( /"/g, '' );
 			renderContainer.translate( -renderBox.x, -renderBox.y );
 
 			svgXml = km.getPaper().container.innerHTML;
@@ -73,7 +74,6 @@ KityMinder.registerProtocal( "png", function () {
 				var url = canvas.toDataURL( 'png' );
 				return url.replace( 'image/png', 'image/octet-stream' );
 			}
-
 			loadImage( url, function () {
 				var svgImage = this;
 				loadImage( bgUrl, function () {