Author: sshyrkov
Date: Wed Aug 22 12:26:14 2007
New Revision: 18221
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18221&repname=
=3Djahia
Log:
Add try-catch clause (IE problems)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jahia=
.js
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/jahia.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/jahia.js&rev=3D18221&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jahia=
.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jahia=
.js Wed Aug 22 12:26:14 2007
@@ -14,16 +14,16 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */// NK 14.05.2001 Close global engine popup when opening a new on=
e!
-// NK 14.05.2001 Within a same site, append each window name
with t=
he session id
-// to resolve session conflict
between different sites !
-// NK 22.05.2001 If a popup is already opened ( check if its
name i=
s equal with the one to open),
-// give it the focus instead of
close and reopen it.
-// NK 30.01.2002 yO ! another subtil bug found.
-// Added closeEngineWin(), this
function should be set on the "onUnlo=
ad" and "onClose()" event
-// of any page from which engine
popup can be launched.
-// This ensure that when the page
is closed or unloaded,any engine po=
pup that is left open is closed !!!!
-// Whitout that, more than one
engine can be left open and this means=
-> possible engine session conflict !!!!
+ */// NK 14.05.2001 Close global engine popup when opening a new o=
ne!
+// NK 14.05.2001 Within a same site, append each window name with t=
he session id
+// to resolve session conflict between different site=
s !
+// NK 22.05.2001 If a popup is already opened ( check if its name i=
s equal with the one to open),
+// give it the focus instead of close and reopen it.
+// NK 30.01.2002 yO ! another subtil bug found.
+// Added closeEngineWin(), this function should be se=
t on the "onUnload" and "onClose()" event
+// of any page from which engine popup can be launche=
d.
+// This ensure that when the page is closed or unload=
ed,any engine popup that is left open is closed !!!!
+// Whitout that, more than one engine can be left ope=
n and this means -> possible engine session conflict !!!!
// MC 30.08.2005 Removed matrix param
//
// $Id$
@@ -65,7 +65,7 @@
}
}
} catch (ex) {
- // suppress exception
+ // suppress exception
} =
} else {
myEngineWin =3D window.open(url, name, params);
@@ -101,7 +101,7 @@
}
}
} catch (ex) {
- // suppress exception
+ // suppress exception
} =
} else {
myEngineWin =3D window.open(url, name, params);
@@ -135,13 +135,14 @@
myEngineWin =3D null;
}
} catch (ex) {
- // suppress exception
+ // suppress exception
} =
}
}
=
function closeEngineWinAllPopups() {
document.body.style.cursor =3D "default";
+ try {
if (myEngineWin !=3D null) {
if (myEngineWin.closed) { // need to test it first...
if (myEngineWin.myWin && !myEngineWin.myWin.closed) {
@@ -162,6 +163,7 @@
myEngineWin =3D null;
}
}
+ } catch (e) {}
}
=
// Open "Work in progress window"
@@ -494,17 +496,17 @@
=
/**
* Create zimbra shell
- * @param className [string]* CSS class name
- * @param docBodyScrollable [boolean]* if true, then the
document body is=
set to be scrollable
- * @param confirmExitMethod [function]* method which is called
when the u=
ser attempts to navigate away from
- *
the application or close the browser window. If this method r=
eturn a string that
- *
is displayed as part of the alert that is presented to the us=
er. If this method
- *
returns null, then no alert is popped up this parameter may b=
e null
- * @param userShell [Element]* an HTML element
that will be reparented=
into an absolutely
- *
postioned container in this shell. This is useful in the situ=
ation where you have an HTML
- *
template and want to use this in context of Dwt.
- * @param useCurtain [boolean]* if true, a
curtain overlay is created t=
o be used between hidden and viewable elements
- *
using z-index. See Dwt.js for various layering constants
+ * @param className [string]* CSS class name
+ * @param docBodyScrollable [boolean]* if true, then the document bod=
y is set to be scrollable
+ * @param confirmExitMethod [function]* method which is called when th=
e user attempts to navigate away from
+ * the application or close the b=
rowser window. If this method return a string that
+ * is displayed as part of the al=
ert that is presented to the user. If this method
+ * returns null, then no alert is=
popped up this parameter may be null
+ * @param userShell [Element]* an HTML element that will =
be reparented into an absolutely
+ * postioned container in this sh=
ell. This is useful in the situation where you have an HTML
+ * template and want to use this =
in context of Dwt.
+ * @param useCurtain [boolean]* if true, a curtain overlay=
is created to be used between hidden and viewable elements
+ * using z-index. See Dwt.js for =
various layering constants
* @param debug, if true will use the debug level by looking for a query s=
tring parameter named 'debug'.
* @param backgroundColor, used to override the one defined in CSS, should=
be the same as <body>
*/
@@ -705,8 +707,9 @@
the removeChild method, or by setting the innerHTML property.
*/
function purge(d) {
- if (!d) return;
+ if (!d) return;
//alert ("purge: " + d.attributes + ", " + d);
+ try {
var a =3D d.attributes, i, l, n;
if (a) {
l =3D a.length;
@@ -724,6 +727,7 @@
purge(d.childNodes[i]);
}
}
+ } catch (e) {}
a =3D null;
n =3D null;
d =3D null;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
