Author: sdumitriu
Date: 2007-09-12 00:11:23 +0200 (Wed, 12 Sep 2007)
New Revision: 4871
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/fullscreenEdit.css
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/fullscreenEdit.js
Log:
XWIKI-1682: Fullscreen doesn't work on IE6 or IE7
Fixed. Applied patch from Evelina Slatineanu without changes.
Merged from [EMAIL PROTECTED]
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/fullscreenEdit.css
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/fullscreenEdit.css
2007-09-11 22:08:03 UTC (rev 4870)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/fullscreenEdit.css
2007-09-11 22:11:23 UTC (rev 4871)
@@ -14,7 +14,7 @@
}
html > body #show-dialog-btn {
right: 1px;
- top: 1px
+ top: 1px;
}
.leftmenu2 {
@@ -58,13 +58,14 @@
bottom: 0px;
overflow:hidden;
}
+
* html #fullscreen-dlg-body {
height: 100%;
top: 0px; left: 0px; right: 0px; bottom: 0px;
position: relative;
}
-#fullscreen-dlg-body-tab {
+#fullscreen-dlg-body-tab-wiki, #fullscreen-dlg-body-tab-wysiwyg {
background-color: #fff;
border:1px solid #6593cf;
position: absolute;
@@ -75,49 +76,61 @@
top: 20px;
text-align:center;
}
-* html #fullscreen-dlg-body-tab {
+
+* html #fullscreen-dlg-body-tab-wiki {
width: 99%;
- height: 85%;
+ height: 90%;
top: 0px; left: 0.5%; right: 0px; bottom: 0px;
position: relative;
}
-#fullscreen-dlg-body-tab textarea {
+* html #fullscreen-dlg-body-tab-wysiwyg {
+ width: 99%;
+ height: 88%;
+ top: 0px; left: 0.5%; right: 0px; bottom: 0px;
+ position: relative;
+}
+
+#fullscreen-dlg-body-tab-wiki textarea {
position: absolute;
- left: 3px;
- right: 3px;
+ left: 0px;
+ right: 0px;
top: 20px;
- bottom: 3px;
- width: auto !important;
- height: auto !important;
+ bottom: 0px;
+ width: 99.5% !important;
+ height: 95% !important;
}
-* html #fullscreen-dlg-body-tab textarea {
- width: 99% !important;
- height: 98% !important;
- position: static;
-}
-#fullscreen-dlg-body-tab td {
- text-align: center;
-}
-#parentswapDiv iframe {
- width: auto !important;
- height: auto !important;
+#fullscreen-dlg-body-tab-wysiwyg textarea {
position: absolute;
left: 0px;
- top: 27px;
right: 0px;
+ top: 20px;
bottom: 0px;
+ width: 99.5% !important;
+ height: 99% !important;
}
-* html #parentswapDiv iframe {
+
+* html #fullscreen-dlg-body-tab-wysiwyg textarea {
+ width: 100% !important;
+ height: 100% !important;
position: static;
- height: 99.6% !important;
+}
+
+* html #fullscreen-dlg-body-tab-wiki textarea {
width: 100% !important;
+ height: 96.5% !important;
+ position: static;
}
-#parentswapDiv table {
+#fullscreen-dlg-body-tab-wysiwyg td, #fullscreen-dlg-body-tab-wiki td {
+ text-align: center;
+}
+
+* html #parentswapDiv iframe {
+ position: static;
+ height: 99.6% !important;
width: 100% !important;
- height: 100% !important;
}
#parentswapDiv {
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/fullscreenEdit.js
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/fullscreenEdit.js
2007-09-11 22:08:03 UTC (rev 4870)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/fullscreenEdit.js
2007-09-11 22:11:23 UTC (rev 4871)
@@ -97,7 +97,7 @@
newdivbd.appendChild(newdivhd);
var newdivbdtab = document.createElement("div");
- newdivbdtab.setAttribute("id", "fullscreen-dlg-body-tab");
+ newdivbdtab.setAttribute("id", "fullscreen-dlg-body-tab-"+what);
newdivbd.appendChild(newdivbdtab);
newdiv.appendChild(newdivbd);
@@ -120,7 +120,7 @@
///////////////////////////////////////
function wysiwygFullscreen() {
var flscrDiv = document.getElementById("fullscreen-dlg");
- var flscrDivBdTab = document.getElementById("fullscreen-dlg-body-tab");
+ var flscrDivBdTab =
document.getElementById("fullscreen-dlg-body-tab-wysiwyg");
setStyle(flscrDiv, "display", "block");
var parentswapDiv = document.getElementById("parentswapDiv");
@@ -136,7 +136,6 @@
parentswapDiv.appendChild(swapDiv);
flscrDivBdTab.appendChild(parentswapDiv);
}
-
//swaps the swapDiv with xwikieditcontent
var xwikidiv = document.getElementById("xwikieditcontent");
@@ -154,13 +153,9 @@
document.body.style.overflow="hidden";
// hide the fullscreen button
document.getElementById("show-dialog-btn").style.display="none";
-
+
//put the editor back
tinyMCE.execCommand('mceAddControl', false, 'content');
- if (window.ActiveXObject) {
- document.getElementById("content").parentNode.style.display = "none";
- document.getElementById("content").parentNode.parentNode.style.display =
"none";
- }
}
@@ -190,7 +185,7 @@
document.body.style.overflow="auto";
// show the fullscreen button
document.getElementById("show-dialog-btn").style.display="block";
-
+
//put the editor back
window.setTimeout("tinyMCE.execCommand('mceAddControl', false, 'content')",
10);
}
@@ -216,7 +211,7 @@
}
parentswapDiv.appendChild(swapDiv);
- var flscrDivBdTab = document.getElementById("fullscreen-dlg-body-tab");
+ var flscrDivBdTab = document.getElementById("fullscreen-dlg-body-tab-wiki");
flscrDivBdTab.appendChild(parentswapDiv);
}
@@ -229,17 +224,9 @@
moveChildren(xwikidiv, parentswapDiv);
moveChildren(auxdiv, xwikidiv);
document.body.removeChild(auxdiv);
-
+
//hide scrollbars
document.body.style.overflow="hidden";
-
- var textarea = document.getElementById("content");
- //save textarea dimensions
- taWidth = getStyle(textarea, "width");
- taHeight = getStyle(textarea, "height");
-
- setStyle(textarea, "width", "99%");
- setStyle(textarea, "height", "94%");
}
//hide dialog and restore the textarea
@@ -261,9 +248,4 @@
//show the scrollbars
document.body.style.overflow="auto";
-
- //restore textarea size
- var textarea = document.getElementById("content");
- setStyle(textarea, "width", "");
- setStyle(textarea, "height", "");
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
