diff --git a/main/inc/lib/fckeditor/editor/plugins/dragresizetable/fckplugin.js b/main/inc/lib/fckeditor/editor/plugins/dragresizetable/fckplugin.js index 87061ff644..1c5c94ba5c 100755 --- a/main/inc/lib/fckeditor/editor/plugins/dragresizetable/fckplugin.js +++ b/main/inc/lib/fckeditor/editor/plugins/dragresizetable/fckplugin.js @@ -149,7 +149,7 @@ var width = FCKDragTableHandler._GetCellWidth( table, cell ) ; var colSpan = isNaN( cell.colSpan) ? 1 : cell.colSpan ; if ( colArray.length <= j ) - colArray.push( { width : width / colSpan, colSpan : colSpan } ) ; + colArray.push( { 'width' : width / colSpan, 'colSpan' : colSpan } ) ; else { var guessItem = colArray[j] ; diff --git a/main/inc/lib/fckeditor/editor/plugins/dragresizetable/fckplugin_compressed.js b/main/inc/lib/fckeditor/editor/plugins/dragresizetable/fckplugin_compressed.js index 0ee12cd9e9..c4d25a65dc 100644 --- a/main/inc/lib/fckeditor/editor/plugins/dragresizetable/fckplugin_compressed.js +++ b/main/inc/lib/fckeditor/editor/plugins/dragresizetable/fckplugin_compressed.js @@ -1 +1 @@ -var FCKDragTableHandler={"_DragState":0,"_LeftCell":null,"_RightCell":null,"_MouseMoveMode":0,"_ResizeBar":null,"_OriginalX":null,"_MinimumX":null,"_MaximumX":null,"_LastX":null,"_TableMap":null,"_doc":document,"_IsInsideNode":function(w,A,B){var C=FCKTools.GetWindowPosition(w,A);var D=C.x;var E=C.y;var F=parseInt(D,10)+parseInt(A.offsetWidth,10);var G=parseInt(E,10)+parseInt(A.offsetHeight,10);if (B.x>=D&&B.x<=F&&B.y>=E&&B.y<=G) return true;return false;},"_GetBorderCells":function(w,A,B,C){var D=[];for (var i=0;i0&&E>0&&F>3) return null;return { "leftCell":H,"rightCell":I };},"_GetResizeBarPosition":function(){var A=FCKTools.GetElementAscensor(this._RightCell,"tr");return FCKTableHandler._GetCellIndexSpan(this._TableMap,A.rowIndex,this._RightCell);},"_ResizeBarMouseDownListener":function(A){if (FCKDragTableHandler._LeftCell) FCKDragTableHandler._MouseMoveMode=1;if (FCKBrowserInfo.IsIE) FCKDragTableHandler._ResizeBar.filters.item("DXImageTransform.Microsoft.Alpha").opacity=50;else FCKDragTableHandler._ResizeBar.style.opacity=0.5;FCKDragTableHandler._OriginalX=A.clientX;var B=FCKDragTableHandler._GetResizeBarPosition();var C=FCKDragTableHandler._GetIframeOffset();var D=FCKTools.GetElementAscensor(FCKDragTableHandler._LeftCell,"table");var E=null;var F=null;for (var r=0;rE) E=I.x+K;if (F==null||J.x+H.clientWidth-LH){I.width=G/H;I.colSpan=H;}}}};colIndex=FCKDragTableHandler._GetResizeBarPosition();colIndex--;D[colIndex].width+=B;D[colIndex+1].width-=B;for (var r=0;r=0;i--) L[i].parentNode.removeChild(L[i]);var M=[];for (var i=0;i=0&&I<=0) K=true;else if (I>0&&J<=3) K=true;else if (J<0&&I>=-2) K=true;if (K){this._ShowResizeBar(A.EditorWindow,FCKTools.GetElementAscensor(this._LeftCell,"table"),{ "x":D,"y":E });return;}};var L=C.tagName.toLowerCase();if (L!="table"&&L!="td"&&L!="th"){if (this._LeftCell) this._LeftCell=this._RightCell=this._TableMap=null;this._HideResizeBar();return;};C=FCKTools.GetElementAscensor(C,"table");var M=FCKTableHandler._CreateTableMap(C);var N=this._GetBorderCells(A.EditorWindow,C,M,{ "x":D,"y":E });if (N==null){if (this._LeftCell) this._LeftCell=this._RightCell=this._TableMap=null;this._HideResizeBar();}else{this._LeftCell=N["leftCell"];this._RightCell=N["rightCell"];this._TableMap=M;this._ShowResizeBar(A.EditorWindow,FCKTools.GetElementAscensor(this._LeftCell,"table"),{ "x":D,"y":E });}},"_MouseDragHandler":function(A,B){var C={ "x":B.clientX,"y":B.clientY };var D=B.srcElement||B.target;if (FCKTools.GetElementDocument(D)==A.EditorDocument){var E=this._GetIframeOffset();C.x+=E.x;C.y+=E.y;};if (C.x>=this._MaximumX-5) C.x=this._MaximumX-5;if (C.x<=this._MinimumX+5) C.x=this._MinimumX+5;var F=C.x+FCKTools.GetScrollPosition(window).X;this._ResizeBar.style.left=(F-this._ResizeBar.offsetWidth/2)+"px";this._LastX=C.x;},"_ShowResizeBar":function(w,A,B){if (this._ResizeBar==null){this._ResizeBar=this._doc.createElement("div");var C=this._ResizeBar;var D={ 'position':'absolute','cursor':'e-resize' };if (FCKBrowserInfo.IsIE) D.filter="progid:DXImageTransform.Microsoft.Alpha(opacity=10,enabled=true)";else D.opacity=0.10;FCKDomTools.SetElementStyles(C,D);this._avoidStyles(C);C.setAttribute('_fcktemp',true);this._doc.body.appendChild(C);FCKTools.AddEventListener(C,"mousemove",this._ResizeBarMouseMoveListener);FCKTools.AddEventListener(C,"mousedown",this._ResizeBarMouseDownListener);FCKTools.AddEventListener(document,"mouseup",this._ResizeBarMouseUpListener);FCKTools.AddEventListener(FCK.EditorDocument,"mouseup",this._ResizeBarMouseUpListener);var E=this._doc.createElement("img");E.setAttribute('_fcktemp',true);E.border=0;E.src=FCKConfig.BasePath+"images/spacer.gif";E.style.position="absolute";C.appendChild(E);var F=function(R){if (R.preventDefault) R.preventDefault();else R.returnValue=false;};FCKTools.AddEventListener(E,"dragstart",F);FCKTools.AddEventListener(E,"selectstart",F);};var C=this._ResizeBar;var H=this._GetIframeOffset();var I=this._GetTablePosition(w,A);var J=A.offsetHeight;var K=H.y+I.y;if (I.y<0){J+=I.y;K-=I.y;};var L=parseInt(A.border,10);if (isNaN(L)) L=0;var M=parseInt(A.cellSpacing,10);if (isNaN(M)) M=0;var N=Math.max(L+100,M+100);var D={'top':K+'px','height':J+'px','width':N+'px','left':(H.x+B.x+FCKTools.GetScrollPosition(w).X-N/2)+'px'};if (FCKBrowserInfo.IsIE) C.filters.item("DXImageTransform.Microsoft.Alpha").opacity=10;else D.opacity=0.1;FCKDomTools.SetElementStyles(C,D);var E=C.getElementsByTagName("img")[0];FCKDomTools.SetElementStyles(E,{width:C.offsetWidth+'px',height:J+'px'});N=Math.max(L,M,3);var Q=null;if (C.getElementsByTagName("div").length<1){Q=this._doc.createElement("div");this._avoidStyles(Q);Q.setAttribute('_fcktemp',true);C.appendChild(Q);}else Q=C.getElementsByTagName("div")[0];FCKDomTools.SetElementStyles(Q,{position:'absolute',backgroundColor:'blue',width:N+'px',height:J+'px',left:'50px',top:'0px'});},"_HideResizeBar":function(){if (this._ResizeBar) FCKDomTools.SetElementStyles(this._ResizeBar,{top:'-100000px',left:'-100000px'});},"_GetIframeOffset":function (){return FCKTools.GetDocumentPosition(window,FCK.EditingArea.IFrame);},"_GetTablePosition":function (w,A){return FCKTools.GetWindowPosition(w,A);},"_avoidStyles":function(A){FCKDomTools.SetElementStyles(A,{padding:'0',backgroundImage:'none',border:'0'});},"Reset":function(){FCKDragTableHandler._LeftCell=FCKDragTableHandler._RightCell=FCKDragTableHandler._TableMap=null;}};FCK.Events.AttachEvent("OnMouseMove",FCKDragTableHandler.MouseMoveListener);FCK.Events.AttachEvent("OnAfterSetHTML",FCKDragTableHandler.Reset); +var FCKDragTableHandler={"_DragState":0,"_LeftCell":null,"_RightCell":null,"_MouseMoveMode":0,"_ResizeBar":null,"_OriginalX":null,"_MinimumX":null,"_MaximumX":null,"_LastX":null,"_TableMap":null,"_doc":document,"_IsInsideNode":function(w,A,B){var C=FCKTools.GetWindowPosition(w,A);var D=C.x;var E=C.y;var F=parseInt(D,10)+parseInt(A.offsetWidth,10);var G=parseInt(E,10)+parseInt(A.offsetHeight,10);if (B.x>=D&&B.x<=F&&B.y>=E&&B.y<=G) return true;return false;},"_GetBorderCells":function(w,A,B,C){var D=[];for (var i=0;i0&&E>0&&F>3) return null;return { "leftCell":H,"rightCell":I };},"_GetResizeBarPosition":function(){var A=FCKTools.GetElementAscensor(this._RightCell,"tr");return FCKTableHandler._GetCellIndexSpan(this._TableMap,A.rowIndex,this._RightCell);},"_ResizeBarMouseDownListener":function(A){if (FCKDragTableHandler._LeftCell) FCKDragTableHandler._MouseMoveMode=1;if (FCKBrowserInfo.IsIE) FCKDragTableHandler._ResizeBar.filters.item("DXImageTransform.Microsoft.Alpha").opacity=50;else FCKDragTableHandler._ResizeBar.style.opacity=0.5;FCKDragTableHandler._OriginalX=A.clientX;var B=FCKDragTableHandler._GetResizeBarPosition();var C=FCKDragTableHandler._GetIframeOffset();var D=FCKTools.GetElementAscensor(FCKDragTableHandler._LeftCell,"table");var E=null;var F=null;for (var r=0;rE) E=I.x+K;if (F==null||J.x+H.clientWidth-LH){I.width=G/H;I.colSpan=H;}}}};colIndex=FCKDragTableHandler._GetResizeBarPosition();colIndex--;D[colIndex].width+=B;D[colIndex+1].width-=B;for (var r=0;r=0;i--) L[i].parentNode.removeChild(L[i]);var M=[];for (var i=0;i=0&&I<=0) K=true;else if (I>0&&J<=3) K=true;else if (J<0&&I>=-2) K=true;if (K){this._ShowResizeBar(A.EditorWindow,FCKTools.GetElementAscensor(this._LeftCell,"table"),{ "x":D,"y":E });return;}};var L=C.tagName.toLowerCase();if (L!="table"&&L!="td"&&L!="th"){if (this._LeftCell) this._LeftCell=this._RightCell=this._TableMap=null;this._HideResizeBar();return;};C=FCKTools.GetElementAscensor(C,"table");var M=FCKTableHandler._CreateTableMap(C);var N=this._GetBorderCells(A.EditorWindow,C,M,{ "x":D,"y":E });if (N==null){if (this._LeftCell) this._LeftCell=this._RightCell=this._TableMap=null;this._HideResizeBar();}else{this._LeftCell=N["leftCell"];this._RightCell=N["rightCell"];this._TableMap=M;this._ShowResizeBar(A.EditorWindow,FCKTools.GetElementAscensor(this._LeftCell,"table"),{ "x":D,"y":E });}},"_MouseDragHandler":function(A,B){var C={ "x":B.clientX,"y":B.clientY };var D=B.srcElement||B.target;if (FCKTools.GetElementDocument(D)==A.EditorDocument){var E=this._GetIframeOffset();C.x+=E.x;C.y+=E.y;};if (C.x>=this._MaximumX-5) C.x=this._MaximumX-5;if (C.x<=this._MinimumX+5) C.x=this._MinimumX+5;var F=C.x+FCKTools.GetScrollPosition(window).X;this._ResizeBar.style.left=(F-this._ResizeBar.offsetWidth/2)+"px";this._LastX=C.x;},"_ShowResizeBar":function(w,A,B){if (this._ResizeBar==null){this._ResizeBar=this._doc.createElement("div");var C=this._ResizeBar;var D={ 'position':'absolute','cursor':'e-resize' };if (FCKBrowserInfo.IsIE) D.filter="progid:DXImageTransform.Microsoft.Alpha(opacity=10,enabled=true)";else D.opacity=0.10;FCKDomTools.SetElementStyles(C,D);this._avoidStyles(C);C.setAttribute('_fcktemp',true);this._doc.body.appendChild(C);FCKTools.AddEventListener(C,"mousemove",this._ResizeBarMouseMoveListener);FCKTools.AddEventListener(C,"mousedown",this._ResizeBarMouseDownListener);FCKTools.AddEventListener(document,"mouseup",this._ResizeBarMouseUpListener);FCKTools.AddEventListener(FCK.EditorDocument,"mouseup",this._ResizeBarMouseUpListener);var E=this._doc.createElement("img");E.setAttribute('_fcktemp',true);E.border=0;E.src=FCKConfig.BasePath+"images/spacer.gif";E.style.position="absolute";C.appendChild(E);var F=function(R){if (R.preventDefault) R.preventDefault();else R.returnValue=false;};FCKTools.AddEventListener(E,"dragstart",F);FCKTools.AddEventListener(E,"selectstart",F);};var C=this._ResizeBar;var H=this._GetIframeOffset();var I=this._GetTablePosition(w,A);var J=A.offsetHeight;var K=H.y+I.y;if (I.y<0){J+=I.y;K-=I.y;};var L=parseInt(A.border,10);if (isNaN(L)) L=0;var M=parseInt(A.cellSpacing,10);if (isNaN(M)) M=0;var N=Math.max(L+100,M+100);var D={'top':K+'px','height':J+'px','width':N+'px','left':(H.x+B.x+FCKTools.GetScrollPosition(w).X-N/2)+'px'};if (FCKBrowserInfo.IsIE) C.filters.item("DXImageTransform.Microsoft.Alpha").opacity=10;else D.opacity=0.1;FCKDomTools.SetElementStyles(C,D);var E=C.getElementsByTagName("img")[0];FCKDomTools.SetElementStyles(E,{width:C.offsetWidth+'px',height:J+'px'});N=Math.max(L,M,3);var Q=null;if (C.getElementsByTagName("div").length<1){Q=this._doc.createElement("div");this._avoidStyles(Q);Q.setAttribute('_fcktemp',true);C.appendChild(Q);}else Q=C.getElementsByTagName("div")[0];FCKDomTools.SetElementStyles(Q,{position:'absolute',backgroundColor:'blue',width:N+'px',height:J+'px',left:'50px',top:'0px'});},"_HideResizeBar":function(){if (this._ResizeBar) FCKDomTools.SetElementStyles(this._ResizeBar,{top:'-100000px',left:'-100000px'});},"_GetIframeOffset":function (){return FCKTools.GetDocumentPosition(window,FCK.EditingArea.IFrame);},"_GetTablePosition":function (w,A){return FCKTools.GetWindowPosition(w,A);},"_avoidStyles":function(A){FCKDomTools.SetElementStyles(A,{padding:'0',backgroundImage:'none',border:'0'});},"Reset":function(){FCKDragTableHandler._LeftCell=FCKDragTableHandler._RightCell=FCKDragTableHandler._TableMap=null;}};FCK.Events.AttachEvent("OnMouseMove",FCKDragTableHandler.MouseMoveListener);FCK.Events.AttachEvent("OnAfterSetHTML",FCKDragTableHandler.Reset);