diff --git a/README.md b/README.md
index ec29c95b..5a51dbfe 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,12 @@ ThinkCMF是一款基于PHP+MYSQL开发的中文内容管理框架。ThinkCMF提
文档:http://www.thinkcmf.com/document
## UPDATE
+### X2.2.2
+* 优化chrome 上传文件时,打开文件选择框慢
+* 修复后台文件添加编辑相册图片移除浏览器不兼容问题
+* 修复文件上传在遨游下不能上传文件问题
+* 修复后台登录错误时提示无样式
+
### X2.2.1
[Core]
* 优化前后台表单验证
diff --git a/admin/themes/simplebootx/Asset/plupload.html b/admin/themes/simplebootx/Asset/plupload.html
index fa93618e..e9424dc7 100644
--- a/admin/themes/simplebootx/Asset/plupload.html
+++ b/admin/themes/simplebootx/Asset/plupload.html
@@ -114,9 +114,11 @@
+
最多上传1个附件,
@@ -144,12 +146,12 @@
Wind.use('plupload',function(){
var uploader = new plupload.Uploader({
- runtimes : 'html5,flash,silverlight,html4',
+ runtimes : 'flash,html5,silverlight,html4',
browse_button : 'select-files', // you can pass an id...
- container: document.getElementById('files-container'), // ... or DOM Element itself
+ container: document.getElementById('container'), // ... or DOM Element itself
url : "{:U('asset/asset/plupload')}",
- flash_swf_url : '../js/Moxie.swf',
- silverlight_xap_url : '../js/Moxie.xap',
+ flash_swf_url : '__PUBLIC__/js/plupload/Moxie.swf',
+ silverlight_xap_url : '__PUBLIC__/js/plupload/Moxie.xap',
filters : {
max_file_size : '{$upload_max_filesize_mb}mb'/* ,
mime_types: [{$mime_type}] */
@@ -188,6 +190,7 @@
if(data.status==1){
if(!multi) {
$('#select-files').css('visibility','hidden');
+ $('#container').css('visibility','hidden');
}
var $file=$('#'+file.id);
$file.addClass('uploaded')
diff --git a/application/Asset/Controller/UeditorController.class.php b/application/Asset/Controller/UeditorController.class.php
index b508bc1a..48db2cac 100644
--- a/application/Asset/Controller/UeditorController.class.php
+++ b/application/Asset/Controller/UeditorController.class.php
@@ -53,7 +53,7 @@ public function imageManager(){
// 百度编辑器文件上传
public function upload(){
error_reporting(E_ERROR);
- header("Content-Type: text/html; charset=utf-8");
+ header("Content-Type: application/json; charset=utf-8");
$action = $_GET['action'];
diff --git a/application/Common/Common/function.php b/application/Common/Common/function.php
index 28685e85..57cf5f8c 100644
--- a/application/Common/Common/function.php
+++ b/application/Common/Common/function.php
@@ -599,7 +599,7 @@ function sp_verifycode_img($imgparam='length=4&font_size=20&width=238&height=50&
*/
-function sp_get_menu($id="main",$effected_id="mainmenu",$filetpl="\$label",$foldertpl="\$label",$ul_class="" ,$li_class="" ,$style="filetree",$showlevel=6,$dropdown='hasChild'){
+function sp_get_menu($id="main",$menu_root_ul_id="mainmenu",$filetpl="\$label",$foldertpl="\$label",$ul_class="" ,$li_class="" ,$menu_root_ul_class="filetree",$showlevel=6,$dropdown='hasChild'){
$navs=F("site_nav_".$id);
if(empty($navs)){
$navs=_sp_get_menu_datas($id);
@@ -608,7 +608,7 @@ function sp_get_menu($id="main",$effected_id="mainmenu",$filetpl="'}},a.inherits(c,b)}(),function(){var a=baidu.editor.utils,b=baidu.editor.dom.domUtils,c=baidu.editor.ui.UIBase,d=baidu.editor.ui.uiUtils,e=baidu.editor.ui.Mask=function(a){this.initOptions(a),this.initUIBase()};e.prototype={getHtmlTpl:function(){return'
'},postRender:function(){var a=this;b.on(window,"resize",function(){setTimeout(function(){a.isHidden()||a._fill()})})},show:function(a){this._fill(),this.getDom().style.display="",this.getDom().style.zIndex=a},hide:function(){this.getDom().style.display="none",this.getDom().style.zIndex=""},isHidden:function(){return"none"==this.getDom().style.display},_onMouseDown:function(){return!1},_onClick:function(a,b){this.fireEvent("click",a,b)},_fill:function(){var a=this.getDom(),b=d.getViewportRect();a.style.width=b.width+"px",a.style.height=b.height+"px"}},a.inherits(e,c)}(),function(){function a(a,b){for(var c=0;c
"},getContentHtmlTpl:function(){return this.content?"string"==typeof this.content?this.content:this.content.renderHtml():""},_UIBase_postRender:e.prototype.postRender,postRender:function(){if(this.content instanceof e&&this.content.postRender(),this.captureWheel&&!this.captured){this.captured=!0;var a=(document.documentElement.clientHeight||document.body.clientHeight)-80,b=this.getDom().offsetHeight,f=c.getClientRect(this.combox.getDom()).top,g=this.getDom("content"),h=this.getDom("body").getElementsByTagName("iframe"),i=this;for(h.length&&(h=h[0]);f+b>a;)b-=30;g.style.height=b+"px",h&&(h.style.height=b+"px"),window.XMLHttpRequest?d.on(g,"onmousewheel"in document.body?"mousewheel":"DOMMouseScroll",function(a){a.preventDefault?a.preventDefault():a.returnValue=!1,a.wheelDelta?g.scrollTop-=a.wheelDelta/120*60:g.scrollTop-=a.detail/-3*60}):d.on(this.getDom(),"mousewheel",function(a){a.returnValue=!1,i.getDom("content").scrollTop-=a.wheelDelta/120*60})}this.fireEvent("postRenderAfter"),this.hide(!0),this._UIBase_postRender()},_doAutoRender:function(){!this.getDom()&&this.autoRender&&this.render()},mesureSize:function(){var a=this.getDom("content");return c.getClientRect(a)},fitSize:function(){if(this.captureWheel&&this.sized)return this.__size;this.sized=!0;var a=this.getDom("body");a.style.width="",a.style.height="";var b=this.mesureSize();if(this.captureWheel){a.style.width=-(-20-b.width)+"px";var c=parseInt(this.getDom("content").style.height,10);!window.isNaN(c)&&(b.height=c)}else a.style.width=b.width+"px";return a.style.height=b.height+"px",this.__size=b,this.captureWheel&&(this.getDom("content").style.overflow="auto"),b},showAnchor:function(a,b){this.showAnchorRect(c.getClientRect(a),b)},showAnchorRect:function(a,b,e){this._doAutoRender();var f=c.getViewportRect();this.getDom().style.visibility="hidden",this._show();var g,i,j,k,l=this.fitSize();b?(g=this.canSideLeft&&a.right+l.width>f.right&&a.left>l.width,i=this.canSideUp&&a.top+l.height>f.bottom&&a.bottom>l.height,j=g?a.left-l.width:a.right,k=i?a.bottom-l.height:a.top):(g=this.canSideLeft&&a.right+l.width>f.right&&a.left>l.width,i=this.canSideUp&&a.top+l.height>f.bottom&&a.bottom>l.height,j=g?a.right-l.width:a.left,k=i?a.top-l.height:a.bottom);var m=this.getDom();c.setViewportOffset(m,{left:j,top:k}),d.removeClasses(m,h),m.className+=" "+h[2*(i?1:0)+(g?1:0)],this.editor&&(m.style.zIndex=1*this.editor.container.style.zIndex+10,baidu.editor.ui.uiUtils.getFixedLayer().style.zIndex=m.style.zIndex-1),this.getDom().style.visibility="visible"},showAt:function(a){var b=a.left,c=a.top,d={left:b,top:c,right:b,bottom:c,height:0,width:0};this.showAnchorRect(d,!1,!0)},_show:function(){if(this._hidden){var a=this.getDom();a.style.display="",this._hidden=!1,this.fireEvent("show")}},isHidden:function(){return this._hidden},show:function(){this._doAutoRender(),this._show()},hide:function(a){!this._hidden&&this.getDom()&&(this.getDom().style.display="none",this._hidden=!0,a||this.fireEvent("hide"))},queryAutoHide:function(a){return!a||!c.contains(this.getDom(),a)}},b.inherits(f,e),d.on(document,"mousedown",function(b){var c=b.target||b.srcElement;a(b,c)}),d.on(window,"scroll",function(b,c){a(b,c)})}(),function(){function a(a,b){for(var c='