Author: sdumitriu
Date: 2008-02-12 22:06:35 +0100 (Tue, 12 Feb 2008)
New Revision: 7565
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/htmlheader.vm
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/javascript.vm
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/rico/prototype.js
Log:
XSALBATROSS-10: Accidentally reintroduced XWIKI-1749
Fixed.
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/htmlheader.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/htmlheader.vm
2008-02-12 20:46:50 UTC (rev 7564)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/htmlheader.vm
2008-02-12 21:06:35 UTC (rev 7565)
@@ -26,7 +26,7 @@
#template("javascript.vm")
</head>
#if(($context.action=="inline")||($context.action=="edit") ||
($context.action=="admin"))
- <body onunload="cancelEdit();"
+ <body
onload="prepareCancelEdit(); createColorPicker();" id="body"
class="$context.database ${context.action}body #if($showLeftPanels ==
"0")hideleft#end#if($showRightPanels == "0")hideright#end#if($hidecolumns &&
($!hidecolumns == 1))hidelefthideright#end">
#else
<body id="body" class="$context.database ${context.action}body
#if($showLeftPanels == "0")hideleft#end#if($showRightPanels ==
"0")hideright#end#if($hidecolumns && ($!hidecolumns ==
1))hidelefthideright#end">
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/javascript.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/javascript.vm
2008-02-12 20:46:50 UTC (rev 7564)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/javascript.vm
2008-02-12 21:06:35 UTC (rev 7565)
@@ -29,7 +29,8 @@
{
method: 'get',
parameters: "",
- asynchronous: true
+ asynchronous: true,
+ discardResponse: true
});
cancelCancelEditFlag = false;
}
@@ -56,13 +57,13 @@
}
function prepareCancelEdit() {
- cancelEditNextOnunload = document.onunload;
- document.onunload = cancelEdit;
- lockEdit();
+ lockEdit();
}
function cancelCancelEdit() {
cancelCancelEditFlag = false;
}
+ Event.observe(window, "unload", cancelEdit);
+ Event.observe(window, "pagehide", cancelEdit);
// ]]>
</script>
#end
Modified:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/rico/prototype.js
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/rico/prototype.js
2008-02-12 20:46:50 UTC (rev 7564)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/rico/prototype.js
2008-02-12 21:06:35 UTC (rev 7565)
@@ -641,7 +641,7 @@
this.transport.open(this.options.method, this.url,
this.options.asynchronous);
- if (this.options.asynchronous) {
+ if (this.options.asynchronous && !this.options.discardResponse) {
this.transport.onreadystatechange = this.onStateChange.bind(this);
setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
