Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/CocoRoboDesktop

kityminder-editor/dist/index.html

@@ -67,7 +67,7 @@
 <script src="../bower_components/codemirror/addon/mode/overlay.js"></script>
 <script src="../bower_components/codemirror/mode/gfm/gfm.js"></script>
 <script src="../bower_components/angular-ui-codemirror/ui-codemirror.js"></script>
-<script src="../bower_components/marked/lib/marked.umd.js"></script>
+<script src="../bower_components/marked/lib/marked.js"></script>
 <script src="../bower_components/kity/dist/kity.min.js"></script>
 <script src="../bower_components/hotbox/hotbox.js"></script>
 <script src="../bower_components/json-diff/json-diff.js"></script>
@@ -78,7 +78,7 @@
 <script src="kityminder.editor.min.js"></script>
 
 
-<script type="text/javascript">
+<script>
 	angular.module('kityminderDemo', ['kityminderEditor'])
 		.config(function (configProvider) {
 			configProvider.set('imageUpload', '../server/imageUpload.php');
@@ -87,9 +87,9 @@
 			$scope.initEditor = function (editor, minder) {
 				window.editor = editor;
 				window.minder = minder;
-				setTimeout(function () {
-					window.editor.minder.getRenderContainer().setTranslate([(window.editor.minder._lastClientSize.width - window.editor.minder._root._contentBox.width) / 2, 120]);
-				}, 500)
+				// setTimeout(function () {
+				// 	window.editor.minder.getRenderContainer().setTranslate([(window.editor.minder._lastClientSize.width - window.editor.minder._root._contentBox.width) / 2, 120]);
+				// }, 500)
 			};
 		});
 	document.domain = document.domain.split(".").slice(-2).join(".");