Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Dev 1.4.4 百度编辑器上传视频音频的bug #3240

Open
wants to merge 142 commits into
base: dev-1.4.3.3
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
dacc92b
修改错别字
carsonxu Jun 4, 2014
4a25b4a
Merge remote-tracking branch 'origin/dev-1.4.3' into dev-1.4.3
carsonxu Jun 4, 2014
2691799
成功替换图片后没有触发contentchange
campaign Jun 5, 2014
a7d8974
修复LIST中处理li时因缺少选择器而造成全局范围影响的问题
csbde Jun 10, 2014
16281ab
修复li{clear:both}前边没有加入选择器,可能会影响全局的css问题
campaign Jun 10, 2014
55cf0d1
1.5.0
campaign Jun 10, 2014
af08cc9
修复自动保存配置项不起作用问题
carsonxu Jun 10, 2014
0ffa364
Merge remote-tracking branch 'origin/dev-1.4.3' into dev-1.4.3
carsonxu Jun 10, 2014
858fbb0
添加空串判断
techird Jun 10, 2014
c8e786d
添加自动上传的配置项
carsonxu Jun 10, 2014
7dc5c06
Merge remote-tracking branch 'origin/dev-1.4.4' into dev-1.4.4
carsonxu Jun 10, 2014
4b0e19e
明确两个配置节
Jun 11, 2014
dd9b517
更新权限说明
Jun 11, 2014
1289555
Update
Jun 11, 2014
db4524b
Update README.md
Jun 11, 2014
b529d86
Update README.md
Jun 11, 2014
350a97d
让表格背景透明
carsonxu Jun 11, 2014
595eccf
Merge remote-tracking branch 'origin/dev-1.4.4' into dev-1.4.4
carsonxu Jun 11, 2014
cfb8978
修改自动上传插件
carsonxu Jun 11, 2014
d760421
修改自动上传插件
carsonxu Jun 11, 2014
6392f3b
修改自动上传插件
carsonxu Jun 11, 2014
b5d66c2
插入图片不提供title属性
carsonxu Jun 11, 2014
048f2cc
修复ff下拖文件变成base64的问题
carsonxu Jun 11, 2014
464bfba
fix check or create path
techird Jun 13, 2014
89fd17f
Merge remote-tracking branch 'remotes/origin/dev-1.4.4' into dev-1.5.0
campaign Jun 18, 2014
ba7c15e
[test]
yancend Jun 18, 2014
f9f6bc0
[test]
yancend Jun 18, 2014
45f0ab1
[test]迁移用例 到https://github.com/yancend/testDesign/
yancend Jun 18, 2014
0b4882c
修复ff下拖文件变成base64的问题
carsonxu Jun 18, 2014
38f55e6
Merge remote-tracking branch 'origin/dev-1.5.0' into dev-1.5.0
carsonxu Jun 18, 2014
95b3363
设置 enableAutoSave 配置项
carsonxu Jun 18, 2014
156e818
设置 enableMessageShow 配置项
carsonxu Jun 18, 2014
77f0f23
添加 beforeinsertfile 和 afterinsertfile 事件
carsonxu Jun 18, 2014
cb19659
添加 beforeinsertvideo 和 afterinsertvideo 事件
carsonxu Jun 18, 2014
23724e3
修改toolbar按钮
carsonxu Jun 18, 2014
4bd08a5
修改grunt
carsonxu Jun 20, 2014
d679feb
修改grunt
carsonxu Jun 20, 2014
ab397c6
修改config
carsonxu Jun 20, 2014
a76e96b
修改config
carsonxu Jun 23, 2014
de797fc
修改config
carsonxu Jun 23, 2014
1e509e8
修改config
carsonxu Jun 23, 2014
b336d73
修改远程抓取的代码
carsonxu Jun 24, 2014
c0597ef
修改config
carsonxu Jun 24, 2014
f00f980
修改上传
carsonxu Jun 24, 2014
a094fbd
修改上传
carsonxu Jun 24, 2014
1c3cbc6
Update addCustomizeButton.js
zhoumengkang Jun 24, 2014
60a2fc3
Merge pull request #810 from zhoumengkang/patch-1
carsonxu Jun 24, 2014
a747686
BUG修复 td包含p属性时未清理p的width和height值。会造成表格与后台编辑宽度不一致。
csbde Jun 25, 2014
9bb2650
Merge branch 'dev-1.5.0' of git://github.com/fex-team/ueditor into fe…
csbde Jun 25, 2014
dffbd6a
Update list.js
csbde Jun 25, 2014
349680d
Update list.js
csbde Jun 25, 2014
44d8c99
Update list.js
csbde Jun 25, 2014
df62256
Update list.js
csbde Jun 25, 2014
91719bb
Update list.js
csbde Jun 25, 2014
d46ed0f
Update list.js
csbde Jun 25, 2014
1694f95
合并官方的list
csbde Jun 25, 2014
014ca42
Merge branch 'dev-1.4.3' of https://github.com/csbde/ueditor into dev…
csbde Jun 25, 2014
400dd4f
合并官方的list
csbde Jun 25, 2014
e137374
插入img删除title属性
carsonxu Jun 27, 2014
932c646
插入img删除title属性
carsonxu Jun 27, 2014
acae1c6
修改popup样式
carsonxu Jun 27, 2014
9b6f7d6
产生数据中的color默认都格式化为#16进制格式
campaign Jul 1, 2014
6b918bd
产生数据中的color默认都格式化为#16进制格式
campaign Jul 1, 2014
da8a116
产生数据中的color默认都格式化为#16进制格式
campaign Jul 1, 2014
0c07f6e
产生数据中的color默认都格式化为#16进制格式
campaign Jul 1, 2014
2604edc
产生数据中的color默认都格式化为#16进制格式
campaign Jul 1, 2014
48da535
过滤掉word冗余标签
campaign Jul 3, 2014
9902363
过滤掉word冗余标签
campaign Jul 3, 2014
7328e15
Merge pull request #826 from csbde/dev-1.4.3
carsonxu Jul 6, 2014
e4d12e6
添加了mark标签在dtd中
campaign Jul 18, 2014
69f4737
扩展的UI组件需要配置toolbars参数才可显示
campaign Jul 18, 2014
df841ab
扩展的UI组件需要配置toolbars参数才可显示
campaign Jul 18, 2014
33209cc
更新
campaign Jul 18, 2014
abfd64c
优化快捷上传,清除loader的class
carsonxu Jul 19, 2014
6bb1464
修正search/replace的bug
campaign Jul 23, 2014
1cff04b
Update changelog.md
Jul 23, 2014
127f53a
添加分号
campaign Jul 23, 2014
dcd825c
Merge remote-tracking branch 'origin/dev-1.5.0' into dev-1.5.0
campaign Jul 23, 2014
a71b84d
JSP版本修复上传路径错误的bug
HanCong03 Jul 24, 2014
3d027d4
Merge remote-tracking branch 'origin/dev-1.4.4' into dev-1.5.0
carsonxu Jul 27, 2014
7ef4067
修复windows平台下的路径bug
HanCong03 Jul 28, 2014
70105d6
Fixed windows path
Jul 28, 2014
5dce726
Merge branch 'dev-1.5.0' of github.com:HanCong03/ueditor into dev-1.5.0
Jul 28, 2014
c51f5ad
支持 tel: mailto: 等链接,添加配置项 allowLinkProtocols
carsonxu Jul 28, 2014
d4c8d80
Merge remote-tracking branch 'origin/dev-1.5.0' into dev-1.5.0
carsonxu Jul 28, 2014
573639c
支持 tel: mailto: 等链接,添加配置项 allowLinkProtocols
carsonxu Jul 28, 2014
489a857
修改版本号
campaign Jul 30, 2014
8c81266
添加 zeroclipboardready 事件
carsonxu Aug 1, 2014
fc53ebd
Merge branch 'dev-1.4.4' of https://github.com/fex-team/ueditor into …
carsonxu Aug 1, 2014
49e38c7
添加图片拉伸缩放的配置项
carsonxu Aug 4, 2014
c9cf1f2
添加 zeroclipboardready 事件
carsonxu Aug 4, 2014
ea3fb7b
添加 zeroclipboardready 事件
carsonxu Aug 7, 2014
7f8da86
fix copy plugin bug
carsonxu Aug 12, 2014
756a52d
修复创建编辑器后,快速销毁编辑器后的报错
carsonxu Aug 17, 2014
57a7c33
Update README.md
netpi Aug 23, 2014
3263b93
Merge pull request #1210 from netpi/dev-1.5.0
carsonxu Aug 23, 2014
afb28bb
add ueditor for nodejs
carsonxu Aug 23, 2014
442ff41
修复创建编辑器后,快速销毁编辑器后的报错
carsonxu Aug 25, 2014
d5318a2
修复 serverparam 的 bug
carsonxu Aug 25, 2014
796aac7
修复按钮样式优先级不够大的问题
carsonxu Aug 26, 2014
264455b
修复按钮样式优先级不够大的问题
carsonxu Aug 26, 2014
7f7050f
修复在编辑区域打不开 chrome 控制台的问题
carsonxu Aug 28, 2014
76adeae
修改文档
carsonxu Sep 1, 2014
39100a1
修改测试文件
worry127722 Sep 19, 2014
ff15810
修改测试配置
worry127722 Sep 19, 2014
b41f1ce
修复paragraph命令
campaign Sep 24, 2014
759bc65
添加Content-Type判断
carsonxu Sep 30, 2014
70506f3
修复word图片上传的单位错误
carsonxu Sep 30, 2014
7e42882
去除图片搜索里面编码使用的长字符串
carsonxu Oct 20, 2014
7f490df
修正对于大小写的问题
campaign Nov 13, 2014
1f6cae4
修改版本为1.5.0
campaign Nov 13, 2014
67b0ae8
整理了代码
campaign Nov 13, 2014
311cd80
修复对嵌套的span标签设置样式时,被嵌套的标签不能正确设置上给定的样式
campaign Nov 13, 2014
0700522
更新版本
campaign Nov 13, 2014
a0c5f5a
调试测试
worry127722 Nov 18, 2014
8c8a3f1
Merge branch 'dev-1.5.0' of https://github.com/fex-team/ueditor into …
worry127722 Nov 18, 2014
07362d3
123
worry127722 Nov 18, 2014
dfcbcff
d
worry127722 Nov 19, 2014
3a72493
d
worry127722 Nov 19, 2014
c194227
dd
worry127722 Nov 19, 2014
1e3ea0c
dddd
worry127722 Nov 19, 2014
9b189e2
ddd
worry127722 Nov 19, 2014
88bf4a7
sss
worry127722 Nov 19, 2014
ef002ac
s
worry127722 Nov 19, 2014
bdb33f7
d
worry127722 Nov 19, 2014
7be7cad
d
worry127722 Nov 19, 2014
fd89776
d
worry127722 Nov 19, 2014
2998fe3
dd
worry127722 Nov 19, 2014
98e0f80
d
worry127722 Nov 19, 2014
70e685d
d
worry127722 Nov 19, 2014
39d0a32
d
worry127722 Nov 19, 2014
bbbf2c9
更新test
worry127722 Dec 3, 2014
bae2196
[test]安全修复
worry127722 Feb 9, 2015
2b9a0ae
[test]安全修复
worry127722 Feb 11, 2015
23f2712
修改说明
taofish Jan 14, 2016
3d1d644
Merge pull request #2519 from taofish/dev-1.5.0
Phinome Jan 22, 2016
a338f78
Merge pull request #2465 from fex-team/dev-1.5.0
Phinome Jan 22, 2016
83b0313
bug修复: 连续上传图片A和B,A处于上传状态(loading)时,再上传B,如果B先于A上传成功,编辑框内会出现两张B图片.
Mar 4, 2016
23457a5
Merge pull request #2632 from zoln/dev-1.4.4
Phinome Mar 9, 2016
714fa0f
修复多图上传时,图片显示顺序被打乱的问题.
Mar 15, 2016
a67244e
bug修复:删除一张不可用的图片时,图片张数和大小统计错误.
Mar 15, 2016
70505a1
Merge pull request #2659 from zoln/dev-1.4.4
Phinome Apr 6, 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
Prev Previous commit
Next Next commit
成功替换图片后没有触发contentchange
  • Loading branch information
campaign committed Jun 5, 2014

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 2691799bf784834543a1101d99c0e16cb976b1bd
3 changes: 2 additions & 1 deletion _src/plugins/autoupload.js
Original file line number Diff line number Diff line change
@@ -45,6 +45,7 @@ UE.plugin.register('autoupload', function (){
loader.setAttribute('alt', data.original || '');
loader.removeAttribute('id');
domUtils.removeClasses(loader, 'loadingclass');
me.trigger('contentchange',loader);
}
};
} else {
@@ -54,6 +55,7 @@ UE.plugin.register('autoupload', function (){
'/images/spacer.gif" title="' + (me.getLang('autoupload.loading') || '') + '" >' +
'</p>';
successHandler = function(data) {

var link = urlPrefix + data.url,
loader = me.document.getElementById(loadingId);

@@ -67,7 +69,6 @@ UE.plugin.register('autoupload', function (){

/* 插入loading的占位符 */
me.execCommand('inserthtml', loadingHtml);

/* 判断后端配置是否没有加载成功 */
if (!me.getOpt(filetype + 'ActionName')) {
errorHandler(me.getLang('autoupload.errorLoadConfig'));