Skip to content

Commit

Permalink
fixed: #2 百度编辑器在模态框打开不能全屏编辑的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
Wizzercn committed Oct 19, 2016
1 parent 7b412d1 commit e11ace3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
20 changes: 18 additions & 2 deletions assets/plugins/ueditor/ueditor.all.js
Original file line number Diff line number Diff line change
Expand Up @@ -8001,7 +8001,9 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
var actionName = this.getOpt(action) || action,
imageUrl = this.getOpt('imageUrl'),
serverUrl = this.getOpt('serverUrl');

if(action.indexOf("/")>-1){
return actionName;
}
if(!serverUrl && imageUrl) {
serverUrl = imageUrl.replace(/^(.*[\/]).+([\.].+)$/, '$1controller$2');
}
Expand Down Expand Up @@ -28924,9 +28926,23 @@ UE.ui = baidu.editor.ui = {};
}
if (fullscreen) {
while (container.tagName != "BODY") {
var isModal = false;
//判断该dom是否为modal
var classes = $(container).attr('class');
if (classes !== undefined) {
classes = classes.split(' ');
for (var i = 0; i < classes.length; i++) {
if (classes[i] == "modal") {
isModal = true;
}
}
}
var position = baidu.editor.dom.domUtils.getComputedStyle(container, "position");
nodeStack.push(position);
container.style.position = "static";
//如果是modal,则不设置position为static
if (!isModal) {
container.style.position = "static";
}
container = container.parentNode;
}
this._bakHtmlOverflow = document.documentElement.style.overflow;
Expand Down
6 changes: 3 additions & 3 deletions assets/plugins/ueditor/ueditor.all.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e11ace3

Please sign in to comment.