UI && copy image on web

FileReader只能在web端, 不能在nodejs端, 之前可以的啊?
2025-10-15 15:41:19 +00:00 · 2015-03-02 21:56:42 +08:00
parent 0ba0cca725
commit c2adc45da6
149 changed files with 614 additions and 113 deletions
--- a/m/Traffic_lights_light_01.png
+++ b/m/Traffic_lights_light_01.png
--- a/m/Traffic_lights_light_02.png
+++ b/m/Traffic_lights_light_02.png
--- a/m/Traffic_lights_light_11.png
+++ b/m/Traffic_lights_light_11.png
--- a/m/Traffic_lights_light_37.png
+++ b/m/Traffic_lights_light_37.png
--- a/m/Traffic_lights_light_43.png
+++ b/m/Traffic_lights_light_43.png
--- a/m/Traffic_lights_light_48.png
+++ b/m/Traffic_lights_light_48.png
--- a/m/Traffic_lights_light_49.png
+++ b/m/Traffic_lights_light_49.png
--- a/m/traffic-close-down-graphite.png
+++ b/m/traffic-close-down-graphite.png
--- a/m/traffic-close-down-graphite@2x.png
+++ b/m/traffic-close-down-graphite@2x.png
--- a/m/traffic-close-down.png
+++ b/m/traffic-close-down.png
--- a/m/traffic-close-down@2x.png
+++ b/m/traffic-close-down@2x.png
--- a/m/traffic-close-hover-graphite.png
+++ b/m/traffic-close-hover-graphite.png
--- a/m/traffic-close-hover-graphite@2x.png
+++ b/m/traffic-close-hover-graphite@2x.png
--- a/m/traffic-close-hover.png
+++ b/m/traffic-close-hover.png
--- a/m/traffic-close-hover@2x.png
+++ b/m/traffic-close-hover@2x.png
--- a/m/traffic-close.png
+++ b/m/traffic-close.png
--- a/m/traffic-close@2x.png
+++ b/m/traffic-close@2x.png
--- a/m/traffic-disabled.png
+++ b/m/traffic-disabled.png
--- a/m/traffic-disabled@2x.png
+++ b/m/traffic-disabled@2x.png
--- a/m/traffic-fullscreen-down-graphite.png
+++ b/m/traffic-fullscreen-down-graphite.png
--- a/m/traffic-fullscreen-down-graphite@2x.png
+++ b/m/traffic-fullscreen-down-graphite@2x.png
--- a/m/traffic-fullscreen-down.png
+++ b/m/traffic-fullscreen-down.png
--- a/m/traffic-fullscreen-down@2x.png
+++ b/m/traffic-fullscreen-down@2x.png
--- a/m/traffic-fullscreen-hover-graphite.png
+++ b/m/traffic-fullscreen-hover-graphite.png
--- a/m/traffic-fullscreen-hover-graphite@2x.png
+++ b/m/traffic-fullscreen-hover-graphite@2x.png
--- a/m/traffic-fullscreen-hover.png
+++ b/m/traffic-fullscreen-hover.png
--- a/m/traffic-fullscreen-hover@2x.png
+++ b/m/traffic-fullscreen-hover@2x.png
--- a/m/traffic-fullscreen.png
+++ b/m/traffic-fullscreen.png
--- a/m/traffic-fullscreen@2x.png
+++ b/m/traffic-fullscreen@2x.png
--- a/m/traffic-graphite.png
+++ b/m/traffic-graphite.png
--- a/m/traffic-graphite@2x.png
+++ b/m/traffic-graphite@2x.png
--- a/m/traffic-minimise-down-graphite.png
+++ b/m/traffic-minimise-down-graphite.png
--- a/m/traffic-minimise-down-graphite@2x.png
+++ b/m/traffic-minimise-down-graphite@2x.png
--- a/m/traffic-minimise-down.png
+++ b/m/traffic-minimise-down.png
--- a/m/traffic-minimise-down@2x.png
+++ b/m/traffic-minimise-down@2x.png
--- a/m/traffic-minimise-hover-graphite.png
+++ b/m/traffic-minimise-hover-graphite.png
--- a/m/traffic-minimise-hover-graphite@2x.png
+++ b/m/traffic-minimise-hover-graphite@2x.png
--- a/m/traffic-minimise-hover.png
+++ b/m/traffic-minimise-hover.png
--- a/m/traffic-minimise-hover@2x.png
+++ b/m/traffic-minimise-hover@2x.png
--- a/m/traffic-minimise.png
+++ b/m/traffic-minimise.png
--- a/m/traffic-minimise@2x.png
+++ b/m/traffic-minimise@2x.png
--- a/m/traffic-zoom-down-graphite.png
+++ b/m/traffic-zoom-down-graphite.png
--- a/m/traffic-zoom-down-graphite@2x.png
+++ b/m/traffic-zoom-down-graphite@2x.png
--- a/m/traffic-zoom-down.png
+++ b/m/traffic-zoom-down.png
--- a/m/traffic-zoom-down@2x.png
+++ b/m/traffic-zoom-down@2x.png
--- a/m/traffic-zoom-hover-graphite.png
+++ b/m/traffic-zoom-hover-graphite.png
--- a/m/traffic-zoom-hover-graphite@2x.png
+++ b/m/traffic-zoom-hover-graphite@2x.png
--- a/m/traffic-zoom-hover.png
+++ b/m/traffic-zoom-hover.png
--- a/m/traffic-zoom-hover@2x.png
+++ b/m/traffic-zoom-hover@2x.png
--- a/node_modules/file.js
+++ b/node_modules/file.js
@@ -29,7 +29,29 @@ type File struct {

 // 文件服务
 var File = {
-
+	// data在web端获取到, 在nodejs端会有错误!!
+	pasteImage2: function(data, callback) {
+		var me = this;
+		data = data.replace(/^data:image\/\w+;base64,/, "");
+      	// log(User.getCurUserImagesPath());
+      	var filename = Common.uuid() + '.png';
+      	var filePath = User.getCurUserImagesPath() + '/' + filename;
+      	console.log(filePath);
+      	// return;
+		fs.writeFile(filePath, new Buffer(data, 'base64'), function(err) {  
+			if(err) {
+				console.log(err);
+				return;
+			}
+			// return;
+			// 保存
+			// var relativePath = User.getCurUserImagesAppPath() + '/' + filename;
+			// 保存到数据库中
+			me._addImage(Common.objectId(), filePath, function(newImg) {
+				callback && callback(Evt.getImageLocalUrl(newImg.FileId));
+			});
+		}); 
+	},
 	// FileReaderWeb 是 web上的FileReader, 可能与nodejs这个有冲突
 	pasteImage: function(event, FileReaderWeb, callback) {
 		var me = this;
@@ -42,14 +64,16 @@ var File = {
 		    }
 		}
 		// console.log("paste images");
-		// console.log(blob);
+		console.log(blob);
 		// load image if there is a pasted image
 		if (blob) {
+			try {
 				// console.log("??");
 			    var reader = new FileReaderWeb();
 			    // console.log(">>")
-		    // console.log(reader);
+			    // return;
 			    // console.log(">>")
+			    /*
 			    reader.onloadend = function() { 
 			    	console.log(reader);
 					// 这个事件在读取结束后，无论成功或者失败都会触发
@@ -57,32 +81,50 @@ var File = {
 						console.log(reader.error); 
 					} else {
 					}
-			}
+				};
+				console.log("-----------");
 			    reader.onload = function(e) {
+			    	// alert(3);
+			    	console.log('haha');
+			    	return;
 			      	// 上传之
 			      	// log('result');
 			      	// log(reader.result);
-		      	var ret = reader.result
-		      	ret = ret.replace(/^data:image\/\w+;base64,/, "")
+			      	var ret = reader.result;
+			      	ret = ret.replace(/^data:image\/\w+;base64,/, "");
+			      	console.log(ret);
+			      	return;
 			      	// log(User.getCurUserImagesPath());
 			      	var filename = Common.uuid() + '.png';
-				fs.writeFile(User.getCurUserImagesPath() + '/' + filename, new Buffer(ret, 'base64'), function(err) {  
+			      	var filePath = User.getCurUserImagesPath() + '/' + filename;
+			      	console.log(filePath);
+			      	return;
+					fs.writeFile(filePath, new Buffer(ret, 'base64'), function(err) {  
 						if(err) {
 							log(err);
 							return;
 						}
 						// 保存
-					var relativePath = User.getCurUserImagesAppPath() + '/' + filename;
-
+						// var relativePath = User.getCurUserImagesAppPath() + '/' + filename;
 						// 保存到数据库中
-					File.addImage(relativePath, function(newImg) {
+						File.addImage(filePath, function(newImg) {
 							callback && callback(Evt.getImageLocalUrl(newImg.FileId));
 							// callback && callback('app://leanote/' + relativePath);
 						});
 					}); 
 			    };
+			    */
+			    console.log(reader);
+			    console.log("??");
+			    reader.onloadend = function() { 
+			    	console.log('end');
+				    console.log(reader.result);
+			    };
 			    reader.readAsDataURL(blob);
+			} catch(e) {
+				console.log(e);
 			}
+		};
 	},

 	// path是相对于项目路径
--- a/node_modules/server.js
+++ b/node_modules/server.js
@@ -110,6 +110,7 @@ var Server = {
 		var me = this;
 		var ext = path.extname(filePath);
 		ext = ext ? ext.slice(1) : 'unknown';
+		filePath = filePath + '';
 		fs.readFile(filePath, "binary", function (err, file) {
            if (err) {
                res.writeHead(500, {
--- a/note.html
+++ b/note.html
@@ -32,8 +32,8 @@ function log(o) {
 }
 </script>
 </head>
-<body>
-  <div id="page">
+<body class="clearfix">
+  <div id="page" class="clearfix">
    <div id="pageInner">

      <!-- header start -->
@@ -96,6 +96,13 @@ function log(o) {
        <div id="leftNotebook">
          <div id="notebook">

+            <!-- 关闭, 最小化, 最大 -->
+            <div id="winTool" class="win-tool clearfix">
+              <a class="tool-close"></a>
+              <a class="tool-min"></a>
+              <a class="tool-max"></a>
+            </div>
+
            <div class="folderNote closed" id="myShareNotebooks">
              <div class="folderHeader">
                <i class="fa fa-star-o fa-left"></i>
@@ -172,25 +179,6 @@ function log(o) {
  
          </div>
          
-          <!-- 缩小版 todo 不要展示, 点击展开即可 -->
-          <div id="notebookMin">
-            <!-- 这里隐藏, 不要 -->
-            <div target="#notebookList" title="Notebook" class="minContainer">
-              <i class="fa fa-book"></i>
-              <ul class="dropdown-menu" id="minNotebookList">
-              </ul>
-            </div>
-            <div target="#tagNav" title="My tag" class="minContainer">
-              <i class="fa fa-bookmark"></i>
-              <ul class="dropdown-menu" id="minTagNav">
-              </ul>
-            </div>
-            <div id="minShareNotebooks">
-              <div class="minContainer" target="#friendContainer0" title="Share">
-                <i class="fa fa-user"></i>
-              </div>
-            </div>
-          </div>
          
          <!-- 
          底下
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
    // "width":  400, // 1100,
    // "height": 300 // 600
    "width":  1100,
-    "height": 600
-    // "transparent": true
+    "height": 600,
+    "transparent": false
  }
 }

--- a/public/css/editor/editor.css
+++ b/public/css/editor/editor.css
@@ -1,4 +1,5 @@
 html {
+  /*
  margin-top: 3px;
  padding: 3px;
  border: 1px solid #ebeff2;
@@ -6,6 +7,7 @@ html {
  -webkit-border-radius: 5px;
  border-width: 1px;
  box-shadow: none;
+  */
 }
 * {
  font-family: 'Open Sans', 'Helvetica Neue', Arial, 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
--- a/public/css/icon/Traffic_lights_light_01.png
+++ b/public/css/icon/Traffic_lights_light_01.png
--- a/public/css/icon/Traffic_lights_light_02.png
+++ b/public/css/icon/Traffic_lights_light_02.png
--- a/public/css/icon/Traffic_lights_light_11.png
+++ b/public/css/icon/Traffic_lights_light_11.png
--- a/public/css/icon/Traffic_lights_light_37.png
+++ b/public/css/icon/Traffic_lights_light_37.png
--- a/public/css/icon/Traffic_lights_light_43.png
+++ b/public/css/icon/Traffic_lights_light_43.png
--- a/public/css/icon/Traffic_lights_light_48.png
+++ b/public/css/icon/Traffic_lights_light_48.png
--- a/public/css/icon/Traffic_lights_light_49.png
+++ b/public/css/icon/Traffic_lights_light_49.png
--- a/public/css/icon/traffic-close-down-graphite.png
+++ b/public/css/icon/traffic-close-down-graphite.png
--- a/public/css/icon/traffic-close-down-graphite@2x.png
+++ b/public/css/icon/traffic-close-down-graphite@2x.png
--- a/public/css/icon/traffic-close-down.png
+++ b/public/css/icon/traffic-close-down.png
--- a/public/css/icon/traffic-close-down@2x.png
+++ b/public/css/icon/traffic-close-down@2x.png
--- a/public/css/icon/traffic-close-hover-graphite.png
+++ b/public/css/icon/traffic-close-hover-graphite.png
--- a/public/css/icon/traffic-close-hover-graphite@2x.png
+++ b/public/css/icon/traffic-close-hover-graphite@2x.png
--- a/public/css/icon/traffic-close-hover.png
+++ b/public/css/icon/traffic-close-hover.png
--- a/public/css/icon/traffic-close-hover@2x.png
+++ b/public/css/icon/traffic-close-hover@2x.png
--- a/public/css/icon/traffic-close.png
+++ b/public/css/icon/traffic-close.png
--- a/public/css/icon/traffic-close@2x.png
+++ b/public/css/icon/traffic-close@2x.png
--- a/public/css/icon/traffic-disabled.png
+++ b/public/css/icon/traffic-disabled.png
--- a/public/css/icon/traffic-disabled@2x.png
+++ b/public/css/icon/traffic-disabled@2x.png
--- a/public/css/icon/traffic-fullscreen-down-graphite.png
+++ b/public/css/icon/traffic-fullscreen-down-graphite.png
--- a/public/css/icon/traffic-fullscreen-down-graphite@2x.png
+++ b/public/css/icon/traffic-fullscreen-down-graphite@2x.png
--- a/public/css/icon/traffic-fullscreen-down.png
+++ b/public/css/icon/traffic-fullscreen-down.png
--- a/public/css/icon/traffic-fullscreen-down@2x.png
+++ b/public/css/icon/traffic-fullscreen-down@2x.png
--- a/public/css/icon/traffic-fullscreen-hover-graphite.png
+++ b/public/css/icon/traffic-fullscreen-hover-graphite.png
--- a/public/css/icon/traffic-fullscreen-hover-graphite@2x.png
+++ b/public/css/icon/traffic-fullscreen-hover-graphite@2x.png
--- a/public/css/icon/traffic-fullscreen-hover.png
+++ b/public/css/icon/traffic-fullscreen-hover.png
--- a/public/css/icon/traffic-fullscreen-hover@2x.png
+++ b/public/css/icon/traffic-fullscreen-hover@2x.png
--- a/public/css/icon/traffic-fullscreen.png
+++ b/public/css/icon/traffic-fullscreen.png
--- a/public/css/icon/traffic-fullscreen@2x.png
+++ b/public/css/icon/traffic-fullscreen@2x.png
--- a/public/css/icon/traffic-graphite.png
+++ b/public/css/icon/traffic-graphite.png
--- a/public/css/icon/traffic-graphite@2x.png
+++ b/public/css/icon/traffic-graphite@2x.png
--- a/public/css/icon/traffic-minimise-down-graphite.png
+++ b/public/css/icon/traffic-minimise-down-graphite.png
--- a/public/css/icon/traffic-minimise-down-graphite@2x.png
+++ b/public/css/icon/traffic-minimise-down-graphite@2x.png
--- a/public/css/icon/traffic-minimise-down.png
+++ b/public/css/icon/traffic-minimise-down.png
--- a/public/css/icon/traffic-minimise-down@2x.png
+++ b/public/css/icon/traffic-minimise-down@2x.png
--- a/public/css/icon/traffic-minimise-hover-graphite.png
+++ b/public/css/icon/traffic-minimise-hover-graphite.png
--- a/public/css/icon/traffic-minimise-hover-graphite@2x.png
+++ b/public/css/icon/traffic-minimise-hover-graphite@2x.png
--- a/public/css/icon/traffic-minimise-hover.png
+++ b/public/css/icon/traffic-minimise-hover.png
--- a/public/css/icon/traffic-minimise-hover@2x.png
+++ b/public/css/icon/traffic-minimise-hover@2x.png
--- a/public/css/icon/traffic-minimise.png
+++ b/public/css/icon/traffic-minimise.png
--- a/public/css/icon/traffic-minimise@2x.png
+++ b/public/css/icon/traffic-minimise@2x.png
--- a/public/css/icon/traffic-zoom-down-graphite.png
+++ b/public/css/icon/traffic-zoom-down-graphite.png
--- a/public/css/icon/traffic-zoom-down-graphite@2x.png
+++ b/public/css/icon/traffic-zoom-down-graphite@2x.png
--- a/public/css/icon/traffic-zoom-down.png
+++ b/public/css/icon/traffic-zoom-down.png
--- a/public/css/icon/traffic-zoom-down@2x.png
+++ b/public/css/icon/traffic-zoom-down@2x.png
--- a/public/css/icon/traffic-zoom-hover-graphite.png
+++ b/public/css/icon/traffic-zoom-hover-graphite.png
--- a/Show More
+++ b/Show More