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

kity @ ef84b3d3

-Subproject commit afbb101c5b3d7518080bac3886f16043a482b7c9
+Subproject commit ef84b3d3597aad569379f1f76715ca5bd2c951d3

social/social.js

@@ -766,9 +766,10 @@ $( function () {
     }
 
     function bindDraft() {
+        draftManager = window.draftManager;
         if ( !draftManager ) {
             if ( window.DraftManager ) {
-                draftManager = new window.DraftManager( minder );
+                draftManager = window.draftManager = new window.DraftManager( minder );
             }
         }
 

src/module/dropfile.js

@@ -21,8 +21,8 @@ KityMinder.registerModule( "DropFile", function () {
 		e.stopPropagation();
 		var minder = this;
 
-		if( kity.Browser.ie && Number(kity.Browser.version) < 10 ){
-			alert('文件导入对IE浏览器仅支持10以上版本');
+		if ( kity.Browser.ie && Number( kity.Browser.version ) < 10 ) {
+			alert( '文件导入对IE浏览器仅支持10以上版本' );
 			return;
 		}
 
@@ -49,9 +49,9 @@ KityMinder.registerModule( "DropFile", function () {
 		createDraft( this );
 		social.setRemotePath( null, false );
 		this.execCommand( 'camera', this.getRoot() );
-		setTimeout(function() {
+		setTimeout( function () {
 			social.watchChanges( true );
-		}, 10);
+		}, 10 );
 		importing = false;
 	}
 
@@ -73,7 +73,7 @@ KityMinder.registerModule( "DropFile", function () {
 	}
 
 	function createDraft( minder ) {
-		draftManager = window.draftManager;
+		draftManager = window.draftManager || ( window.draftManager = new window.DraftManager( minder ) );
 		draftManager.create();
 	}
 

src/module/editor.receiver.js

@@ -241,8 +241,17 @@ Minder.Receiver = kity.createClass( 'Receiver', {
     },
     setContainerStyle: function () {
         var textShapeBox = this.getBaseOffset('screen');
-
+        var me = this;
         this.container.style.cssText = ";left:" + textShapeBox.x + 'px;top:' + ( textShapeBox.y - 5 ) + 'px;width:' + textShapeBox.width + 'px;height:' + textShapeBox.height + 'px;';
+        var paperContainer = this.km.getPaper();
+        var width = paperContainer.getWidth();
+        var height = paperContainer.getHeight();
+        var containerWidth = this.container.offsetWidth;
+        if(width < containerWidth + this.container.offsetLeft){
+            this.km.getRenderContainer().fxTranslate(width/-2, 0, 200, "ease", 0, function() {
+                me.setContainerStyle()
+            });
+        }
         return this;
     },
     getTextOffsetData: function () {
@@ -253,7 +262,7 @@ Minder.Receiver = kity.createClass( 'Receiver', {
             try {
                 var box = this.textShape.getExtentOfChar( i );
             } catch ( e ) {
-                debugger
+                console.log(e)
             }
 
             this.textData.push( {