From 61a0b9caa0ef111d5d5ebe8d924d32bb6d34b4e3 Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Tue, 8 Jul 2014 22:05:33 +0800
Subject: [PATCH] leaui image

---
 app/views/Note/note-dev.html         |  3 ++-
 app/views/Note/note.html             |  3 ++-
 public/mdeditor/editor/scrollLink.js | 28 ++++------------------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/app/views/Note/note-dev.html b/app/views/Note/note-dev.html
index 0dc1fdd..f441a9b 100644
--- a/app/views/Note/note-dev.html
+++ b/app/views/Note/note-dev.html
@@ -1022,12 +1022,13 @@ initSlimScroll();
 <link rel="stylesheet" href="/js/contextmenu/css/contextmenu.css" type="text/css" />
 <script src="/js/contextmenu/jquery.contextmenu.js"></script>
 
+<!-- version 2.0 -->
 <script src="/js/require.js"></script>
 <script>
 require.config({
 	baseUrl: '/public',
     paths: {
-    	'jquery': 'js/jquery-1.9.0.min',
+    	// 'jquery': 'js/jquery-1.9.0.min',
     	'leaui_image': 'tinymce/plugins/leaui_image/public/js/for_editor',
     	'jquery.ui.widget': 'tinymce/plugins/leaui_image/public/js/jquery.ui.widget',
     	'fileupload': '/tinymce/plugins/leaui_image/public/js/jquery.fileupload'
diff --git a/app/views/Note/note.html b/app/views/Note/note.html
index a9daf6a..a2deddf 100755
--- a/app/views/Note/note.html
+++ b/app/views/Note/note.html
@@ -1022,12 +1022,13 @@ initSlimScroll();
 <link rel="stylesheet" href="/js/contextmenu/css/contextmenu.css" type="text/css" />
 <script src="/js/contextmenu/jquery.contextmenu-min.js"></script>
 
+<!-- version 2.0 -->
 <script src="/js/require.js"></script>
 <script>
 require.config({
 	baseUrl: '/public',
     paths: {
-    	'jquery': 'js/jquery-1.9.0.min',
+    	// 'jquery': 'js/jquery-1.9.0.min',
     	'leaui_image': 'tinymce/plugins/leaui_image/public/js/for_editor',
     	'jquery.ui.widget': 'tinymce/plugins/leaui_image/public/js/jquery.ui.widget',
     	'fileupload': '/tinymce/plugins/leaui_image/public/js/jquery.fileupload'
diff --git a/public/mdeditor/editor/scrollLink.js b/public/mdeditor/editor/scrollLink.js
index edf5dbb..fd40660 100644
--- a/public/mdeditor/editor/scrollLink.js
+++ b/public/mdeditor/editor/scrollLink.js
@@ -143,35 +143,15 @@ function getScrollLink() {
                 return;
             }
             
-            /*
-            var d = 100; // 时间间隔
-            var top = destScrollTop;
-            var nowTop = destElt.scrollTop();
-            log(srcScrollTop + " => " + destScrollTop)
-    		for(var i = 0; i < d; i++) {
-    			setTimeout(
-    			(function(top) {
-    				return function() {
-			            destElt.slimScroll({ scrollTo: top, onlyScrollBar: true}); 
-    				}
-    			})(nowTop + 1.0*i*(top-nowTop)/d), i);
-    		}
-    		// 最后必然执行
-    		setTimeout(function() {
-//                callback(destScrollTop);
-    		}, d+5);
-    		*/
-            
             destElt.animate({
                 scrollTop: destScrollTop
             }, 500, function() {
                 callback(destScrollTop);
             });
-            setTimeout(
-            		function() {
-			            // 仅仅是移动bar而不移动内容
-			            destElt.slimScroll({ scrollTo: destScrollTop, onlyScrollBar: true}); 
-            		}, 500);
+            setTimeout(function() {
+	            // 仅仅是移动bar而不移动内容
+	            destElt.slimScroll({ scrollTo: destScrollTop, onlyScrollBar: true}); 
+    		}, 500);
         }
         
         // Perform the animation if diff > 9px