Skip to content

确保 textarea 和编辑器宽度相等 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akai wants to merge 5 commits into
base: master
Choose a base branch
from
Open

确保 textarea 和编辑器宽度相等 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea993c6
用 api 提取视频链接
akai Oct 20, 2015
4283a0e
comments imagescale, popup, formula, scale
akai Oct 22, 2015
a10eee2
insert video
akai Oct 22, 2015
c000d1a
_href.indexOf('://')
akai Jan 12, 2016
64d8115
限制上传的图片显示大小
akai Jan 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions _src/adapter/adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,7 @@
$.eduiseparator && btns.push($.eduiseparator());
}else{
var ui = _cacheUI[name];
if(name=="fullscreen"){
ui&&btns.unshift(ui);
}else{
ui && btns.push(ui);
}
ui && btns.push(ui);
}

});
Expand Down
2 changes: 1 addition & 1 deletion _src/adapter/dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
UM.registerUI('link image video map formula',function(name){
UM.registerUI('link image video',function(name){

var me = this, currentRange, $dialog,
opt = {
Expand Down
130 changes: 65 additions & 65 deletions _src/adapter/imagescale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
UM.registerUI('imagescale',function () {
var me = this,
$imagescale;
// UM.registerUI('imagescale',function () {
// var me = this,
// $imagescale;

me.setOpt('imageScaleEnabled', true);
// me.setOpt('imageScaleEnabled', true);

if (browser.webkit && me.getOpt('imageScaleEnabled')) {
// if (browser.webkit && me.getOpt('imageScaleEnabled')) {

me.addListener('click', function (type, e) {
var range = me.selection.getRange(),
img = range.getClosedNode(),
target = e.target;
// me.addListener('click', function (type, e) {
// var range = me.selection.getRange(),
// img = range.getClosedNode(),
// target = e.target;

/* 点击第一个图片的后面,八个角不消失 fix:3652 */
if (img && img.tagName == 'IMG' && target == img) {
// /* 点击第一个图片的后面,八个角不消失 fix:3652 */
// if (img && img.tagName == 'IMG' && target == img) {

if (!$imagescale) {
$imagescale = $.eduiscale({'$wrap':me.$container}).css('zIndex', me.options.zIndex);
me.$container.append($imagescale);
// if (!$imagescale) {
// $imagescale = $.eduiscale({'$wrap':me.$container}).css('zIndex', me.options.zIndex);
// me.$container.append($imagescale);

var _keyDownHandler = function () {
$imagescale.edui().hide();
}, _mouseDownHandler = function (e) {
var ele = e.target || e.srcElement;
if (ele && ele.className.indexOf('edui-scale') == -1) {
_keyDownHandler(e);
}
}, timer;
// var _keyDownHandler = function () {
// $imagescale.edui().hide();
// }, _mouseDownHandler = function (e) {
// var ele = e.target || e.srcElement;
// if (ele && ele.className.indexOf('edui-scale') == -1) {
// _keyDownHandler(e);
// }
// }, timer;

$imagescale.edui()
.on('aftershow', function () {
$(document).bind('keydown', _keyDownHandler);
$(document).bind('mousedown', _mouseDownHandler);
me.selection.getNative().removeAllRanges();
})
.on('afterhide', function () {
$(document).unbind('keydown', _keyDownHandler);
$(document).unbind('mousedown', _mouseDownHandler);
var target = $imagescale.edui().getScaleTarget();
if (target.parentNode) {
me.selection.getRange().selectNode(target).select();
}
})
.on('mousedown', function (e) {
me.selection.getNative().removeAllRanges();
var ele = e.target || e.srcElement;
if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
timer = setTimeout(function() {
$imagescale.edui().hide();
}, 200);
}
})
.on('mouseup', function (e) {
var ele = e.target || e.srcElement;
if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
clearTimeout(timer);
}
});
}
$imagescale.edui().show($(img));
// $imagescale.edui()
// .on('aftershow', function () {
// $(document).bind('keydown', _keyDownHandler);
// $(document).bind('mousedown', _mouseDownHandler);
// me.selection.getNative().removeAllRanges();
// })
// .on('afterhide', function () {
// $(document).unbind('keydown', _keyDownHandler);
// $(document).unbind('mousedown', _mouseDownHandler);
// var target = $imagescale.edui().getScaleTarget();
// if (target.parentNode) {
// me.selection.getRange().selectNode(target).select();
// }
// })
// .on('mousedown', function (e) {
// me.selection.getNative().removeAllRanges();
// var ele = e.target || e.srcElement;
// if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
// timer = setTimeout(function() {
// $imagescale.edui().hide();
// }, 200);
// }
// })
// .on('mouseup', function (e) {
// var ele = e.target || e.srcElement;
// if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
// clearTimeout(timer);
// }
// });
// }
// $imagescale.edui().show($(img));

} else {
if ($imagescale && $imagescale.css('display') != 'none') $imagescale.edui().hide();
// } else {
// if ($imagescale && $imagescale.css('display') != 'none') $imagescale.edui().hide();

}
});
// }
// });

me.addListener('click', function (type, e) {
if (e.target.tagName == 'IMG') {
var range = new dom.Range(me.document, me.body);
range.selectNode(e.target).select();
}
});
// me.addListener('click', function (type, e) {
// if (e.target.tagName == 'IMG') {
// var range = new dom.Range(me.document, me.body);
// range.selectNode(e.target).select();
// }
// });

}
});
// }
// });
88 changes: 44 additions & 44 deletions _src/adapter/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
UM.registerUI( 'emotion formula', function( name ){
var me = this,
url = me.options.UMEDITOR_HOME_URL + 'dialogs/' +name+ '/'+name+'.js';
// UM.registerUI( 'emotion formula', function( name ){
// var me = this,
// url = me.options.UMEDITOR_HOME_URL + 'dialogs/' +name+ '/'+name+'.js';

var $btn = $.eduibutton({
icon: name,
title: this.getLang('labelMap')[name] || ''
});
// var $btn = $.eduibutton({
// icon: name,
// title: this.getLang('labelMap')[name] || ''
// });

//加载模版数据
utils.loadFile(document,{
src: url,
tag: "script",
type: "text/javascript",
defer: "defer"
},function(){
var opt = {
url : url
};
//调整数据
var data = UM.getWidgetData(name);
// //加载模版数据
// utils.loadFile(document,{
// src: url,
// tag: "script",
// type: "text/javascript",
// defer: "defer"
// },function(){
// var opt = {
// url : url
// };
// //调整数据
// var data = UM.getWidgetData(name);

data.width && (opt.width = data.width);
data.height && (opt.height = data.height);
// data.width && (opt.width = data.width);
// data.height && (opt.height = data.height);

$.eduipopup(opt).css('zIndex',me.options.zIndex + 1)
.addClass('edui-popup-' + name)
.edui()
.on('beforeshow',function(){
var $root = this.root();
if(!$root.parent().length){
me.$container.find('.edui-dialog-container').append($root);
}
UM.setWidgetBody(name,$root,me);
UM.setTopEditor(me);
}).attachTo($btn,{
offsetTop:-5,
offsetLeft:10,
caretLeft:11,
caretTop:-8
});
me.addListener('selectionchange', function () {
var state = this.queryCommandState(name);
$btn.edui().disabled(state == -1).active(state == 1);
});
});
return $btn;
// $.eduipopup(opt).css('zIndex',me.options.zIndex + 1)
// .addClass('edui-popup-' + name)
// .edui()
// .on('beforeshow',function(){
// var $root = this.root();
// if(!$root.parent().length){
// me.$container.find('.edui-dialog-container').append($root);
// }
// UM.setWidgetBody(name,$root,me);
// UM.setTopEditor(me);
// }).attachTo($btn,{
// offsetTop:-5,
// offsetLeft:10,
// caretLeft:11,
// caretTop:-8
// });
// me.addListener('selectionchange', function () {
// var state = this.queryCommandState(name);
// $btn.edui().disabled(state == -1).active(state == 1);
// });
// });
// return $btn;

} );
// } );
Loading