diff --git a/m/Traffic_lights_light_01.png b/m/Traffic_lights_light_01.png new file mode 100644 index 00000000..fc6d8240 Binary files /dev/null and b/m/Traffic_lights_light_01.png differ diff --git a/m/Traffic_lights_light_02.png b/m/Traffic_lights_light_02.png new file mode 100644 index 00000000..38b2527a Binary files /dev/null and b/m/Traffic_lights_light_02.png differ diff --git a/m/Traffic_lights_light_11.png b/m/Traffic_lights_light_11.png new file mode 100644 index 00000000..df5b8d9c Binary files /dev/null and b/m/Traffic_lights_light_11.png differ diff --git a/m/Traffic_lights_light_37.png b/m/Traffic_lights_light_37.png new file mode 100644 index 00000000..a6b05a39 Binary files /dev/null and b/m/Traffic_lights_light_37.png differ diff --git a/m/Traffic_lights_light_43.png b/m/Traffic_lights_light_43.png new file mode 100644 index 00000000..c831a714 Binary files /dev/null and b/m/Traffic_lights_light_43.png differ diff --git a/m/Traffic_lights_light_48.png b/m/Traffic_lights_light_48.png new file mode 100644 index 00000000..8cd8d216 Binary files /dev/null and b/m/Traffic_lights_light_48.png differ diff --git a/m/Traffic_lights_light_49.png b/m/Traffic_lights_light_49.png new file mode 100644 index 00000000..660320e4 Binary files /dev/null and b/m/Traffic_lights_light_49.png differ diff --git a/m/traffic-close-down-graphite.png b/m/traffic-close-down-graphite.png new file mode 100644 index 00000000..78dd3a73 Binary files /dev/null and b/m/traffic-close-down-graphite.png differ diff --git a/m/traffic-close-down-graphite@2x.png b/m/traffic-close-down-graphite@2x.png new file mode 100644 index 00000000..7d34727b Binary files /dev/null and b/m/traffic-close-down-graphite@2x.png differ diff --git a/m/traffic-close-down.png b/m/traffic-close-down.png new file mode 100644 index 00000000..79d908b7 Binary files /dev/null and b/m/traffic-close-down.png differ diff --git a/m/traffic-close-down@2x.png b/m/traffic-close-down@2x.png new file mode 100644 index 00000000..06e42b9a Binary files /dev/null and b/m/traffic-close-down@2x.png differ diff --git a/m/traffic-close-hover-graphite.png b/m/traffic-close-hover-graphite.png new file mode 100644 index 00000000..dbc994fb Binary files /dev/null and b/m/traffic-close-hover-graphite.png differ diff --git a/m/traffic-close-hover-graphite@2x.png b/m/traffic-close-hover-graphite@2x.png new file mode 100644 index 00000000..aeb16fc6 Binary files /dev/null and b/m/traffic-close-hover-graphite@2x.png differ diff --git a/m/traffic-close-hover.png b/m/traffic-close-hover.png new file mode 100644 index 00000000..675e1777 Binary files /dev/null and b/m/traffic-close-hover.png differ diff --git a/m/traffic-close-hover@2x.png b/m/traffic-close-hover@2x.png new file mode 100644 index 00000000..fe28fd9b Binary files /dev/null and b/m/traffic-close-hover@2x.png differ diff --git a/m/traffic-close.png b/m/traffic-close.png new file mode 100644 index 00000000..8154a904 Binary files /dev/null and b/m/traffic-close.png differ diff --git a/m/traffic-close@2x.png b/m/traffic-close@2x.png new file mode 100644 index 00000000..124a4da8 Binary files /dev/null and b/m/traffic-close@2x.png differ diff --git a/m/traffic-disabled.png b/m/traffic-disabled.png new file mode 100644 index 00000000..f361c8c2 Binary files /dev/null and b/m/traffic-disabled.png differ diff --git a/m/traffic-disabled@2x.png b/m/traffic-disabled@2x.png new file mode 100644 index 00000000..da394963 Binary files /dev/null and b/m/traffic-disabled@2x.png differ diff --git a/m/traffic-fullscreen-down-graphite.png b/m/traffic-fullscreen-down-graphite.png new file mode 100644 index 00000000..1de6ae5b Binary files /dev/null and b/m/traffic-fullscreen-down-graphite.png differ diff --git a/m/traffic-fullscreen-down-graphite@2x.png b/m/traffic-fullscreen-down-graphite@2x.png new file mode 100644 index 00000000..65e9952d Binary files /dev/null and b/m/traffic-fullscreen-down-graphite@2x.png differ diff --git a/m/traffic-fullscreen-down.png b/m/traffic-fullscreen-down.png new file mode 100644 index 00000000..81fce2a9 Binary files /dev/null and b/m/traffic-fullscreen-down.png differ diff --git a/m/traffic-fullscreen-down@2x.png b/m/traffic-fullscreen-down@2x.png new file mode 100644 index 00000000..e896c203 Binary files /dev/null and b/m/traffic-fullscreen-down@2x.png differ diff --git a/m/traffic-fullscreen-hover-graphite.png b/m/traffic-fullscreen-hover-graphite.png new file mode 100644 index 00000000..876ed2d2 Binary files /dev/null and b/m/traffic-fullscreen-hover-graphite.png differ diff --git a/m/traffic-fullscreen-hover-graphite@2x.png b/m/traffic-fullscreen-hover-graphite@2x.png new file mode 100644 index 00000000..e0e4e346 Binary files /dev/null and b/m/traffic-fullscreen-hover-graphite@2x.png differ diff --git a/m/traffic-fullscreen-hover.png b/m/traffic-fullscreen-hover.png new file mode 100644 index 00000000..be092380 Binary files /dev/null and b/m/traffic-fullscreen-hover.png differ diff --git a/m/traffic-fullscreen-hover@2x.png b/m/traffic-fullscreen-hover@2x.png new file mode 100644 index 00000000..58397143 Binary files /dev/null and b/m/traffic-fullscreen-hover@2x.png differ diff --git a/m/traffic-fullscreen.png b/m/traffic-fullscreen.png new file mode 100644 index 00000000..f8065efa Binary files /dev/null and b/m/traffic-fullscreen.png differ diff --git a/m/traffic-fullscreen@2x.png b/m/traffic-fullscreen@2x.png new file mode 100644 index 00000000..96e7e92d Binary files /dev/null and b/m/traffic-fullscreen@2x.png differ diff --git a/m/traffic-graphite.png b/m/traffic-graphite.png new file mode 100644 index 00000000..059c6fd9 Binary files /dev/null and b/m/traffic-graphite.png differ diff --git a/m/traffic-graphite@2x.png b/m/traffic-graphite@2x.png new file mode 100644 index 00000000..c6c99996 Binary files /dev/null and b/m/traffic-graphite@2x.png differ diff --git a/m/traffic-minimise-down-graphite.png b/m/traffic-minimise-down-graphite.png new file mode 100644 index 00000000..8110dfc2 Binary files /dev/null and b/m/traffic-minimise-down-graphite.png differ diff --git a/m/traffic-minimise-down-graphite@2x.png b/m/traffic-minimise-down-graphite@2x.png new file mode 100644 index 00000000..44a0cd06 Binary files /dev/null and b/m/traffic-minimise-down-graphite@2x.png differ diff --git a/m/traffic-minimise-down.png b/m/traffic-minimise-down.png new file mode 100644 index 00000000..3b5f68f7 Binary files /dev/null and b/m/traffic-minimise-down.png differ diff --git a/m/traffic-minimise-down@2x.png b/m/traffic-minimise-down@2x.png new file mode 100644 index 00000000..1f174927 Binary files /dev/null and b/m/traffic-minimise-down@2x.png differ diff --git a/m/traffic-minimise-hover-graphite.png b/m/traffic-minimise-hover-graphite.png new file mode 100644 index 00000000..134607ee Binary files /dev/null and b/m/traffic-minimise-hover-graphite.png differ diff --git a/m/traffic-minimise-hover-graphite@2x.png b/m/traffic-minimise-hover-graphite@2x.png new file mode 100644 index 00000000..c09f05c0 Binary files /dev/null and b/m/traffic-minimise-hover-graphite@2x.png differ diff --git a/m/traffic-minimise-hover.png b/m/traffic-minimise-hover.png new file mode 100644 index 00000000..c1723fa1 Binary files /dev/null and b/m/traffic-minimise-hover.png differ diff --git a/m/traffic-minimise-hover@2x.png b/m/traffic-minimise-hover@2x.png new file mode 100644 index 00000000..59bb97bf Binary files /dev/null and b/m/traffic-minimise-hover@2x.png differ diff --git a/m/traffic-minimise.png b/m/traffic-minimise.png new file mode 100644 index 00000000..fd911ca8 Binary files /dev/null and b/m/traffic-minimise.png differ diff --git a/m/traffic-minimise@2x.png b/m/traffic-minimise@2x.png new file mode 100644 index 00000000..c685b029 Binary files /dev/null and b/m/traffic-minimise@2x.png differ diff --git a/m/traffic-zoom-down-graphite.png b/m/traffic-zoom-down-graphite.png new file mode 100644 index 00000000..714ca24e Binary files /dev/null and b/m/traffic-zoom-down-graphite.png differ diff --git a/m/traffic-zoom-down-graphite@2x.png b/m/traffic-zoom-down-graphite@2x.png new file mode 100644 index 00000000..af303f23 Binary files /dev/null and b/m/traffic-zoom-down-graphite@2x.png differ diff --git a/m/traffic-zoom-down.png b/m/traffic-zoom-down.png new file mode 100644 index 00000000..6721ccc3 Binary files /dev/null and b/m/traffic-zoom-down.png differ diff --git a/m/traffic-zoom-down@2x.png b/m/traffic-zoom-down@2x.png new file mode 100644 index 00000000..81a3b3c9 Binary files /dev/null and b/m/traffic-zoom-down@2x.png differ diff --git a/m/traffic-zoom-hover-graphite.png b/m/traffic-zoom-hover-graphite.png new file mode 100644 index 00000000..149d9723 Binary files /dev/null and b/m/traffic-zoom-hover-graphite.png differ diff --git a/m/traffic-zoom-hover-graphite@2x.png b/m/traffic-zoom-hover-graphite@2x.png new file mode 100644 index 00000000..2deeceb1 Binary files /dev/null and b/m/traffic-zoom-hover-graphite@2x.png differ diff --git a/m/traffic-zoom-hover.png b/m/traffic-zoom-hover.png new file mode 100644 index 00000000..8c803d5c Binary files /dev/null and b/m/traffic-zoom-hover.png differ diff --git a/m/traffic-zoom-hover@2x.png b/m/traffic-zoom-hover@2x.png new file mode 100644 index 00000000..7fda1b86 Binary files /dev/null and b/m/traffic-zoom-hover@2x.png differ diff --git a/node_modules/common.js b/node_modules/common.js index c7267330..54bb972f 100644 --- a/node_modules/common.js +++ b/node_modules/common.js @@ -6,7 +6,7 @@ var ObjectId = require('objectid'); // var gui = require('nw.gui'); // console.log(gui.App); -/* +/* // 开发版 process.on('uncaughtException', function (err) { // 打印出错误 diff --git a/node_modules/file.js b/node_modules/file.js index beeaf368..80678726 100644 --- 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,47 +64,67 @@ var File = { } } // console.log("paste images"); - // console.log(blob); + console.log(blob); // load image if there is a pasted image if (blob) { - // console.log("??"); - var reader = new FileReaderWeb(); - // console.log(">>") - // console.log(reader); - // console.log(">>") - reader.onloadend = function() { - console.log(reader); - // 这个事件在读取结束后，无论成功或者失败都会触发 - if (reader.error) { - console.log(reader.error); - } else { - } - } - reader.onload = function(e) { - // 上传之 - // log('result'); - // log(reader.result); - var ret = reader.result - ret = ret.replace(/^data:image\/\w+;base64,/, "") - // log(User.getCurUserImagesPath()); - var filename = Common.uuid() + '.png'; - fs.writeFile(User.getCurUserImagesPath() + '/' + filename, new Buffer(ret, 'base64'), function(err) { - if(err) { - log(err); - return; + try { + // console.log("??"); + var reader = new FileReaderWeb(); + // console.log(">>") + // return; + // console.log(">>") + /* + reader.onloadend = function() { + console.log(reader); + // 这个事件在读取结束后，无论成功或者失败都会触发 + if (reader.error) { + console.log(reader.error); + } else { } - // 保存 - var relativePath = User.getCurUserImagesAppPath() + '/' + filename; - - // 保存到数据库中 - File.addImage(relativePath, function(newImg) { - callback && callback(Evt.getImageLocalUrl(newImg.FileId)); - // callback && callback('app://leanote/' + relativePath); - }); - }); - }; - reader.readAsDataURL(blob); - } + }; + 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,/, ""); + console.log(ret); + return; + // log(User.getCurUserImagesPath()); + var filename = Common.uuid() + '.png'; + 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; + // 保存到数据库中 + 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是相对于项目路径 diff --git a/node_modules/server.js b/node_modules/server.js index 6e1c4d75..724cbe1e 100644 --- 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, { diff --git a/note.html b/note.html index 6b334817..1a40c707 100755 --- a/note.html +++ b/note.html @@ -32,8 +32,8 @@ function log(o) { } - -
+ +
@@ -96,6 +96,13 @@ function log(o) {
+ +
+ + + +
+
@@ -172,25 +179,6 @@ function log(o) {
- -
- -
- - -
-
- - -
-
-
- -
-
-