Author: jsdelfino
Date: Mon Mar 24 17:57:15 2008
New Revision: 640661
URL: http://svn.apache.org/viewvc?rev=640661&view=rev
Log:
Merged changes from trunk in SVN revisions r640656, r640658 and r640660. Fix
for TUSCANY 2131. Invoke the Javascript code initializing the HTML DOM from the
body.onload event, as with IE the DOM is not available until that event is
triggered.
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/composite.html
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/files.html
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/home.html
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/workspace.html
incubator/tuscany/branches/sca-java-1.2/samples/store/src/main/resources/uiservices/store.html
incubator/tuscany/branches/sca-java-1.2/tutorial/assets/uiservices/store.html
incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/uiservices/store-eu.html
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html?rev=640661&r1=640660&r2=640661&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/cloud.html
Mon Mar 24 17:57:15 2008
@@ -212,14 +212,17 @@
}
}
- getComposites();
+ function init() {
+ toolbar();
+ getComposites();
+ }
</script>
<link rel="stylesheet" type="text/css" href="admin.css">
</head>
-<body onload="toolbar()">
+<body onload="init()">
<div id="toolbar"></div>
<div id="cloudComposite">
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/composite.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/composite.html?rev=640661&r1=640660&r2=640661&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/composite.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/composite.html
Mon Mar 24 17:57:15 2008
@@ -122,13 +122,17 @@
getComposites();
}
- getComposites();
+ function init() {
+ toolbar();
+ getComposites();
+ }
+
</script>
<link rel="stylesheet" type="text/css" href="admin.css">
</head>
-<body onload="toolbar()">
+<body onload="init()">
<div id="toolbar"></div>
<div id="domainComposite">
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/files.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/files.html?rev=640661&r1=640660&r2=640661&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/files.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/files.html
Mon Mar 24 17:57:15 2008
@@ -64,14 +64,18 @@
function uploadFile() {
document.uploadFileForm.submit();
}
-
- getFiles();
+
+ function init() {
+ toolbar();
+ getFiles();
+ }
+
</script>
<link rel="stylesheet" type="text/css" href="admin.css">
</head>
-<body onload="toolbar()">
+<body onload="init()">
<div id="toolbar"></div>
<div id="fileServer">
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/home.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/home.html?rev=640661&r1=640660&r2=640661&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/home.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/home.html
Mon Mar 24 17:57:15 2008
@@ -24,12 +24,18 @@
<script type="text/javascript" src="utils.js"></script>
<script language="JavaScript">
+
+ function init() {
+ toolbar();
+ }
+
+
</script>
<link rel="stylesheet" type="text/css" href="admin.css">
</head>
-<body onload="toolbar()">
+<body onload="init()">
<div id="toolbar"></div>
<br>
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/workspace.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/workspace.html?rev=640661&r1=640660&r2=640661&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/workspace.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/workspace-admin/src/main/resources/workspace.html
Mon Mar 24 17:57:15 2008
@@ -114,13 +114,17 @@
getContributions();
}
- getContributions();
+ function init() {
+ toolbar();
+ getContributions();
+ }
+
</script>
<link rel="stylesheet" type="text/css" href="admin.css">
</head>
-<body onload="toolbar()">
+<body onload="init()">
<div id="toolbar"></div>
<div id="workspace">
Modified:
incubator/tuscany/branches/sca-java-1.2/samples/store/src/main/resources/uiservices/store.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/samples/store/src/main/resources/uiservices/store.html?rev=640661&r1=640660&r2=640661&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/samples/store/src/main/resources/uiservices/store.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/samples/store/src/main/resources/uiservices/store.html
Mon Mar 24 17:57:15 2008
@@ -105,13 +105,16 @@
document.getElementById('total').innerHTML = "";
}
- catalog.get(catalog_getResponse);
- shoppingCart.get("", shoppingCart_getResponse);
+ function init() {
+ catalog.get(catalog_getResponse);
+ shoppingCart.get("", shoppingCart_getResponse);
+ }
+
</script>
</head>
-<body>
+<body onload="init()">
<h1>Store</h1>
<div id="store">
<h2>Catalog</h2>
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/assets/uiservices/store.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/assets/uiservices/store.html?rev=640661&r1=640660&r2=640661&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/assets/uiservices/store.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/assets/uiservices/store.html
Mon Mar 24 17:57:15 2008
@@ -105,13 +105,16 @@
document.getElementById('total').innerHTML = "";
}
- catalog.get(catalog_getResponse);
- shoppingCart.get("", shoppingCart_getResponse);
+ function init() {
+ catalog.get(catalog_getResponse);
+ shoppingCart.get("", shoppingCart_getResponse);
+ }
+
</script>
</head>
-<body>
+<body onload="init()">
<h1>Store</h1>
<div id="store">
<h2>Catalog</h2>
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/uiservices/store-eu.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/uiservices/store-eu.html?rev=640661&r1=640660&r2=640661&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/uiservices/store-eu.html
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/store-eu/uiservices/store-eu.html
Mon Mar 24 17:57:15 2008
@@ -105,13 +105,16 @@
document.getElementById('total').innerHTML = "";
}
- catalog.get(catalog_getResponse);
- shoppingCart.get("", shoppingCart_getResponse);
+ function init() {
+ catalog.get(catalog_getResponse);
+ shoppingCart.get("", shoppingCart_getResponse);
+ }
+
</script>
</head>
-<body>
+<body onload="init()">
<h1>Store</h1>
<p>Fruits and Vegetables - Fruits et Legumes - Obst und Gemuese
<div id="store">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
