' + txt + '';
};
diff --git a/js/lib/meditor/addon/attach.css b/js/lib/meditor/addon/attach.css
index 17c60c7..bb9adf3 100644
--- a/js/lib/meditor/addon/attach.css
+++ b/js/lib/meditor/addon/attach.css
@@ -36,22 +36,24 @@
.do-meditor-attach .cont-box .select-file {width:100%;height:35px;line-height:33px}
.do-meditor-attach .cont-box .select-file span.file {float:left;width:100px;height:35px;border:1px solid #ddd;background:#f7f7f7;color:#666;text-align:center;cursor:pointer;}
+.do-meditor-attach .cont-box .select-file span.tips {display:inline-block;padding:0 10px;line-height:35px;color:#666;}
.do-meditor-attach .cont-box .upload-box {width:100%;height:auto;min-height:190px;margin:10px 0;border:1px solid #e2e2e2;}
.do-meditor-attach .cont-box .upload-box .tr {width:100%;height:35px;line-height:35px;text-align:center;}
.do-meditor-attach .cont-box .upload-box .tr:hover {background:#fafafa}
.do-meditor-attach .cont-box .upload-box .thead {line-height:34px;border-bottom:1px solid #e2e2e2;background:#f7f7f7;}
.do-meditor-attach .cont-box .upload-box .td {float:left;}
-.do-meditor-attach .cont-box .upload-box .td.name {width:50%;}
-.do-meditor-attach .cont-box .upload-box .td.progress {width:20%;}
-.do-meditor-attach .cont-box .upload-box .td.option {width:30%;}
+.do-meditor-attach .cont-box .upload-box .td.name {width:45%;}
+.do-meditor-attach .cont-box .upload-box .td.progress {width:40%;}
+.do-meditor-attach .cont-box .upload-box .td.option {width:15%;}
.do-meditor-attach .cont-box .upload-box .td.option a {display:inline-block;padding:3px 5px;line-height:13px;border:1px solid #e2e2e2;background:#f7f7f7;color:#666;}
+.do-meditor-attach .cont-box .upload-box .td .red {color:#f30;}
.do-meditor-attach .cont-box .manager {overflow:hidden;overflow-y:auto;width:100%;height:320px;padding:10px;}
-.do-meditor-attach .cont-box .manager .item {float:left;width:22%;height:130px;margin:10px 1.5%;}
+.do-meditor-attach .cont-box .manager .item {float:left;width:22%;height:130px;margin:10px 1.5%;padding:5px;}
.do-meditor-attach .cont-box .manager .item:hover {background:#f7f7f7;}
.do-meditor-attach .cont-box .manager .thumb {display:block;width:100%;height:100px;}
-.do-meditor-attach .cont-box .manager .name {overflow:hidden;line-height:30px;text-align:center;}
+.do-meditor-attach .cont-box .manager .name {overflow:hidden;height:20px;line-height:30px;text-align:center;}
.do-meditor-attach .cont-box .manager img {width:100%;height:100%;}
.do-meditor-attach .cont-box .manager .attac-icon {display:inline-block;width:100%;height:100px;text-align:center;font:50px/100px "edicon" !important;-webkit-font-smoothing: antialiased;-webkit-text-stroke-width: 0.2px;-moz-osx-font-smoothing: grayscale;}
diff --git a/js/lib/meditor/addon/attach.js b/js/lib/meditor/addon/attach.js
index 211d110..81aa30a 100644
--- a/js/lib/meditor/addon/attach.js
+++ b/js/lib/meditor/addon/attach.js
@@ -78,6 +78,28 @@ define([
}
+ function uploadScreenshot(vm, blob){
+ var upload = new Uploader(vm.uploadUrl || ME.uploadUrl)
+ if(ME.beforeUpload){
+ ME.beforeUpload(Date.now().toString(16) + '.jpg', function(qn){
+ upload.field('file', blob)
+ .field('token', qn.token)
+ .field('key', qn.key)
+ .onEnd(function(json){
+ ME.insert(vm.$editor, '')
+ })
+ .start()
+ })
+ }else{
+ upload.field('file', blob)
+ .onEnd(function(json){
+ ME.insert(vm.$editor, '')
+ })
+ .start()
+ }
+ }
+
+
var $init = function(vm){
if(!vm.uploadUrl && !ME.uploadUrl){
console.error('使用附件上传,必须先设置uploadUrl;\n可以给vm增加uploadUrl属性,也可以通过ME.uploadUrl设置')
@@ -85,7 +107,9 @@ define([
if(!vm.manageUrl && !ME.manageUrl){
console.error('使用附件管理功能,必须先设置manageUrl;\n可以给vm增加manageUrl属性,也可以通过ME.manageUrl设置')
}
- // ME.addon.image()
+ if(!ME.maxSize){
+ ME.maxSize = 4194304
+ }
vm.$editor.addEventListener('paste', function(ev){
var txt = ev.clipboardData.getData('text/plain').trim(),
@@ -107,12 +131,45 @@ define([
}
if(blob !== null) {
- var upload = new Uploader(vm.uploadUrl || ME.uploadUrl)
-
- upload.field('image', blob)
- .onEnd(function(json){
- ME.insert(vm.$editor, '')
- }).start()
+ layer.msg('截图处理中...')
+ // 压缩截图,避免文件过大
+ var reader = new FileReader()
+ reader.onload = function(){
+ var img = document.createElement('img'),
+ canvas = document.createElement('canvas')
+
+ img.onload = function(){
+ canvas.width = img.width
+ canvas.height = img.height
+
+ var ctx = canvas.getContext('2d')
+ ctx.clearRect(0,0, canvas.width, canvas.height)
+ ctx.drawImage(this, 0, 0, canvas.width, canvas.height)
+
+
+ if(canvas.toBlob){
+ canvas.toBlob(function(obj){
+ uploadScreenshot(vm, obj)
+ }, 'image/jpeg', 0.8)
+ }else{
+ var base64 = canvas.toDataURL('image/jpeg', 0.8),
+ buf = atob(base64.split(',')[1]),
+ arrBuf = new ArrayBuffer(buf.length),
+ intArr = new Uint8Array(arrBuf),
+ obj = null;
+
+ for(var i = 0; i < buf.length; i++){
+ intArr[i] = buf.charCodeAt(i)
+ }
+ obj = new Blob([intArr], {type: 'image/jpeg'})
+ uploadScreenshot(vm, obj)
+ }
+
+
+ }
+ img.src = this.result
+ }
+ reader.readAsDataURL(blob)
}
}
ev.preventDefault()
@@ -131,7 +188,7 @@ define([
fixCont = function(){
return ''
+ '
'
+ '- '
- + '
- '
+ + '
- ' + '' + lang[openType][0] +'' + '本地上传' + '' + lang[openType][1] + '' @@ -150,12 +207,14 @@ define([ + '' + '
'
- + '
选择文件
'
+ + '选择文件(上传大小限制:单文件最大'
+ + (ME.maxSize/1048576).toFixed(2)
+ + 'MB)
'
+ '- '
+ '
- 文件名上传进度操作 ' + '
- ' + '' - + '' + + '' + '插入' + ' ' + '
- '
+ '
- ' + '' - + '' + + '' + ' ' + '
- '
+ '
- 一级标题 ' + '
- 二级标题 ' @@ -121,7 +121,7 @@ define(['lib/layer/base'], function(){ ME.insert(vm.$editor, val) layer.close(layid) }, - offset: [offset.top + 37, 'auto', 'auto', offset.left], + offset: [offset.top + 37 - document.body.scrollTop, 'auto', 'auto', offset.left - document.body.scrollLeft], content: '
- ' @@ -239,7 +239,7 @@ define(['lib/layer/base'], function(){ ME.insert(vm.$editor, val) layer.close(layid) }, - offset: [offset.top + 37, 'auto', 'auto', offset.left], + offset: [offset.top + 37 - document.body.scrollTop, 'auto', 'auto', offset.left - document.body.scrollLeft], content: '
'
+ '链接文字'
+ ''
@@ -151,7 +151,7 @@ define(['lib/layer/base'], function(){
fixed: true,
shadeClose: true,
arr: getOrderArr(36),
- offset: [offset.top + 37, 'auto', 'auto', offset.left],
+ offset: [offset.top + 37 - document.body.scrollTop, 'auto', 'auto', offset.left - document.body.scrollLeft],
content: '
- '
+ '
- '
+ '
'
+ '图片描述'
+ ''
@@ -313,7 +313,7 @@ define(['lib/layer/base'], function(){
content: '
'
+ '语言类型'
+ ''
+ ' '
+ ''
@@ -333,19 +333,14 @@ define(['lib/layer/base'], function(){
},
fullscreen: function(elem, vm){
vm.fullscreen = !vm.fullscreen
- if(vm.fullscreen){
- vm.preview = true
- vm.htmlTxt = vm.$htmlTxt
- }else{
- vm.preview = false
- }
+ vm.$onFullscreen(vm.fullscreen)
},
about: function(elem){
var offset = yua(elem).offset()
layer.open({
type: 7,
title: '关于编辑器',
- offset: [offset.top + 37],
+ offset: [offset.top + 37 - document.body.scrollTop],
content: '
'
+ '
'
+ ' __ __ _____ _ _ _\n'
diff --git a/js/lib/meditor/main.js b/js/lib/meditor/main.js
index e83f068..0aeef8e 100644
--- a/js/lib/meditor/main.js
+++ b/js/lib/meditor/main.js
@@ -21,6 +21,7 @@ define([
}
})
+ var editorVM = []
yua.ui.meditor = '0.0.1'
//存放编辑器公共静态资源
window.ME = {
@@ -28,11 +29,13 @@ define([
toolbar: { //工具栏title
pipe: '',
h1: '标题',
+ quote: '引用文本',
bold: '粗体',
italic: '斜体',
through: '删除线',
unordered: '无序列表',
ordered: '有序列表',
+ link: '超链接',
hr: '横线',
time: '插入当前时间',
face: '表情',
@@ -47,7 +50,7 @@ define([
},
addon: {}, //已有插件
//往文本框中插入内容
- insert: function(dom, val){
+ insert: function(dom, val, isSelect){
if(document.selection){
dom.focus()
var range = document.selection.createRange()
@@ -64,8 +67,7 @@ define([
+ val
+ dom.value.slice(endPos, dom.value.length);
-
- dom.selectionStart = startPos
+ dom.selectionStart = isSelect ? startPos : (startPos + val.length)
dom.selectionEnd = startPos + val.length
dom.scrollTop = scrollTop
dom.focus()
@@ -123,6 +125,33 @@ define([
}
return result
}
+ },
+ get: function(id){
+ if(id === void 0){
+ id = editorVM.length - 1
+ }
+ var vm = editorVM[id]
+ if(vm){
+ return {
+ id: vm.$id,
+ getVal: function(){
+ return vm.plainTxt.trim()
+ },
+ getHtml: function(){
+ return vm.$htmlTxt
+ },
+ setVal: function(txt){
+ vm.plainTxt = txt
+ },
+ show: function(){
+ vm.editorVisible = true
+ },
+ hide: function(){
+ vm.editorVisible = false
+ }
+ }
+ }
+ return null
}
}
//获取真实的引用路径,避免因为不同的目录结构导致加载失败的情况
@@ -274,14 +303,14 @@ define([
yua.component('meditor', {
- $template: ''
+ $template: ''
+ ''
+ ''
+ ''
+ ''
- + ''
- + '